diff options
| author | Norbert Preining <norbert@preining.info> | 2023-01-24 03:02:57 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2023-01-24 03:02:57 +0000 |
| commit | b06c6695162b493aeec3b594c6beb518c15c98ba (patch) | |
| tree | 0c1dc3cfc73ea789d6bdc4673d776f3ef652d6d8 /graphics/asymptote | |
| parent | 4451a2090261307c963209bc65fea9fde4eceeea (diff) | |
CTAN sync 202301240302
Diffstat (limited to 'graphics/asymptote')
71 files changed, 9506 insertions, 7746 deletions
diff --git a/graphics/asymptote/ChangeLog b/graphics/asymptote/ChangeLog index 475cb4e882..472c56ba00 100644 --- a/graphics/asymptote/ChangeLog +++ b/graphics/asymptote/ChangeLog @@ -1,3 +1,230 @@ +commit 430c7a661c060568720f6d65e611a2087ea1dde6 +Author: John Bowman <bowman@ualberta.ca> +Date: Sat Jan 21 22:48:26 2023 -0700 + + Fix Makefile dependencies. + +commit 1e0c04c25ddb2dfc9a4f3423628d39ff494e4b32 +Author: John Bowman <bowman@ualberta.ca> +Date: Sat Jan 21 18:05:11 2023 -0700 + + Revert "Fix Makefile dependency." + + This reverts commit 826581af2fb2882ab82804e0593217da85ae58bd. + +commit 826581af2fb2882ab82804e0593217da85ae58bd +Author: John Bowman <bowman@ualberta.ca> +Date: Sat Jan 21 18:01:07 2023 -0700 + + Fix Makefile dependency. + +commit 2255877e2ee304c38dee5b7b52d113255c0622fd +Author: John Bowman <bowman@ualberta.ca> +Date: Sat Jan 21 17:48:00 2023 -0700 + + Revert "Improve last revision." + + This reverts commit e7d475fa66c429851bbc45bcc0017a3ac5eef02a. + +commit 4dafd8313cda0aad2a05abfdc91fc30ce88d7385 +Author: John Bowman <bowman@ualberta.ca> +Date: Sat Jan 21 15:12:28 2023 -0700 + + Add high-resolution clock; update FFT support. + +commit 56c39a80704b2bb93e808ad74591a8834c3ccca5 +Author: John Bowman <bowman@ualberta.ca> +Date: Sat Jan 21 12:03:49 2023 -0700 + + Account for linewidth in labelmargin. + +commit 37f564040bec2ff6059f5c4872950be17586b885 +Author: John Bowman <bowman@ualberta.ca> +Date: Tue Jan 3 20:37:17 2023 -0700 + + Add option to show summary of environment settings. + +commit 76f2f4d727261e4e2b466e2ea9d32bb4baf6c466 +Author: John Bowman <bowman@ualberta.ca> +Date: Mon Dec 12 22:19:03 2022 -0700 + + Avoid division by zero. + +commit 46d6ea7351699bbed0418ec6d7f2195011178e5a +Author: John Bowman <bowman@ualberta.ca> +Date: Mon Nov 28 20:20:35 2022 -0700 + + Improve example of multiple shipout. + +commit dce2e0d3b94b59dddcca6bb95c38548e2021821a +Merge: ee0d1a4a a42e056e +Author: John Bowman <bowman@ualberta.ca> +Date: Sun Nov 13 00:10:12 2022 -0700 + + Merge pull request #341 from yarusome/master + + Fixing `inversion inversion(circle, circle)` + +commit ee0d1a4a80ff0b30383f297f3ab64bebafd1c07c +Author: John Bowman <bowman@ualberta.ca> +Date: Sun Nov 13 00:00:45 2022 -0700 + + Fix issue #308: runtime error when drawing degenerate path with TexHead arrow. + +commit 0ff56f1ecaff0f5e6da0acd0e7ff6f152cd52c56 +Merge: eb89fd60 1834e488 +Author: John Bowman <bowman@ualberta.ca> +Date: Sat Nov 12 23:06:21 2022 -0700 + + Merge pull request #354 from vectorgraphics/fix-debian-bug-1023920-xasy + + XASY: Round numpy.float64 to int for Qt compatibiltiy. + +commit eb89fd60d71a5836b05ae0ed17f7525b2723714d +Author: John Bowman <bowman@ualberta.ca> +Date: Sat Nov 12 22:50:04 2022 -0700 + + Fix bug in XDR reads due to uninitialized variable. + +commit 1834e4883a0781944b5eb3e459a35984ad24d14d +Author: Supakorn Rassameemasmuang <jamievlin@outlook.com> +Date: Sat Nov 12 12:22:45 2022 -0700 + + XASY: Round numpy.float64 to int for Qt compatibiltiy. + + This fixes Debian bug #1023920 (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1023920). + +commit a64162166a3b2146902971d87ba2da3af53ebd5e +Author: John Bowman <bowman@ualberta.ca> +Date: Tue Nov 1 21:22:49 2022 -0600 + + Use Bland's rule even on artificial variables. + +commit 4f326abc01934c83380ca6e0d399dc5f33819e76 +Merge: e7d475fa 38d018f6 +Author: John Bowman <bowman@ualberta.ca> +Date: Mon Oct 31 15:03:46 2022 -0600 + + Merge pull request #351 from bmwiedemann/date + + Allow to override build date with SOURCE_DATE_EPOCH + +commit 38d018f6bc6d2341718a67193c4cbb99a07be698 +Author: Bernhard M. Wiedemann <bwiedemann@suse.de> +Date: Mon Oct 31 21:46:54 2022 +0100 + + Allow to override build date with SOURCE_DATE_EPOCH + + in order to make builds reproducible. + See https://reproducible-builds.org/ for why this is good + and https://reproducible-builds.org/specs/source-date-epoch/ + for the definition of this variable. + + Signed-off-by: Bernhard M. Wiedemann <bwiedemann@suse.de> + +commit e7d475fa66c429851bbc45bcc0017a3ac5eef02a +Author: John Bowman <bowman@ualberta.ca> +Date: Thu Oct 27 00:21:20 2022 -0600 + + Improve last revision. + +commit b5ac744cb044c42a9d2f79a58d37b46444e24caa +Author: John Bowman <bowman@ualberta.ca> +Date: Wed Oct 26 23:57:50 2022 -0600 + + Fix Makefile dependency. + +commit 8afff2c11b36ea54edf01b32452550bf12843a93 +Author: John Bowman <bowman@ualberta.ca> +Date: Sun Oct 23 01:15:48 2022 -0600 + + Terminate phase1 of simplex method once a zero-cost solution is found. + +commit e7b5c30816f5db7b243222c1c4c10d087294eece +Author: John Bowman <bowman@ualberta.ca> +Date: Sat Oct 22 22:33:15 2022 -0600 + + Make evince the default UNIX PDF viewer. + +commit 8bc175d31f77312baea3660e5f29dbc35ab2cbdf +Author: John Bowman <bowman@ualberta.ca> +Date: Fri Oct 21 22:33:36 2022 -0600 + + Remove spurious tests in glew.c. + +commit 0d49a356d0ee1d0f579cb224856f0947a3e1cdc3 +Author: John Bowman <bowman@ualberta.ca> +Date: Fri Oct 21 22:20:12 2022 -0600 + + Check for bison and flex but not libm. + +commit f495186f075bc3b686aa53bc80def7fbd91edb97 +Author: John Bowman <bowman@ualberta.ca> +Date: Tue Oct 18 00:32:09 2022 -0600 + + Add diagostic control to rationalSimplex.asy. + +commit d1a336cd3caaea8cae7bd1cc5a9f98175ba18979 +Author: John Bowman <bowman@ualberta.ca> +Date: Thu Oct 13 17:08:53 2022 -0600 + + Improve diagnostic in rationalSimplex. + +commit 20a79dbf5f005bacf3fb55fceb1c33cc8b79c4b8 +Author: John Bowman <bowman@ualberta.ca> +Date: Thu Oct 13 17:04:50 2022 -0600 + + Update example. + +commit 0e13fdc3d0226f153d1859db3ec43eb3d2fb2007 +Author: John Bowman <bowman@ualberta.ca> +Date: Sun Oct 9 13:45:34 2022 -0600 + + Remove obsolete code. + +commit ea5bb5e69ecdc26a576205825c62c5ede14622cb +Author: John Bowman <bowman@ualberta.ca> +Date: Sun Oct 9 10:55:22 2022 -0600 + + Change default UNIX postscript viewer to evince; remove remaining references to gsview. + +commit 6d556b7a78d1680702abcdc0972ecf6c458ced88 +Merge: 681daee0 7696801a +Author: John Bowman <bowman@ualberta.ca> +Date: Fri Sep 30 17:10:52 2022 -0600 + + Merge branch 'Qt'. + +commit 681daee01c6832a5d86e79e17018806b433e1805 +Author: John Bowman <bowman@ualberta.ca> +Date: Fri Sep 30 14:44:03 2022 -0600 + + Remove unused code. + +commit 7696801ae99fe0654030ccdb805df8ba506907cf +Author: chaumont-arch <chaumont@ualberta.ca> +Date: Sat Sep 24 21:39:03 2022 -0600 + + XASY: Fix arrowhead changing bug. + +commit 7201430c829e273e4ad3ff13391a87ff9f83b373 +Author: John Bowman <bowman@ualberta.ca> +Date: Wed Sep 21 21:32:07 2022 -0600 + + Disable PDF image compression for non-pdf output. + +commit 78662d51f5b9b1b5038cc0e1a41527552f49d181 +Author: John Bowman <bowman@ualberta.ca> +Date: Sat Sep 17 15:31:23 2022 -0600 + + Clean up more asy-latex files. + +commit 2c15485d146a43fbf6234d3fa0cec191a1a768b8 +Author: John Bowman <bowman@ualberta.ca> +Date: Sat Sep 17 14:01:30 2022 -0600 + + Increment version to 2.84. + commit 2ac4c5f85acd6b0a04865be937279dc29fadb76e Author: John Bowman <bowman@ualberta.ca> Date: Sat Sep 17 11:27:55 2022 -0600 @@ -175,6 +402,12 @@ Date: Thu Aug 25 01:29:14 2022 -0600 XASY: Fix noncommutativity with arrows and fills. +commit a42e056e27e7737695b18fd84842eb481893e531 +Author: yarusome <97945148+yarusome@users.noreply.github.com> +Date: Wed Aug 24 22:55:15 2022 +0800 + + Fixed `inversion inversion(circle, circle)` + commit 03b46aa391c31f809eae74524ef73b777c1dcc68 Author: John Bowman <bowman@ualberta.ca> Date: Mon Aug 22 16:43:42 2022 -0600 diff --git a/graphics/asymptote/GL/glew.c b/graphics/asymptote/GL/glew.c index 18a2853da0..62cc2f563b 100644 --- a/graphics/asymptote/GL/glew.c +++ b/graphics/asymptote/GL/glew.c @@ -253,7 +253,7 @@ static GLboolean _glewStrSame1 (const GLubyte** a, GLuint* na, const GLubyte* b, if(*na >= nb) { GLuint i=0; - while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++; + while (i < nb && (*a)[i] == b[i]) i++; if(i == nb) { *a = *a + nb; @@ -269,7 +269,7 @@ static GLboolean _glewStrSame2 (const GLubyte** a, GLuint* na, const GLubyte* b, if(*na >= nb) { GLuint i=0; - while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++; + while (i < nb && (*a)[i] == b[i]) i++; if(i == nb) { *a = *a + nb; @@ -285,7 +285,7 @@ static GLboolean _glewStrSame3 (const GLubyte** a, GLuint* na, const GLubyte* b, if(*na >= nb) { GLuint i=0; - while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++; + while (i < nb && (*a)[i] == b[i]) i++; if (i == nb && (*na == nb || (*a)[i] == ' ' || (*a)[i] == '\n' || (*a)[i] == '\r' || (*a)[i] == '\t')) { *a = *a + nb; diff --git a/graphics/asymptote/GUI/ContextWindow.py b/graphics/asymptote/GUI/ContextWindow.py index 114ec5acde..2711cfeca7 100644 --- a/graphics/asymptote/GUI/ContextWindow.py +++ b/graphics/asymptote/GUI/ContextWindow.py @@ -173,8 +173,8 @@ class AnotherWindow(Qw.QWidget): #None, {Arrow, ArcArrow} x {(),(SimpleHead),(HookHead),(TeXHead)} if isinstance(self.shape, x2a.xasyShape): if i != 0: - if self.newShape == x2a.asyArrow: - self.newShape = self.newShape.arrowify(arrowhead=i) + if isinstance(self.newShape,x2a.asyArrow): + self.newShape.arrowSettings["active"] = i else: self.newShape = self.shape.arrowify(arrowhead=i) else: diff --git a/graphics/asymptote/GUI/Window1.py b/graphics/asymptote/GUI/Window1.py index a21137a023..21d9691e64 100644 --- a/graphics/asymptote/GUI/Window1.py +++ b/graphics/asymptote/GUI/Window1.py @@ -1949,7 +1949,7 @@ class MainWindow1(Qw.QMainWindow): preCanvas.setPen(minorGridCol) self.makePenCosmetic(preCanvas) for xMinor in range(1, minorGridCount + 1): - xCoord = x + ((xMinor / (minorGridCount + 1)) * majorGrid) + xCoord = round(x + ((xMinor / (minorGridCount + 1)) * majorGrid)) preCanvas.drawLine(Qc.QLine(xCoord, -9999, xCoord, 9999)) preCanvas.drawLine(Qc.QLine(-xCoord, -9999, -xCoord, 9999)) @@ -1957,20 +1957,22 @@ class MainWindow1(Qw.QMainWindow): preCanvas.setPen(minorGridCol) self.makePenCosmetic(preCanvas) for yMinor in range(1, minorGridCount + 1): - yCoord = y + ((yMinor / (minorGridCount + 1)) * majorGrid) + yCoord = round(y + ((yMinor / (minorGridCount + 1)) * majorGrid)) preCanvas.drawLine(Qc.QLine(-9999, yCoord, 9999, yCoord)) preCanvas.drawLine(Qc.QLine(-9999, -yCoord, 9999, -yCoord)) preCanvas.setPen(majorGridCol) self.makePenCosmetic(preCanvas) - preCanvas.drawLine(Qc.QLine(-9999, y, 9999, y)) - preCanvas.drawLine(Qc.QLine(-9999, -y, 9999, -y)) + roundY = round(y) + preCanvas.drawLine(Qc.QLine(-9999, roundY, 9999, roundY)) + preCanvas.drawLine(Qc.QLine(-9999, -roundY, 9999, -roundY)) for x in np.arange(0, 2 * x_range + 1, majorGrid): preCanvas.setPen(majorGridCol) self.makePenCosmetic(preCanvas) - preCanvas.drawLine(Qc.QLine(x, -9999, x, 9999)) - preCanvas.drawLine(Qc.QLine(-x, -9999, -x, 9999)) + roundX = round(x) + preCanvas.drawLine(Qc.QLine(roundX, -9999, roundX, 9999)) + preCanvas.drawLine(Qc.QLine(-roundX, -9999, -roundX, 9999)) def drawPolarGrid(self, preCanvas): center = Qc.QPointF(0, 0) diff --git a/graphics/asymptote/LspCpp/third_party/uri/CMakeFiles/CMakeDirectoryInformation.cmake b/graphics/asymptote/LspCpp/third_party/uri/CMakeFiles/CMakeDirectoryInformation.cmake index 5fd42212b9..51d72c0b02 100644 --- a/graphics/asymptote/LspCpp/third_party/uri/CMakeFiles/CMakeDirectoryInformation.cmake +++ b/graphics/asymptote/LspCpp/third_party/uri/CMakeFiles/CMakeDirectoryInformation.cmake @@ -1,9 +1,9 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.22 +# Generated by "Unix Makefiles" Generator, CMake Version 3.25 # Relative path conversion top directories. -set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/usr/local/src/asymptote-2.83/LspCpp") -set(CMAKE_RELATIVE_PATH_TOP_BINARY "/usr/local/src/asymptote-2.83/LspCpp") +set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/usr/local/src/asymptote-2.84/LspCpp") +set(CMAKE_RELATIVE_PATH_TOP_BINARY "/usr/local/src/asymptote-2.84/LspCpp") # Force unix paths in dependencies. set(CMAKE_FORCE_UNIX_PATHS 1) diff --git a/graphics/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/build.make b/graphics/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/build.make index a1efc1ed07..4f54a7c7a8 100644 --- a/graphics/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/build.make +++ b/graphics/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/build.make @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.22 +# Generated by "Unix Makefiles" Generator, CMake Version 3.25 # Delete rule output on recipe failure. .DELETE_ON_ERROR: @@ -56,10 +56,10 @@ RM = /usr/bin/cmake -E rm -f EQUALS = = # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.83/LspCpp +CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.84/LspCpp # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.83/LspCpp +CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.84/LspCpp # Utility rule file for doc. @@ -70,8 +70,8 @@ include third_party/uri/CMakeFiles/doc.dir/compiler_depend.make 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.83/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Generating API documentation with Doxygen" - cd /usr/local/src/asymptote-2.83/LspCpp/third_party/uri && /bin/doxygen /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/Doxyfile + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir=/usr/local/src/asymptote-2.84/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Generating API documentation with Doxygen" + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri && /bin/doxygen /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/Doxyfile doc: third_party/uri/CMakeFiles/doc doc: third_party/uri/CMakeFiles/doc.dir/build.make @@ -82,10 +82,10 @@ third_party/uri/CMakeFiles/doc.dir/build: doc .PHONY : third_party/uri/CMakeFiles/doc.dir/build third_party/uri/CMakeFiles/doc.dir/clean: - cd /usr/local/src/asymptote-2.83/LspCpp/third_party/uri && $(CMAKE_COMMAND) -P CMakeFiles/doc.dir/cmake_clean.cmake + cd /usr/local/src/asymptote-2.84/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.83/LspCpp && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /usr/local/src/asymptote-2.83/LspCpp /usr/local/src/asymptote-2.83/LspCpp/third_party/uri /usr/local/src/asymptote-2.83/LspCpp /usr/local/src/asymptote-2.83/LspCpp/third_party/uri /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/CMakeFiles/doc.dir/DependInfo.cmake --color=$(COLOR) + cd /usr/local/src/asymptote-2.84/LspCpp && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /usr/local/src/asymptote-2.84/LspCpp /usr/local/src/asymptote-2.84/LspCpp/third_party/uri /usr/local/src/asymptote-2.84/LspCpp /usr/local/src/asymptote-2.84/LspCpp/third_party/uri /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/CMakeFiles/doc.dir/DependInfo.cmake --color=$(COLOR) .PHONY : third_party/uri/CMakeFiles/doc.dir/depend diff --git a/graphics/asymptote/LspCpp/third_party/uri/Doxyfile b/graphics/asymptote/LspCpp/third_party/uri/Doxyfile index af17d12e94..40f28a7af0 100644 --- a/graphics/asymptote/LspCpp/third_party/uri/Doxyfile +++ b/graphics/asymptote/LspCpp/third_party/uri/Doxyfile @@ -128,7 +128,7 @@ FULL_PATH_NAMES = YES # 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.83/LspCpp/third_party/uri/include/ +STRIP_FROM_PATH = /usr/local/src/asymptote-2.84/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 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include +INPUT = /usr/local/src/asymptote-2.84/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 @@ RECURSIVE = YES # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/detail +EXCLUDE = /usr/local/src/asymptote-2.84/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 @@ COLS_IN_ALPHA_INDEX = 5 # 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.83/LspCpp/third_party/uri/uri/src/ +IGNORE_PREFIX = /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/uri/src/ #--------------------------------------------------------------------------- # configuration options related to the HTML output diff --git a/graphics/asymptote/LspCpp/third_party/uri/Makefile b/graphics/asymptote/LspCpp/third_party/uri/Makefile index cfaff962f3..0eae21f572 100644 --- a/graphics/asymptote/LspCpp/third_party/uri/Makefile +++ b/graphics/asymptote/LspCpp/third_party/uri/Makefile @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.22 +# Generated by "Unix Makefiles" Generator, CMake Version 3.25 # Default target executed when no arguments are given to make. default_target: all @@ -60,10 +60,10 @@ RM = /usr/bin/cmake -E rm -f EQUALS = = # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.83/LspCpp +CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.84/LspCpp # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.83/LspCpp +CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.84/LspCpp #============================================================================= # Targets provided globally by CMake. @@ -135,14 +135,14 @@ install/strip/fast: preinstall/fast # The main all target all: cmake_check_build_system - cd /usr/local/src/asymptote-2.83/LspCpp && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.83/LspCpp/CMakeFiles /usr/local/src/asymptote-2.83/LspCpp/third_party/uri//CMakeFiles/progress.marks - cd /usr/local/src/asymptote-2.83/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/all - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.83/LspCpp/CMakeFiles 0 + cd /usr/local/src/asymptote-2.84/LspCpp && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.84/LspCpp/CMakeFiles /usr/local/src/asymptote-2.84/LspCpp/third_party/uri//CMakeFiles/progress.marks + cd /usr/local/src/asymptote-2.84/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/all + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.84/LspCpp/CMakeFiles 0 .PHONY : all # The main clean target clean: - cd /usr/local/src/asymptote-2.83/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/clean + cd /usr/local/src/asymptote-2.84/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/clean .PHONY : clean # The main clean target @@ -151,22 +151,22 @@ clean/fast: clean # Prepare targets for installation. preinstall: all - cd /usr/local/src/asymptote-2.83/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/preinstall + cd /usr/local/src/asymptote-2.84/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/preinstall .PHONY : preinstall # Prepare targets for installation. preinstall/fast: - cd /usr/local/src/asymptote-2.83/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/preinstall + cd /usr/local/src/asymptote-2.84/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/preinstall .PHONY : preinstall/fast # clear depends depend: - cd /usr/local/src/asymptote-2.83/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 + cd /usr/local/src/asymptote-2.84/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.83/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/CMakeFiles/doc.dir/rule + cd /usr/local/src/asymptote-2.84/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 @@ doc: third_party/uri/CMakeFiles/doc.dir/rule # fast build rule for target. doc/fast: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ help: # 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.83/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 + cd /usr/local/src/asymptote-2.84/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/graphics/asymptote/LspCpp/third_party/uri/cmake_install.cmake b/graphics/asymptote/LspCpp/third_party/uri/cmake_install.cmake index b42eb0b716..8682324697 100644 --- a/graphics/asymptote/LspCpp/third_party/uri/cmake_install.cmake +++ b/graphics/asymptote/LspCpp/third_party/uri/cmake_install.cmake @@ -1,4 +1,4 @@ -# Install script for directory: /usr/local/src/asymptote-2.83/LspCpp/third_party/uri +# Install script for directory: /usr/local/src/asymptote-2.84/LspCpp/third_party/uri # Set the install prefix if(NOT DEFINED CMAKE_INSTALL_PREFIX) @@ -42,13 +42,13 @@ if(NOT DEFINED CMAKE_OBJDUMP) set(CMAKE_OBJDUMP "/bin/objdump") endif() -if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xUnspecifiedx" OR NOT CMAKE_INSTALL_COMPONENT) - file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/." TYPE DIRECTORY FILES "/usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include") +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.84/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.83/LspCpp/third_party/uri/src/cmake_install.cmake") + include("/usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/cmake_install.cmake") endif() diff --git a/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/CMakeDirectoryInformation.cmake b/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/CMakeDirectoryInformation.cmake index 5fd42212b9..51d72c0b02 100644 --- a/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/CMakeDirectoryInformation.cmake +++ b/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/CMakeDirectoryInformation.cmake @@ -1,9 +1,9 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.22 +# Generated by "Unix Makefiles" Generator, CMake Version 3.25 # Relative path conversion top directories. -set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/usr/local/src/asymptote-2.83/LspCpp") -set(CMAKE_RELATIVE_PATH_TOP_BINARY "/usr/local/src/asymptote-2.83/LspCpp") +set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/usr/local/src/asymptote-2.84/LspCpp") +set(CMAKE_RELATIVE_PATH_TOP_BINARY "/usr/local/src/asymptote-2.84/LspCpp") # Force unix paths in dependencies. set(CMAKE_FORCE_UNIX_PATHS 1) diff --git a/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake b/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake index cd700d1822..83cd64d488 100644 --- a/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake +++ b/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake @@ -8,14 +8,14 @@ set(CMAKE_DEPENDS_LANGUAGES # The set of dependency files which are needed: set(CMAKE_DEPENDS_DEPENDENCY_FILES - "/usr/local/src/asymptote-2.83/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.83/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.83/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.83/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.83/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.83/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.83/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.83/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.84/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.84/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.84/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.84/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.84/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.84/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.84/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.84/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. diff --git a/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/build.make b/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/build.make index 85a02f3be9..83c7d48d5e 100644 --- a/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/build.make +++ b/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/build.make @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.22 +# Generated by "Unix Makefiles" Generator, CMake Version 3.25 # Delete rule output on recipe failure. .DELETE_ON_ERROR: @@ -56,10 +56,10 @@ RM = /usr/bin/cmake -E rm -f EQUALS = = # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.83/LspCpp +CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.84/LspCpp # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.83/LspCpp +CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.84/LspCpp # Include any dependencies generated for this target. include third_party/uri/src/CMakeFiles/network-uri.dir/depend.make @@ -75,114 +75,114 @@ include 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/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.83/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.83/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.83/LspCpp/third_party/uri/src/uri.cpp + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.84/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.84/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.84/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.83/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/uri.cpp > CMakeFiles/network-uri.dir/uri.cpp.i + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.84/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.83/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/uri.cpp -o CMakeFiles/network-uri.dir/uri.cpp.s + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.84/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.83/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.83/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.83/LspCpp/third_party/uri/src/uri_builder.cpp + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.84/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.84/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.84/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.83/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/uri_builder.cpp > CMakeFiles/network-uri.dir/uri_builder.cpp.i + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.84/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.83/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/uri_builder.cpp -o CMakeFiles/network-uri.dir/uri_builder.cpp.s + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.84/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.83/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.83/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.83/LspCpp/third_party/uri/src/uri_errors.cpp + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.84/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.84/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.84/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.83/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/uri_errors.cpp > CMakeFiles/network-uri.dir/uri_errors.cpp.i + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.84/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.83/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/uri_errors.cpp -o CMakeFiles/network-uri.dir/uri_errors.cpp.s + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.84/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.83/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.83/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.83/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.84/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.84/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.84/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.83/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_parse.cpp > CMakeFiles/network-uri.dir/detail/uri_parse.cpp.i + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.84/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.83/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_parse.cpp -o CMakeFiles/network-uri.dir/detail/uri_parse.cpp.s + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.84/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.83/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.83/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.83/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.84/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.84/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.84/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.83/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp > CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.i + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.84/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.83/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp -o CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.s + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.84/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.83/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.83/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.83/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.84/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.84/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.84/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.83/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp > CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.i + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.84/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.83/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp -o CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.s + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.84/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.83/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.83/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.83/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.84/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.84/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.84/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.83/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_normalize.cpp > CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.i + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.84/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.83/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_normalize.cpp -o CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.s + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.84/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.83/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.83/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.83/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.84/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.84/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.84/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.83/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_resolve.cpp > CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.i + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.84/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.83/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_resolve.cpp -o CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.s + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.84/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,19 +208,19 @@ third_party/uri/src/libnetwork-uri.a: third_party/uri/src/CMakeFiles/network-uri 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.83/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_9) "Linking CXX static library libnetwork-uri.a" - cd /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src && $(CMAKE_COMMAND) -P CMakeFiles/network-uri.dir/cmake_clean_target.cmake - cd /usr/local/src/asymptote-2.83/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.84/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_9) "Linking CXX static library libnetwork-uri.a" + cd /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src && $(CMAKE_COMMAND) -P CMakeFiles/network-uri.dir/cmake_clean_target.cmake + cd /usr/local/src/asymptote-2.84/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 .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.83/LspCpp/third_party/uri/src && $(CMAKE_COMMAND) -P CMakeFiles/network-uri.dir/cmake_clean.cmake + cd /usr/local/src/asymptote-2.84/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.83/LspCpp && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /usr/local/src/asymptote-2.83/LspCpp /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src /usr/local/src/asymptote-2.83/LspCpp /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake --color=$(COLOR) + cd /usr/local/src/asymptote-2.84/LspCpp && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /usr/local/src/asymptote-2.84/LspCpp /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src /usr/local/src/asymptote-2.84/LspCpp /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake --color=$(COLOR) .PHONY : third_party/uri/src/CMakeFiles/network-uri.dir/depend diff --git a/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.internal b/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.internal index 8056417232..d7989330a8 100644 --- a/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.internal +++ b/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.internal @@ -1,15 +1,15 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.22 +# Generated by "Unix Makefiles" Generator, CMake Version 3.25 third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp /usr/include/stdc-predef.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_advance_parts.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp - /usr/include/c++/11/string - /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.h + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/uri_advance_parts.hpp + /usr/local/src/asymptote-2.84/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++/11/x86_64-redhat-linux/bits/os_defines.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 @@ -17,35 +17,18 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o /usr/include/bits/long-double.h /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h - /usr/include/c++/11/x86_64-redhat-linux/bits/cpu_defines.h - /usr/include/c++/11/bits/stringfwd.h - /usr/include/c++/11/bits/memoryfwd.h - /usr/include/c++/11/bits/char_traits.h - /usr/include/c++/11/bits/stl_algobase.h - /usr/include/c++/11/bits/functexcept.h - /usr/include/c++/11/bits/exception_defines.h - /usr/include/c++/11/bits/cpp_type_traits.h - /usr/include/c++/11/ext/type_traits.h - /usr/include/c++/11/ext/numeric_traits.h - /usr/include/c++/11/bits/stl_pair.h - /usr/include/c++/11/bits/move.h - /usr/include/c++/11/type_traits - /usr/include/c++/11/bits/stl_iterator_base_types.h - /usr/include/c++/11/bits/stl_iterator_base_funcs.h - /usr/include/c++/11/bits/concept_check.h - /usr/include/c++/11/debug/assertions.h - /usr/include/c++/11/bits/stl_iterator.h - /usr/include/c++/11/bits/ptr_traits.h - /usr/include/c++/11/debug/debug.h - /usr/include/c++/11/bits/predefined_ops.h - /usr/include/c++/11/bits/postypes.h - /usr/include/c++/11/cwchar + /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/11/include/stddef.h - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdarg.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 @@ -54,86 +37,89 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o /usr/include/bits/types/FILE.h /usr/include/bits/types/locale_t.h /usr/include/bits/types/__locale_t.h - /usr/include/c++/11/cstdint - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdint.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++/11/bits/allocator.h - /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h - /usr/include/c++/11/ext/new_allocator.h - /usr/include/c++/11/new - /usr/include/c++/11/bits/exception.h - /usr/include/c++/11/bits/localefwd.h - /usr/include/c++/11/x86_64-redhat-linux/bits/c++locale.h - /usr/include/c++/11/clocale + /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++/11/iosfwd - /usr/include/c++/11/cctype + /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++/11/bits/ostream_insert.h - /usr/include/c++/11/bits/cxxabi_forced.h - /usr/include/c++/11/bits/stl_function.h - /usr/include/c++/11/backward/binders.h - /usr/include/c++/11/bits/range_access.h - /usr/include/c++/11/initializer_list - /usr/include/c++/11/bits/basic_string.h - /usr/include/c++/11/ext/atomicity.h - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr.h - /usr/include/c++/11/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/sched.h - /usr/include/bits/types/struct_sched_param.h - /usr/include/bits/cpu-set.h - /usr/include/time.h - /usr/include/bits/time.h - /usr/include/bits/timex.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/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/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++/11/x86_64-redhat-linux/bits/atomic_word.h - /usr/include/sys/single_threaded.h - /usr/include/c++/11/ext/alloc_traits.h - /usr/include/c++/11/bits/alloc_traits.h - /usr/include/c++/11/bits/stl_construct.h - /usr/include/c++/11/ext/string_conversions.h - /usr/include/c++/11/cstdlib + /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/clock_t.h + /usr/include/bits/types/clockid_t.h + /usr/include/bits/types/time_t.h + /usr/include/bits/types/timer_t.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++/11/bits/std_abs.h - /usr/include/c++/11/cstdio + /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 @@ -141,7 +127,7 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o /usr/include/bits/types/cookie_io_functions_t.h /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h - /usr/include/c++/11/cerrno + /usr/include/c++/12/cerrno /usr/include/errno.h /usr/include/bits/errno.h /usr/include/linux/errno.h @@ -149,69 +135,84 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h /usr/include/bits/types/error_t.h - /usr/include/c++/11/bits/charconv.h - /usr/include/c++/11/bits/functional_hash.h - /usr/include/c++/11/bits/hash_bytes.h - /usr/include/c++/11/bits/basic_string.tcc - /usr/include/c++/11/utility - /usr/include/c++/11/bits/stl_relops.h - /usr/include/c++/11/iterator - /usr/include/c++/11/bits/stream_iterator.h - /usr/include/c++/11/bits/streambuf_iterator.h - /usr/include/c++/11/streambuf - /usr/include/c++/11/bits/ios_base.h - /usr/include/c++/11/bits/locale_classes.h - /usr/include/c++/11/bits/locale_classes.tcc - /usr/include/c++/11/system_error - /usr/include/c++/11/x86_64-redhat-linux/bits/error_constants.h - /usr/include/c++/11/stdexcept - /usr/include/c++/11/exception - /usr/include/c++/11/bits/exception_ptr.h - /usr/include/c++/11/bits/cxxabi_init_exception.h - /usr/include/c++/11/typeinfo - /usr/include/c++/11/bits/nested_exception.h - /usr/include/c++/11/bits/streambuf.tcc - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/optional.hpp - /usr/include/c++/11/memory - /usr/include/c++/11/bits/stl_uninitialized.h - /usr/include/c++/11/bits/stl_tempbuf.h - /usr/include/c++/11/bits/stl_raw_storage_iter.h - /usr/include/c++/11/bits/align.h - /usr/include/c++/11/bit - /usr/include/c++/11/bits/uses_allocator.h - /usr/include/c++/11/bits/unique_ptr.h - /usr/include/c++/11/tuple - /usr/include/c++/11/array - /usr/include/c++/11/bits/invoke.h - /usr/include/c++/11/bits/shared_ptr.h - /usr/include/c++/11/bits/shared_ptr_base.h - /usr/include/c++/11/bits/allocated_ptr.h - /usr/include/c++/11/bits/refwrap.h - /usr/include/c++/11/ext/aligned_buffer.h - /usr/include/c++/11/ext/concurrence.h - /usr/include/c++/11/bits/shared_ptr_atomic.h - /usr/include/c++/11/bits/atomic_base.h - /usr/include/c++/11/bits/atomic_lockfree_defines.h - /usr/include/c++/11/backward/auto_ptr.h - /usr/include/c++/11/algorithm - /usr/include/c++/11/bits/stl_algo.h - /usr/include/c++/11/bits/algorithmfwd.h - /usr/include/c++/11/bits/stl_heap.h - /usr/include/c++/11/bits/uniform_int_dist.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/string_view.hpp - /usr/include/c++/11/cassert + /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/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/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.84/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.84/LspCpp/third_party/uri/include/network/string_view.hpp + /usr/include/c++/12/cassert /usr/include/assert.h - /usr/include/c++/11/limits + /usr/include/c++/12/limits third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_normalize.cpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/uri_normalize.cpp /usr/include/stdc-predef.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_normalize.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/uri.hpp - /usr/include/c++/11/iterator - /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.h + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/uri_normalize.hpp + /usr/local/src/asymptote-2.84/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++/11/x86_64-redhat-linux/bits/os_defines.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 @@ -219,28 +220,28 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o /usr/include/bits/long-double.h /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h - /usr/include/c++/11/x86_64-redhat-linux/bits/cpu_defines.h - /usr/include/c++/11/bits/stl_iterator_base_types.h - /usr/include/c++/11/type_traits - /usr/include/c++/11/bits/stl_iterator_base_funcs.h - /usr/include/c++/11/bits/concept_check.h - /usr/include/c++/11/debug/assertions.h - /usr/include/c++/11/bits/stl_iterator.h - /usr/include/c++/11/bits/cpp_type_traits.h - /usr/include/c++/11/ext/type_traits.h - /usr/include/c++/11/bits/move.h - /usr/include/c++/11/bits/ptr_traits.h - /usr/include/c++/11/iosfwd - /usr/include/c++/11/bits/stringfwd.h - /usr/include/c++/11/bits/memoryfwd.h - /usr/include/c++/11/bits/postypes.h - /usr/include/c++/11/cwchar + /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/bits/libc-header-start.h /usr/include/bits/floatn.h /usr/include/bits/floatn-common.h - /usr/lib/gcc/x86_64-redhat-linux/11/include/stddef.h - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdarg.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 @@ -249,26 +250,26 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o /usr/include/bits/types/FILE.h /usr/include/bits/types/locale_t.h /usr/include/bits/types/__locale_t.h - /usr/include/c++/11/bits/stream_iterator.h - /usr/include/c++/11/debug/debug.h - /usr/include/c++/11/bits/streambuf_iterator.h - /usr/include/c++/11/streambuf - /usr/include/c++/11/bits/localefwd.h - /usr/include/c++/11/x86_64-redhat-linux/bits/c++locale.h - /usr/include/c++/11/clocale + /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++/11/cctype + /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++/11/bits/ios_base.h - /usr/include/c++/11/ext/atomicity.h - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr.h - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr-default.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 @@ -288,45 +289,49 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o /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++/11/x86_64-redhat-linux/bits/atomic_word.h + /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h /usr/include/sys/single_threaded.h - /usr/include/c++/11/bits/locale_classes.h - /usr/include/c++/11/string - /usr/include/c++/11/bits/char_traits.h - /usr/include/c++/11/bits/stl_algobase.h - /usr/include/c++/11/bits/functexcept.h - /usr/include/c++/11/bits/exception_defines.h - /usr/include/c++/11/ext/numeric_traits.h - /usr/include/c++/11/bits/stl_pair.h - /usr/include/c++/11/bits/predefined_ops.h - /usr/include/c++/11/cstdint - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdint.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++/11/bits/allocator.h - /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h - /usr/include/c++/11/ext/new_allocator.h - /usr/include/c++/11/new - /usr/include/c++/11/bits/exception.h - /usr/include/c++/11/bits/ostream_insert.h - /usr/include/c++/11/bits/cxxabi_forced.h - /usr/include/c++/11/bits/stl_function.h - /usr/include/c++/11/backward/binders.h - /usr/include/c++/11/bits/range_access.h - /usr/include/c++/11/initializer_list - /usr/include/c++/11/bits/basic_string.h - /usr/include/c++/11/ext/alloc_traits.h - /usr/include/c++/11/bits/alloc_traits.h - /usr/include/c++/11/bits/stl_construct.h - /usr/include/c++/11/ext/string_conversions.h - /usr/include/c++/11/cstdlib + /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/waitflags.h /usr/include/bits/waitstatus.h @@ -340,8 +345,8 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o /usr/include/alloca.h /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h - /usr/include/c++/11/bits/std_abs.h - /usr/include/c++/11/cstdio + /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 @@ -349,7 +354,7 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o /usr/include/bits/types/cookie_io_functions_t.h /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h - /usr/include/c++/11/cerrno + /usr/include/c++/12/cerrno /usr/include/errno.h /usr/include/bits/errno.h /usr/include/linux/errno.h @@ -357,97 +362,94 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h /usr/include/bits/types/error_t.h - /usr/include/c++/11/bits/charconv.h - /usr/include/c++/11/bits/functional_hash.h - /usr/include/c++/11/bits/hash_bytes.h - /usr/include/c++/11/bits/basic_string.tcc - /usr/include/c++/11/bits/locale_classes.tcc - /usr/include/c++/11/system_error - /usr/include/c++/11/x86_64-redhat-linux/bits/error_constants.h - /usr/include/c++/11/stdexcept - /usr/include/c++/11/exception - /usr/include/c++/11/bits/exception_ptr.h - /usr/include/c++/11/bits/cxxabi_init_exception.h - /usr/include/c++/11/typeinfo - /usr/include/c++/11/bits/nested_exception.h - /usr/include/c++/11/bits/streambuf.tcc - /usr/include/c++/11/algorithm - /usr/include/c++/11/utility - /usr/include/c++/11/bits/stl_relops.h - /usr/include/c++/11/bits/stl_algo.h - /usr/include/c++/11/bits/algorithmfwd.h - /usr/include/c++/11/bits/stl_heap.h - /usr/include/c++/11/bits/stl_tempbuf.h - /usr/include/c++/11/bits/uniform_int_dist.h - /usr/include/c++/11/functional - /usr/include/c++/11/tuple - /usr/include/c++/11/array - /usr/include/c++/11/bits/uses_allocator.h - /usr/include/c++/11/bits/invoke.h - /usr/include/c++/11/bits/refwrap.h - /usr/include/c++/11/bits/std_function.h - /usr/include/c++/11/memory - /usr/include/c++/11/bits/stl_uninitialized.h - /usr/include/c++/11/bits/stl_raw_storage_iter.h - /usr/include/c++/11/bits/align.h - /usr/include/c++/11/bit - /usr/include/c++/11/bits/unique_ptr.h - /usr/include/c++/11/bits/shared_ptr.h - /usr/include/c++/11/bits/shared_ptr_base.h - /usr/include/c++/11/bits/allocated_ptr.h - /usr/include/c++/11/ext/aligned_buffer.h - /usr/include/c++/11/ext/concurrence.h - /usr/include/c++/11/bits/shared_ptr_atomic.h - /usr/include/c++/11/bits/atomic_base.h - /usr/include/c++/11/bits/atomic_lockfree_defines.h - /usr/include/c++/11/backward/auto_ptr.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/string_view.hpp - /usr/include/c++/11/cassert + /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.84/LspCpp/third_party/uri/include/network/string_view.hpp + /usr/include/c++/12/cassert /usr/include/assert.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/optional.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/config.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp - /usr/include/c++/11/cstring + /usr/local/src/asymptote-2.84/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.84/LspCpp/third_party/uri/include/network/uri/config.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp + /usr/local/src/asymptote-2.84/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.83/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_percent_encode.hpp - /usr/include/c++/11/vector - /usr/include/c++/11/bits/stl_vector.h - /usr/include/c++/11/bits/stl_bvector.h - /usr/include/c++/11/bits/vector.tcc - /usr/include/c++/11/locale - /usr/include/c++/11/bits/locale_facets.h - /usr/include/c++/11/cwctype + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp + /usr/local/src/asymptote-2.84/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/wctype.h /usr/include/bits/wctype-wchar.h - /usr/include/c++/11/x86_64-redhat-linux/bits/ctype_base.h - /usr/include/c++/11/x86_64-redhat-linux/bits/ctype_inline.h - /usr/include/c++/11/bits/locale_facets.tcc - /usr/include/c++/11/bits/locale_facets_nonio.h - /usr/include/c++/11/ctime - /usr/include/c++/11/x86_64-redhat-linux/bits/time_members.h - /usr/include/c++/11/x86_64-redhat-linux/bits/messages_members.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++/11/bits/codecvt.h - /usr/include/c++/11/bits/locale_facets_nonio.tcc - /usr/include/c++/11/bits/locale_conv.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/algorithm.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/algorithm_split.hpp + /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.84/LspCpp/third_party/uri/src/detail/algorithm.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/algorithm_split.hpp third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_parse.cpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/uri_parse.cpp /usr/include/stdc-predef.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_parse.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/string_view.hpp - /usr/include/c++/11/string - /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.h + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/uri_parse.hpp + /usr/local/src/asymptote-2.84/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++/11/x86_64-redhat-linux/bits/os_defines.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 @@ -455,35 +457,18 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o /usr/include/bits/long-double.h /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h - /usr/include/c++/11/x86_64-redhat-linux/bits/cpu_defines.h - /usr/include/c++/11/bits/stringfwd.h - /usr/include/c++/11/bits/memoryfwd.h - /usr/include/c++/11/bits/char_traits.h - /usr/include/c++/11/bits/stl_algobase.h - /usr/include/c++/11/bits/functexcept.h - /usr/include/c++/11/bits/exception_defines.h - /usr/include/c++/11/bits/cpp_type_traits.h - /usr/include/c++/11/ext/type_traits.h - /usr/include/c++/11/ext/numeric_traits.h - /usr/include/c++/11/bits/stl_pair.h - /usr/include/c++/11/bits/move.h - /usr/include/c++/11/type_traits - /usr/include/c++/11/bits/stl_iterator_base_types.h - /usr/include/c++/11/bits/stl_iterator_base_funcs.h - /usr/include/c++/11/bits/concept_check.h - /usr/include/c++/11/debug/assertions.h - /usr/include/c++/11/bits/stl_iterator.h - /usr/include/c++/11/bits/ptr_traits.h - /usr/include/c++/11/debug/debug.h - /usr/include/c++/11/bits/predefined_ops.h - /usr/include/c++/11/bits/postypes.h - /usr/include/c++/11/cwchar + /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/11/include/stddef.h - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdarg.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 @@ -492,86 +477,89 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o /usr/include/bits/types/FILE.h /usr/include/bits/types/locale_t.h /usr/include/bits/types/__locale_t.h - /usr/include/c++/11/cstdint - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdint.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++/11/bits/allocator.h - /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h - /usr/include/c++/11/ext/new_allocator.h - /usr/include/c++/11/new - /usr/include/c++/11/bits/exception.h - /usr/include/c++/11/bits/localefwd.h - /usr/include/c++/11/x86_64-redhat-linux/bits/c++locale.h - /usr/include/c++/11/clocale + /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++/11/iosfwd - /usr/include/c++/11/cctype + /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++/11/bits/ostream_insert.h - /usr/include/c++/11/bits/cxxabi_forced.h - /usr/include/c++/11/bits/stl_function.h - /usr/include/c++/11/backward/binders.h - /usr/include/c++/11/bits/range_access.h - /usr/include/c++/11/initializer_list - /usr/include/c++/11/bits/basic_string.h - /usr/include/c++/11/ext/atomicity.h - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr.h - /usr/include/c++/11/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/sched.h - /usr/include/bits/types/struct_sched_param.h - /usr/include/bits/cpu-set.h - /usr/include/time.h - /usr/include/bits/time.h - /usr/include/bits/timex.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/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/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++/11/x86_64-redhat-linux/bits/atomic_word.h - /usr/include/sys/single_threaded.h - /usr/include/c++/11/ext/alloc_traits.h - /usr/include/c++/11/bits/alloc_traits.h - /usr/include/c++/11/bits/stl_construct.h - /usr/include/c++/11/ext/string_conversions.h - /usr/include/c++/11/cstdlib + /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/clock_t.h + /usr/include/bits/types/clockid_t.h + /usr/include/bits/types/time_t.h + /usr/include/bits/types/timer_t.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++/11/bits/std_abs.h - /usr/include/c++/11/cstdio + /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 @@ -579,7 +567,7 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o /usr/include/bits/types/cookie_io_functions_t.h /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h - /usr/include/c++/11/cerrno + /usr/include/c++/12/cerrno /usr/include/errno.h /usr/include/bits/errno.h /usr/include/linux/errno.h @@ -587,89 +575,104 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h /usr/include/bits/types/error_t.h - /usr/include/c++/11/bits/charconv.h - /usr/include/c++/11/bits/functional_hash.h - /usr/include/c++/11/bits/hash_bytes.h - /usr/include/c++/11/bits/basic_string.tcc - /usr/include/c++/11/iterator - /usr/include/c++/11/bits/stream_iterator.h - /usr/include/c++/11/bits/streambuf_iterator.h - /usr/include/c++/11/streambuf - /usr/include/c++/11/bits/ios_base.h - /usr/include/c++/11/bits/locale_classes.h - /usr/include/c++/11/bits/locale_classes.tcc - /usr/include/c++/11/system_error - /usr/include/c++/11/x86_64-redhat-linux/bits/error_constants.h - /usr/include/c++/11/stdexcept - /usr/include/c++/11/exception - /usr/include/c++/11/bits/exception_ptr.h - /usr/include/c++/11/bits/cxxabi_init_exception.h - /usr/include/c++/11/typeinfo - /usr/include/c++/11/bits/nested_exception.h - /usr/include/c++/11/bits/streambuf.tcc - /usr/include/c++/11/cassert + /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/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/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++/11/algorithm - /usr/include/c++/11/utility - /usr/include/c++/11/bits/stl_relops.h - /usr/include/c++/11/bits/stl_algo.h - /usr/include/c++/11/bits/algorithmfwd.h - /usr/include/c++/11/bits/stl_heap.h - /usr/include/c++/11/bits/stl_tempbuf.h - /usr/include/c++/11/bits/uniform_int_dist.h - /usr/include/c++/11/limits - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/grammar.hpp - /usr/include/c++/11/locale - /usr/include/c++/11/bits/locale_facets.h - /usr/include/c++/11/cwctype + /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.84/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/wctype.h /usr/include/bits/wctype-wchar.h - /usr/include/c++/11/x86_64-redhat-linux/bits/ctype_base.h - /usr/include/c++/11/x86_64-redhat-linux/bits/ctype_inline.h - /usr/include/c++/11/bits/locale_facets.tcc - /usr/include/c++/11/bits/locale_facets_nonio.h - /usr/include/c++/11/ctime - /usr/include/c++/11/x86_64-redhat-linux/bits/time_members.h - /usr/include/c++/11/x86_64-redhat-linux/bits/messages_members.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++/11/bits/codecvt.h - /usr/include/c++/11/bits/locale_facets_nonio.tcc - /usr/include/c++/11/bits/locale_conv.h - /usr/include/c++/11/bits/unique_ptr.h - /usr/include/c++/11/tuple - /usr/include/c++/11/array - /usr/include/c++/11/bits/uses_allocator.h - /usr/include/c++/11/bits/invoke.h - /usr/include/c++/11/cstring + /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.83/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/optional.hpp - /usr/include/c++/11/memory - /usr/include/c++/11/bits/stl_uninitialized.h - /usr/include/c++/11/bits/stl_raw_storage_iter.h - /usr/include/c++/11/bits/align.h - /usr/include/c++/11/bit - /usr/include/c++/11/bits/shared_ptr.h - /usr/include/c++/11/bits/shared_ptr_base.h - /usr/include/c++/11/bits/allocated_ptr.h - /usr/include/c++/11/bits/refwrap.h - /usr/include/c++/11/ext/aligned_buffer.h - /usr/include/c++/11/ext/concurrence.h - /usr/include/c++/11/bits/shared_ptr_atomic.h - /usr/include/c++/11/bits/atomic_base.h - /usr/include/c++/11/bits/atomic_lockfree_defines.h - /usr/include/c++/11/backward/auto_ptr.h + /usr/local/src/asymptote-2.84/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.84/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 third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp /usr/include/stdc-predef.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_parse_authority.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp - /usr/include/c++/11/string - /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.h + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/uri_parse_authority.hpp + /usr/local/src/asymptote-2.84/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++/11/x86_64-redhat-linux/bits/os_defines.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 @@ -677,35 +680,18 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o /usr/include/bits/long-double.h /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h - /usr/include/c++/11/x86_64-redhat-linux/bits/cpu_defines.h - /usr/include/c++/11/bits/stringfwd.h - /usr/include/c++/11/bits/memoryfwd.h - /usr/include/c++/11/bits/char_traits.h - /usr/include/c++/11/bits/stl_algobase.h - /usr/include/c++/11/bits/functexcept.h - /usr/include/c++/11/bits/exception_defines.h - /usr/include/c++/11/bits/cpp_type_traits.h - /usr/include/c++/11/ext/type_traits.h - /usr/include/c++/11/ext/numeric_traits.h - /usr/include/c++/11/bits/stl_pair.h - /usr/include/c++/11/bits/move.h - /usr/include/c++/11/type_traits - /usr/include/c++/11/bits/stl_iterator_base_types.h - /usr/include/c++/11/bits/stl_iterator_base_funcs.h - /usr/include/c++/11/bits/concept_check.h - /usr/include/c++/11/debug/assertions.h - /usr/include/c++/11/bits/stl_iterator.h - /usr/include/c++/11/bits/ptr_traits.h - /usr/include/c++/11/debug/debug.h - /usr/include/c++/11/bits/predefined_ops.h - /usr/include/c++/11/bits/postypes.h - /usr/include/c++/11/cwchar + /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/11/include/stddef.h - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdarg.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 @@ -714,86 +700,89 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o /usr/include/bits/types/FILE.h /usr/include/bits/types/locale_t.h /usr/include/bits/types/__locale_t.h - /usr/include/c++/11/cstdint - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdint.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++/11/bits/allocator.h - /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h - /usr/include/c++/11/ext/new_allocator.h - /usr/include/c++/11/new - /usr/include/c++/11/bits/exception.h - /usr/include/c++/11/bits/localefwd.h - /usr/include/c++/11/x86_64-redhat-linux/bits/c++locale.h - /usr/include/c++/11/clocale + /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++/11/iosfwd - /usr/include/c++/11/cctype + /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++/11/bits/ostream_insert.h - /usr/include/c++/11/bits/cxxabi_forced.h - /usr/include/c++/11/bits/stl_function.h - /usr/include/c++/11/backward/binders.h - /usr/include/c++/11/bits/range_access.h - /usr/include/c++/11/initializer_list - /usr/include/c++/11/bits/basic_string.h - /usr/include/c++/11/ext/atomicity.h - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr.h - /usr/include/c++/11/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/sched.h - /usr/include/bits/types/struct_sched_param.h - /usr/include/bits/cpu-set.h - /usr/include/time.h - /usr/include/bits/time.h - /usr/include/bits/timex.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/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/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++/11/x86_64-redhat-linux/bits/atomic_word.h - /usr/include/sys/single_threaded.h - /usr/include/c++/11/ext/alloc_traits.h - /usr/include/c++/11/bits/alloc_traits.h - /usr/include/c++/11/bits/stl_construct.h - /usr/include/c++/11/ext/string_conversions.h - /usr/include/c++/11/cstdlib + /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/clock_t.h + /usr/include/bits/types/clockid_t.h + /usr/include/bits/types/time_t.h + /usr/include/bits/types/timer_t.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++/11/bits/std_abs.h - /usr/include/c++/11/cstdio + /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 @@ -801,7 +790,7 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o /usr/include/bits/types/cookie_io_functions_t.h /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h - /usr/include/c++/11/cerrno + /usr/include/c++/12/cerrno /usr/include/errno.h /usr/include/bits/errno.h /usr/include/linux/errno.h @@ -809,89 +798,104 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h /usr/include/bits/types/error_t.h - /usr/include/c++/11/bits/charconv.h - /usr/include/c++/11/bits/functional_hash.h - /usr/include/c++/11/bits/hash_bytes.h - /usr/include/c++/11/bits/basic_string.tcc - /usr/include/c++/11/utility - /usr/include/c++/11/bits/stl_relops.h - /usr/include/c++/11/iterator - /usr/include/c++/11/bits/stream_iterator.h - /usr/include/c++/11/bits/streambuf_iterator.h - /usr/include/c++/11/streambuf - /usr/include/c++/11/bits/ios_base.h - /usr/include/c++/11/bits/locale_classes.h - /usr/include/c++/11/bits/locale_classes.tcc - /usr/include/c++/11/system_error - /usr/include/c++/11/x86_64-redhat-linux/bits/error_constants.h - /usr/include/c++/11/stdexcept - /usr/include/c++/11/exception - /usr/include/c++/11/bits/exception_ptr.h - /usr/include/c++/11/bits/cxxabi_init_exception.h - /usr/include/c++/11/typeinfo - /usr/include/c++/11/bits/nested_exception.h - /usr/include/c++/11/bits/streambuf.tcc - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/optional.hpp - /usr/include/c++/11/memory - /usr/include/c++/11/bits/stl_uninitialized.h - /usr/include/c++/11/bits/stl_tempbuf.h - /usr/include/c++/11/bits/stl_raw_storage_iter.h - /usr/include/c++/11/bits/align.h - /usr/include/c++/11/bit - /usr/include/c++/11/bits/uses_allocator.h - /usr/include/c++/11/bits/unique_ptr.h - /usr/include/c++/11/tuple - /usr/include/c++/11/array - /usr/include/c++/11/bits/invoke.h - /usr/include/c++/11/bits/shared_ptr.h - /usr/include/c++/11/bits/shared_ptr_base.h - /usr/include/c++/11/bits/allocated_ptr.h - /usr/include/c++/11/bits/refwrap.h - /usr/include/c++/11/ext/aligned_buffer.h - /usr/include/c++/11/ext/concurrence.h - /usr/include/c++/11/bits/shared_ptr_atomic.h - /usr/include/c++/11/bits/atomic_base.h - /usr/include/c++/11/bits/atomic_lockfree_defines.h - /usr/include/c++/11/backward/auto_ptr.h - /usr/include/c++/11/algorithm - /usr/include/c++/11/bits/stl_algo.h - /usr/include/c++/11/bits/algorithmfwd.h - /usr/include/c++/11/bits/stl_heap.h - /usr/include/c++/11/bits/uniform_int_dist.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/string_view.hpp - /usr/include/c++/11/cassert + /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/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/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.84/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.84/LspCpp/third_party/uri/include/network/string_view.hpp + /usr/include/c++/12/cassert /usr/include/assert.h - /usr/include/c++/11/limits - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/grammar.hpp - /usr/include/c++/11/locale - /usr/include/c++/11/bits/locale_facets.h - /usr/include/c++/11/cwctype + /usr/include/c++/12/limits + /usr/local/src/asymptote-2.84/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/wctype.h /usr/include/bits/wctype-wchar.h - /usr/include/c++/11/x86_64-redhat-linux/bits/ctype_base.h - /usr/include/c++/11/x86_64-redhat-linux/bits/ctype_inline.h - /usr/include/c++/11/bits/locale_facets.tcc - /usr/include/c++/11/bits/locale_facets_nonio.h - /usr/include/c++/11/ctime - /usr/include/c++/11/x86_64-redhat-linux/bits/time_members.h - /usr/include/c++/11/x86_64-redhat-linux/bits/messages_members.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++/11/bits/codecvt.h - /usr/include/c++/11/bits/locale_facets_nonio.tcc - /usr/include/c++/11/bits/locale_conv.h - /usr/include/c++/11/cstring + /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/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_resolve.cpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/uri_resolve.cpp /usr/include/stdc-predef.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_resolve.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/uri.hpp - /usr/include/c++/11/iterator - /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.h + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/uri_resolve.hpp + /usr/local/src/asymptote-2.84/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++/11/x86_64-redhat-linux/bits/os_defines.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 @@ -899,28 +903,28 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o /usr/include/bits/long-double.h /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h - /usr/include/c++/11/x86_64-redhat-linux/bits/cpu_defines.h - /usr/include/c++/11/bits/stl_iterator_base_types.h - /usr/include/c++/11/type_traits - /usr/include/c++/11/bits/stl_iterator_base_funcs.h - /usr/include/c++/11/bits/concept_check.h - /usr/include/c++/11/debug/assertions.h - /usr/include/c++/11/bits/stl_iterator.h - /usr/include/c++/11/bits/cpp_type_traits.h - /usr/include/c++/11/ext/type_traits.h - /usr/include/c++/11/bits/move.h - /usr/include/c++/11/bits/ptr_traits.h - /usr/include/c++/11/iosfwd - /usr/include/c++/11/bits/stringfwd.h - /usr/include/c++/11/bits/memoryfwd.h - /usr/include/c++/11/bits/postypes.h - /usr/include/c++/11/cwchar + /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/bits/libc-header-start.h /usr/include/bits/floatn.h /usr/include/bits/floatn-common.h - /usr/lib/gcc/x86_64-redhat-linux/11/include/stddef.h - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdarg.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 @@ -929,26 +933,26 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o /usr/include/bits/types/FILE.h /usr/include/bits/types/locale_t.h /usr/include/bits/types/__locale_t.h - /usr/include/c++/11/bits/stream_iterator.h - /usr/include/c++/11/debug/debug.h - /usr/include/c++/11/bits/streambuf_iterator.h - /usr/include/c++/11/streambuf - /usr/include/c++/11/bits/localefwd.h - /usr/include/c++/11/x86_64-redhat-linux/bits/c++locale.h - /usr/include/c++/11/clocale + /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++/11/cctype + /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++/11/bits/ios_base.h - /usr/include/c++/11/ext/atomicity.h - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr.h - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr-default.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 @@ -968,45 +972,49 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o /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++/11/x86_64-redhat-linux/bits/atomic_word.h + /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h /usr/include/sys/single_threaded.h - /usr/include/c++/11/bits/locale_classes.h - /usr/include/c++/11/string - /usr/include/c++/11/bits/char_traits.h - /usr/include/c++/11/bits/stl_algobase.h - /usr/include/c++/11/bits/functexcept.h - /usr/include/c++/11/bits/exception_defines.h - /usr/include/c++/11/ext/numeric_traits.h - /usr/include/c++/11/bits/stl_pair.h - /usr/include/c++/11/bits/predefined_ops.h - /usr/include/c++/11/cstdint - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdint.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++/11/bits/allocator.h - /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h - /usr/include/c++/11/ext/new_allocator.h - /usr/include/c++/11/new - /usr/include/c++/11/bits/exception.h - /usr/include/c++/11/bits/ostream_insert.h - /usr/include/c++/11/bits/cxxabi_forced.h - /usr/include/c++/11/bits/stl_function.h - /usr/include/c++/11/backward/binders.h - /usr/include/c++/11/bits/range_access.h - /usr/include/c++/11/initializer_list - /usr/include/c++/11/bits/basic_string.h - /usr/include/c++/11/ext/alloc_traits.h - /usr/include/c++/11/bits/alloc_traits.h - /usr/include/c++/11/bits/stl_construct.h - /usr/include/c++/11/ext/string_conversions.h - /usr/include/c++/11/cstdlib + /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/waitflags.h /usr/include/bits/waitstatus.h @@ -1020,8 +1028,8 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o /usr/include/alloca.h /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h - /usr/include/c++/11/bits/std_abs.h - /usr/include/c++/11/cstdio + /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 @@ -1029,7 +1037,7 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o /usr/include/bits/types/cookie_io_functions_t.h /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h - /usr/include/c++/11/cerrno + /usr/include/c++/12/cerrno /usr/include/errno.h /usr/include/bits/errno.h /usr/include/linux/errno.h @@ -1037,74 +1045,71 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h /usr/include/bits/types/error_t.h - /usr/include/c++/11/bits/charconv.h - /usr/include/c++/11/bits/functional_hash.h - /usr/include/c++/11/bits/hash_bytes.h - /usr/include/c++/11/bits/basic_string.tcc - /usr/include/c++/11/bits/locale_classes.tcc - /usr/include/c++/11/system_error - /usr/include/c++/11/x86_64-redhat-linux/bits/error_constants.h - /usr/include/c++/11/stdexcept - /usr/include/c++/11/exception - /usr/include/c++/11/bits/exception_ptr.h - /usr/include/c++/11/bits/cxxabi_init_exception.h - /usr/include/c++/11/typeinfo - /usr/include/c++/11/bits/nested_exception.h - /usr/include/c++/11/bits/streambuf.tcc - /usr/include/c++/11/algorithm - /usr/include/c++/11/utility - /usr/include/c++/11/bits/stl_relops.h - /usr/include/c++/11/bits/stl_algo.h - /usr/include/c++/11/bits/algorithmfwd.h - /usr/include/c++/11/bits/stl_heap.h - /usr/include/c++/11/bits/stl_tempbuf.h - /usr/include/c++/11/bits/uniform_int_dist.h - /usr/include/c++/11/functional - /usr/include/c++/11/tuple - /usr/include/c++/11/array - /usr/include/c++/11/bits/uses_allocator.h - /usr/include/c++/11/bits/invoke.h - /usr/include/c++/11/bits/refwrap.h - /usr/include/c++/11/bits/std_function.h - /usr/include/c++/11/memory - /usr/include/c++/11/bits/stl_uninitialized.h - /usr/include/c++/11/bits/stl_raw_storage_iter.h - /usr/include/c++/11/bits/align.h - /usr/include/c++/11/bit - /usr/include/c++/11/bits/unique_ptr.h - /usr/include/c++/11/bits/shared_ptr.h - /usr/include/c++/11/bits/shared_ptr_base.h - /usr/include/c++/11/bits/allocated_ptr.h - /usr/include/c++/11/ext/aligned_buffer.h - /usr/include/c++/11/ext/concurrence.h - /usr/include/c++/11/bits/shared_ptr_atomic.h - /usr/include/c++/11/bits/atomic_base.h - /usr/include/c++/11/bits/atomic_lockfree_defines.h - /usr/include/c++/11/backward/auto_ptr.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/string_view.hpp - /usr/include/c++/11/cassert + /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.84/LspCpp/third_party/uri/include/network/string_view.hpp + /usr/include/c++/12/cassert /usr/include/assert.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/optional.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/config.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp - /usr/include/c++/11/cstring + /usr/local/src/asymptote-2.84/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.84/LspCpp/third_party/uri/include/network/uri/config.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp + /usr/local/src/asymptote-2.84/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.83/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/algorithm_find.hpp - /usr/include/c++/11/cstddef + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/algorithm_find.hpp + /usr/include/c++/12/cstddef third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/uri.cpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/uri.cpp /usr/include/stdc-predef.h - /usr/include/c++/11/cassert - /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.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++/11/x86_64-redhat-linux/bits/os_defines.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 @@ -1112,127 +1117,113 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o /usr/include/bits/long-double.h /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h - /usr/include/c++/11/x86_64-redhat-linux/bits/cpu_defines.h + /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h /usr/include/assert.h - /usr/include/c++/11/locale - /usr/include/c++/11/bits/localefwd.h - /usr/include/c++/11/x86_64-redhat-linux/bits/c++locale.h - /usr/include/c++/11/clocale + /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/11/include/stddef.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++/11/iosfwd - /usr/include/c++/11/bits/stringfwd.h - /usr/include/c++/11/bits/memoryfwd.h - /usr/include/c++/11/bits/postypes.h - /usr/include/c++/11/cwchar + /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/11/include/stdarg.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++/11/cctype + /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++/11/bits/locale_classes.h - /usr/include/c++/11/string - /usr/include/c++/11/bits/char_traits.h - /usr/include/c++/11/bits/stl_algobase.h - /usr/include/c++/11/bits/functexcept.h - /usr/include/c++/11/bits/exception_defines.h - /usr/include/c++/11/bits/cpp_type_traits.h - /usr/include/c++/11/ext/type_traits.h - /usr/include/c++/11/ext/numeric_traits.h - /usr/include/c++/11/bits/stl_pair.h - /usr/include/c++/11/bits/move.h - /usr/include/c++/11/type_traits - /usr/include/c++/11/bits/stl_iterator_base_types.h - /usr/include/c++/11/bits/stl_iterator_base_funcs.h - /usr/include/c++/11/bits/concept_check.h - /usr/include/c++/11/debug/assertions.h - /usr/include/c++/11/bits/stl_iterator.h - /usr/include/c++/11/bits/ptr_traits.h - /usr/include/c++/11/debug/debug.h - /usr/include/c++/11/bits/predefined_ops.h - /usr/include/c++/11/cstdint - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdint.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/stdint-intn.h /usr/include/bits/stdint-uintn.h - /usr/include/c++/11/bits/allocator.h - /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h - /usr/include/c++/11/ext/new_allocator.h - /usr/include/c++/11/new - /usr/include/c++/11/bits/exception.h - /usr/include/c++/11/bits/ostream_insert.h - /usr/include/c++/11/bits/cxxabi_forced.h - /usr/include/c++/11/bits/stl_function.h - /usr/include/c++/11/backward/binders.h - /usr/include/c++/11/bits/range_access.h - /usr/include/c++/11/initializer_list - /usr/include/c++/11/bits/basic_string.h - /usr/include/c++/11/ext/atomicity.h - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr.h - /usr/include/c++/11/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/sched.h - /usr/include/bits/types/struct_sched_param.h - /usr/include/bits/cpu-set.h - /usr/include/time.h - /usr/include/bits/time.h - /usr/include/bits/timex.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/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/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++/11/x86_64-redhat-linux/bits/atomic_word.h - /usr/include/sys/single_threaded.h - /usr/include/c++/11/ext/alloc_traits.h - /usr/include/c++/11/bits/alloc_traits.h - /usr/include/c++/11/bits/stl_construct.h - /usr/include/c++/11/ext/string_conversions.h - /usr/include/c++/11/cstdlib + /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/types/clock_t.h + /usr/include/bits/types/clockid_t.h + /usr/include/bits/types/time_t.h + /usr/include/bits/types/timer_t.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++/11/bits/std_abs.h - /usr/include/c++/11/cstdio + /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 @@ -1240,7 +1231,7 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o /usr/include/bits/types/cookie_io_functions_t.h /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h - /usr/include/c++/11/cerrno + /usr/include/c++/12/cerrno /usr/include/errno.h /usr/include/bits/errno.h /usr/include/linux/errno.h @@ -1248,102 +1239,117 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h /usr/include/bits/types/error_t.h - /usr/include/c++/11/bits/charconv.h - /usr/include/c++/11/bits/functional_hash.h - /usr/include/c++/11/bits/hash_bytes.h - /usr/include/c++/11/bits/basic_string.tcc - /usr/include/c++/11/bits/locale_classes.tcc - /usr/include/c++/11/bits/locale_facets.h - /usr/include/c++/11/cwctype + /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/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/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/wctype.h /usr/include/bits/wctype-wchar.h - /usr/include/c++/11/x86_64-redhat-linux/bits/ctype_base.h - /usr/include/c++/11/bits/ios_base.h - /usr/include/c++/11/system_error - /usr/include/c++/11/x86_64-redhat-linux/bits/error_constants.h - /usr/include/c++/11/stdexcept - /usr/include/c++/11/exception - /usr/include/c++/11/bits/exception_ptr.h - /usr/include/c++/11/bits/cxxabi_init_exception.h - /usr/include/c++/11/typeinfo - /usr/include/c++/11/bits/nested_exception.h - /usr/include/c++/11/streambuf - /usr/include/c++/11/bits/streambuf.tcc - /usr/include/c++/11/bits/streambuf_iterator.h - /usr/include/c++/11/x86_64-redhat-linux/bits/ctype_inline.h - /usr/include/c++/11/bits/locale_facets.tcc - /usr/include/c++/11/bits/locale_facets_nonio.h - /usr/include/c++/11/ctime - /usr/include/c++/11/x86_64-redhat-linux/bits/time_members.h - /usr/include/c++/11/x86_64-redhat-linux/bits/messages_members.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++/11/bits/codecvt.h - /usr/include/c++/11/bits/locale_facets_nonio.tcc - /usr/include/c++/11/bits/locale_conv.h - /usr/include/c++/11/bits/unique_ptr.h - /usr/include/c++/11/utility - /usr/include/c++/11/bits/stl_relops.h - /usr/include/c++/11/tuple - /usr/include/c++/11/array - /usr/include/c++/11/bits/uses_allocator.h - /usr/include/c++/11/bits/invoke.h - /usr/include/c++/11/algorithm - /usr/include/c++/11/bits/stl_algo.h - /usr/include/c++/11/bits/algorithmfwd.h - /usr/include/c++/11/bits/stl_heap.h - /usr/include/c++/11/bits/stl_tempbuf.h - /usr/include/c++/11/bits/uniform_int_dist.h - /usr/include/c++/11/functional - /usr/include/c++/11/bits/refwrap.h - /usr/include/c++/11/bits/std_function.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/uri.hpp - /usr/include/c++/11/iterator - /usr/include/c++/11/bits/stream_iterator.h - /usr/include/c++/11/memory - /usr/include/c++/11/bits/stl_uninitialized.h - /usr/include/c++/11/bits/stl_raw_storage_iter.h - /usr/include/c++/11/bits/align.h - /usr/include/c++/11/bit - /usr/include/c++/11/bits/shared_ptr.h - /usr/include/c++/11/bits/shared_ptr_base.h - /usr/include/c++/11/bits/allocated_ptr.h - /usr/include/c++/11/ext/aligned_buffer.h - /usr/include/c++/11/ext/concurrence.h - /usr/include/c++/11/bits/shared_ptr_atomic.h - /usr/include/c++/11/bits/atomic_base.h - /usr/include/c++/11/bits/atomic_lockfree_defines.h - /usr/include/c++/11/backward/auto_ptr.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/string_view.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/optional.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/config.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp - /usr/include/c++/11/cstring + /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.84/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.84/LspCpp/third_party/uri/include/network/string_view.hpp + /usr/local/src/asymptote-2.84/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.84/LspCpp/third_party/uri/include/network/uri/config.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp + /usr/local/src/asymptote-2.84/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.83/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_parse.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_advance_parts.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_percent_encode.hpp - /usr/include/c++/11/vector - /usr/include/c++/11/bits/stl_vector.h - /usr/include/c++/11/bits/stl_bvector.h - /usr/include/c++/11/bits/vector.tcc - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_normalize.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_resolve.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/algorithm.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/uri_parse.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/uri_advance_parts.hpp + /usr/local/src/asymptote-2.84/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.84/LspCpp/third_party/uri/src/detail/uri_normalize.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/uri_resolve.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/algorithm.hpp third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/uri_builder.cpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/uri_builder.cpp /usr/include/stdc-predef.h - /usr/include/c++/11/locale - /usr/include/c++/11/bits/localefwd.h - /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.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++/11/x86_64-redhat-linux/bits/os_defines.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 @@ -1351,124 +1357,110 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o /usr/include/bits/long-double.h /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h - /usr/include/c++/11/x86_64-redhat-linux/bits/cpu_defines.h - /usr/include/c++/11/x86_64-redhat-linux/bits/c++locale.h - /usr/include/c++/11/clocale + /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/11/include/stddef.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++/11/iosfwd - /usr/include/c++/11/bits/stringfwd.h - /usr/include/c++/11/bits/memoryfwd.h - /usr/include/c++/11/bits/postypes.h - /usr/include/c++/11/cwchar + /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/11/include/stdarg.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++/11/cctype + /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++/11/bits/locale_classes.h - /usr/include/c++/11/string - /usr/include/c++/11/bits/char_traits.h - /usr/include/c++/11/bits/stl_algobase.h - /usr/include/c++/11/bits/functexcept.h - /usr/include/c++/11/bits/exception_defines.h - /usr/include/c++/11/bits/cpp_type_traits.h - /usr/include/c++/11/ext/type_traits.h - /usr/include/c++/11/ext/numeric_traits.h - /usr/include/c++/11/bits/stl_pair.h - /usr/include/c++/11/bits/move.h - /usr/include/c++/11/type_traits - /usr/include/c++/11/bits/stl_iterator_base_types.h - /usr/include/c++/11/bits/stl_iterator_base_funcs.h - /usr/include/c++/11/bits/concept_check.h - /usr/include/c++/11/debug/assertions.h - /usr/include/c++/11/bits/stl_iterator.h - /usr/include/c++/11/bits/ptr_traits.h - /usr/include/c++/11/debug/debug.h - /usr/include/c++/11/bits/predefined_ops.h - /usr/include/c++/11/cstdint - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdint.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/stdint-intn.h /usr/include/bits/stdint-uintn.h - /usr/include/c++/11/bits/allocator.h - /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h - /usr/include/c++/11/ext/new_allocator.h - /usr/include/c++/11/new - /usr/include/c++/11/bits/exception.h - /usr/include/c++/11/bits/ostream_insert.h - /usr/include/c++/11/bits/cxxabi_forced.h - /usr/include/c++/11/bits/stl_function.h - /usr/include/c++/11/backward/binders.h - /usr/include/c++/11/bits/range_access.h - /usr/include/c++/11/initializer_list - /usr/include/c++/11/bits/basic_string.h - /usr/include/c++/11/ext/atomicity.h - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr.h - /usr/include/c++/11/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/sched.h - /usr/include/bits/types/struct_sched_param.h - /usr/include/bits/cpu-set.h - /usr/include/time.h - /usr/include/bits/time.h - /usr/include/bits/timex.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/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/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++/11/x86_64-redhat-linux/bits/atomic_word.h - /usr/include/sys/single_threaded.h - /usr/include/c++/11/ext/alloc_traits.h - /usr/include/c++/11/bits/alloc_traits.h - /usr/include/c++/11/bits/stl_construct.h - /usr/include/c++/11/ext/string_conversions.h - /usr/include/c++/11/cstdlib + /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/types/clock_t.h + /usr/include/bits/types/clockid_t.h + /usr/include/bits/types/time_t.h + /usr/include/bits/types/timer_t.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++/11/bits/std_abs.h - /usr/include/c++/11/cstdio + /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 @@ -1476,7 +1468,7 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o /usr/include/bits/types/cookie_io_functions_t.h /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h - /usr/include/c++/11/cerrno + /usr/include/c++/12/cerrno /usr/include/errno.h /usr/include/bits/errno.h /usr/include/linux/errno.h @@ -1484,96 +1476,111 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h /usr/include/bits/types/error_t.h - /usr/include/c++/11/bits/charconv.h - /usr/include/c++/11/bits/functional_hash.h - /usr/include/c++/11/bits/hash_bytes.h - /usr/include/c++/11/bits/basic_string.tcc - /usr/include/c++/11/bits/locale_classes.tcc - /usr/include/c++/11/bits/locale_facets.h - /usr/include/c++/11/cwctype + /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/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/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/wctype.h /usr/include/bits/wctype-wchar.h - /usr/include/c++/11/x86_64-redhat-linux/bits/ctype_base.h - /usr/include/c++/11/bits/ios_base.h - /usr/include/c++/11/system_error - /usr/include/c++/11/x86_64-redhat-linux/bits/error_constants.h - /usr/include/c++/11/stdexcept - /usr/include/c++/11/exception - /usr/include/c++/11/bits/exception_ptr.h - /usr/include/c++/11/bits/cxxabi_init_exception.h - /usr/include/c++/11/typeinfo - /usr/include/c++/11/bits/nested_exception.h - /usr/include/c++/11/streambuf - /usr/include/c++/11/bits/streambuf.tcc - /usr/include/c++/11/bits/streambuf_iterator.h - /usr/include/c++/11/x86_64-redhat-linux/bits/ctype_inline.h - /usr/include/c++/11/bits/locale_facets.tcc - /usr/include/c++/11/bits/locale_facets_nonio.h - /usr/include/c++/11/ctime - /usr/include/c++/11/x86_64-redhat-linux/bits/time_members.h - /usr/include/c++/11/x86_64-redhat-linux/bits/messages_members.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++/11/bits/codecvt.h - /usr/include/c++/11/bits/locale_facets_nonio.tcc - /usr/include/c++/11/bits/locale_conv.h - /usr/include/c++/11/bits/unique_ptr.h - /usr/include/c++/11/utility - /usr/include/c++/11/bits/stl_relops.h - /usr/include/c++/11/tuple - /usr/include/c++/11/array - /usr/include/c++/11/bits/uses_allocator.h - /usr/include/c++/11/bits/invoke.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/uri.hpp - /usr/include/c++/11/iterator - /usr/include/c++/11/bits/stream_iterator.h - /usr/include/c++/11/algorithm - /usr/include/c++/11/bits/stl_algo.h - /usr/include/c++/11/bits/algorithmfwd.h - /usr/include/c++/11/bits/stl_heap.h - /usr/include/c++/11/bits/stl_tempbuf.h - /usr/include/c++/11/bits/uniform_int_dist.h - /usr/include/c++/11/functional - /usr/include/c++/11/bits/refwrap.h - /usr/include/c++/11/bits/std_function.h - /usr/include/c++/11/memory - /usr/include/c++/11/bits/stl_uninitialized.h - /usr/include/c++/11/bits/stl_raw_storage_iter.h - /usr/include/c++/11/bits/align.h - /usr/include/c++/11/bit - /usr/include/c++/11/bits/shared_ptr.h - /usr/include/c++/11/bits/shared_ptr_base.h - /usr/include/c++/11/bits/allocated_ptr.h - /usr/include/c++/11/ext/aligned_buffer.h - /usr/include/c++/11/ext/concurrence.h - /usr/include/c++/11/bits/shared_ptr_atomic.h - /usr/include/c++/11/bits/atomic_base.h - /usr/include/c++/11/bits/atomic_lockfree_defines.h - /usr/include/c++/11/backward/auto_ptr.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/string_view.hpp - /usr/include/c++/11/cassert + /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.84/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.84/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.84/LspCpp/third_party/uri/include/network/string_view.hpp + /usr/include/c++/12/cassert /usr/include/assert.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/optional.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/config.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp - /usr/include/c++/11/cstring + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/optional.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/config.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp + /usr/local/src/asymptote-2.84/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.83/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_normalize.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/uri_parse_authority.hpp - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/detail/algorithm.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/uri_normalize.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/uri_parse_authority.hpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/detail/algorithm.hpp third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/uri_errors.cpp + /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src/uri_errors.cpp /usr/include/stdc-predef.h - /usr/include/c++/11/string - /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.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++/11/x86_64-redhat-linux/bits/os_defines.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 @@ -1581,35 +1588,18 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o /usr/include/bits/long-double.h /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h - /usr/include/c++/11/x86_64-redhat-linux/bits/cpu_defines.h - /usr/include/c++/11/bits/stringfwd.h - /usr/include/c++/11/bits/memoryfwd.h - /usr/include/c++/11/bits/char_traits.h - /usr/include/c++/11/bits/stl_algobase.h - /usr/include/c++/11/bits/functexcept.h - /usr/include/c++/11/bits/exception_defines.h - /usr/include/c++/11/bits/cpp_type_traits.h - /usr/include/c++/11/ext/type_traits.h - /usr/include/c++/11/ext/numeric_traits.h - /usr/include/c++/11/bits/stl_pair.h - /usr/include/c++/11/bits/move.h - /usr/include/c++/11/type_traits - /usr/include/c++/11/bits/stl_iterator_base_types.h - /usr/include/c++/11/bits/stl_iterator_base_funcs.h - /usr/include/c++/11/bits/concept_check.h - /usr/include/c++/11/debug/assertions.h - /usr/include/c++/11/bits/stl_iterator.h - /usr/include/c++/11/bits/ptr_traits.h - /usr/include/c++/11/debug/debug.h - /usr/include/c++/11/bits/predefined_ops.h - /usr/include/c++/11/bits/postypes.h - /usr/include/c++/11/cwchar + /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/11/include/stddef.h - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdarg.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 @@ -1618,86 +1608,89 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o /usr/include/bits/types/FILE.h /usr/include/bits/types/locale_t.h /usr/include/bits/types/__locale_t.h - /usr/include/c++/11/cstdint - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdint.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++/11/bits/allocator.h - /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h - /usr/include/c++/11/ext/new_allocator.h - /usr/include/c++/11/new - /usr/include/c++/11/bits/exception.h - /usr/include/c++/11/bits/localefwd.h - /usr/include/c++/11/x86_64-redhat-linux/bits/c++locale.h - /usr/include/c++/11/clocale + /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++/11/iosfwd - /usr/include/c++/11/cctype + /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++/11/bits/ostream_insert.h - /usr/include/c++/11/bits/cxxabi_forced.h - /usr/include/c++/11/bits/stl_function.h - /usr/include/c++/11/backward/binders.h - /usr/include/c++/11/bits/range_access.h - /usr/include/c++/11/initializer_list - /usr/include/c++/11/bits/basic_string.h - /usr/include/c++/11/ext/atomicity.h - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr.h - /usr/include/c++/11/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/sched.h - /usr/include/bits/types/struct_sched_param.h - /usr/include/bits/cpu-set.h - /usr/include/time.h - /usr/include/bits/time.h - /usr/include/bits/timex.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/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/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++/11/x86_64-redhat-linux/bits/atomic_word.h - /usr/include/sys/single_threaded.h - /usr/include/c++/11/ext/alloc_traits.h - /usr/include/c++/11/bits/alloc_traits.h - /usr/include/c++/11/bits/stl_construct.h - /usr/include/c++/11/ext/string_conversions.h - /usr/include/c++/11/cstdlib + /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/clock_t.h + /usr/include/bits/types/clockid_t.h + /usr/include/bits/types/time_t.h + /usr/include/bits/types/timer_t.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++/11/bits/std_abs.h - /usr/include/c++/11/cstdio + /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 @@ -1705,7 +1698,7 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o /usr/include/bits/types/cookie_io_functions_t.h /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h - /usr/include/c++/11/cerrno + /usr/include/c++/12/cerrno /usr/include/errno.h /usr/include/bits/errno.h /usr/include/linux/errno.h @@ -1713,18 +1706,18 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h /usr/include/bits/types/error_t.h - /usr/include/c++/11/bits/charconv.h - /usr/include/c++/11/bits/functional_hash.h - /usr/include/c++/11/bits/hash_bytes.h - /usr/include/c++/11/bits/basic_string.tcc - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp - /usr/include/c++/11/system_error - /usr/include/c++/11/x86_64-redhat-linux/bits/error_constants.h - /usr/include/c++/11/stdexcept - /usr/include/c++/11/exception - /usr/include/c++/11/bits/exception_ptr.h - /usr/include/c++/11/bits/cxxabi_init_exception.h - /usr/include/c++/11/typeinfo - /usr/include/c++/11/bits/nested_exception.h - /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include/network/uri/config.hpp + /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.84/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.84/LspCpp/third_party/uri/include/network/uri/config.hpp diff --git a/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.make b/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.make index 7124f84e5b..d8013e34c3 100644 --- a/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.make +++ b/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.make @@ -1,14 +1,14 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.22 +# Generated by "Unix Makefiles" Generator, CMake Version 3.25 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++/11/string \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.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++/11/x86_64-redhat-linux/bits/os_defines.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 \ @@ -16,35 +16,18 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o: t /usr/include/bits/long-double.h \ /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/cpu_defines.h \ - /usr/include/c++/11/bits/stringfwd.h \ - /usr/include/c++/11/bits/memoryfwd.h \ - /usr/include/c++/11/bits/char_traits.h \ - /usr/include/c++/11/bits/stl_algobase.h \ - /usr/include/c++/11/bits/functexcept.h \ - /usr/include/c++/11/bits/exception_defines.h \ - /usr/include/c++/11/bits/cpp_type_traits.h \ - /usr/include/c++/11/ext/type_traits.h \ - /usr/include/c++/11/ext/numeric_traits.h \ - /usr/include/c++/11/bits/stl_pair.h \ - /usr/include/c++/11/bits/move.h \ - /usr/include/c++/11/type_traits \ - /usr/include/c++/11/bits/stl_iterator_base_types.h \ - /usr/include/c++/11/bits/stl_iterator_base_funcs.h \ - /usr/include/c++/11/bits/concept_check.h \ - /usr/include/c++/11/debug/assertions.h \ - /usr/include/c++/11/bits/stl_iterator.h \ - /usr/include/c++/11/bits/ptr_traits.h \ - /usr/include/c++/11/debug/debug.h \ - /usr/include/c++/11/bits/predefined_ops.h \ - /usr/include/c++/11/bits/postypes.h \ - /usr/include/c++/11/cwchar \ + /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/11/include/stddef.h \ - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdarg.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 \ @@ -53,86 +36,89 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o: t /usr/include/bits/types/FILE.h \ /usr/include/bits/types/locale_t.h \ /usr/include/bits/types/__locale_t.h \ - /usr/include/c++/11/cstdint \ - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdint.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++/11/bits/allocator.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h \ - /usr/include/c++/11/ext/new_allocator.h \ - /usr/include/c++/11/new \ - /usr/include/c++/11/bits/exception.h \ - /usr/include/c++/11/bits/localefwd.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++locale.h \ - /usr/include/c++/11/clocale \ + /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++/11/iosfwd \ - /usr/include/c++/11/cctype \ + /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++/11/bits/ostream_insert.h \ - /usr/include/c++/11/bits/cxxabi_forced.h \ - /usr/include/c++/11/bits/stl_function.h \ - /usr/include/c++/11/backward/binders.h \ - /usr/include/c++/11/bits/range_access.h \ - /usr/include/c++/11/initializer_list \ - /usr/include/c++/11/bits/basic_string.h \ - /usr/include/c++/11/ext/atomicity.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr.h \ - /usr/include/c++/11/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/sched.h \ - /usr/include/bits/types/struct_sched_param.h \ - /usr/include/bits/cpu-set.h \ - /usr/include/time.h \ - /usr/include/bits/time.h \ - /usr/include/bits/timex.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/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/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++/11/x86_64-redhat-linux/bits/atomic_word.h \ - /usr/include/sys/single_threaded.h \ - /usr/include/c++/11/ext/alloc_traits.h \ - /usr/include/c++/11/bits/alloc_traits.h \ - /usr/include/c++/11/bits/stl_construct.h \ - /usr/include/c++/11/ext/string_conversions.h \ - /usr/include/c++/11/cstdlib \ + /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/clock_t.h \ + /usr/include/bits/types/clockid_t.h \ + /usr/include/bits/types/time_t.h \ + /usr/include/bits/types/timer_t.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++/11/bits/std_abs.h \ - /usr/include/c++/11/cstdio \ + /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 \ @@ -140,7 +126,7 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o: t /usr/include/bits/types/cookie_io_functions_t.h \ /usr/include/bits/stdio_lim.h \ /usr/include/bits/stdio.h \ - /usr/include/c++/11/cerrno \ + /usr/include/c++/12/cerrno \ /usr/include/errno.h \ /usr/include/bits/errno.h \ /usr/include/linux/errno.h \ @@ -148,68 +134,83 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o: t /usr/include/asm-generic/errno.h \ /usr/include/asm-generic/errno-base.h \ /usr/include/bits/types/error_t.h \ - /usr/include/c++/11/bits/charconv.h \ - /usr/include/c++/11/bits/functional_hash.h \ - /usr/include/c++/11/bits/hash_bytes.h \ - /usr/include/c++/11/bits/basic_string.tcc \ - /usr/include/c++/11/utility \ - /usr/include/c++/11/bits/stl_relops.h \ - /usr/include/c++/11/iterator \ - /usr/include/c++/11/bits/stream_iterator.h \ - /usr/include/c++/11/bits/streambuf_iterator.h \ - /usr/include/c++/11/streambuf \ - /usr/include/c++/11/bits/ios_base.h \ - /usr/include/c++/11/bits/locale_classes.h \ - /usr/include/c++/11/bits/locale_classes.tcc \ - /usr/include/c++/11/system_error \ - /usr/include/c++/11/x86_64-redhat-linux/bits/error_constants.h \ - /usr/include/c++/11/stdexcept \ - /usr/include/c++/11/exception \ - /usr/include/c++/11/bits/exception_ptr.h \ - /usr/include/c++/11/bits/cxxabi_init_exception.h \ - /usr/include/c++/11/typeinfo \ - /usr/include/c++/11/bits/nested_exception.h \ - /usr/include/c++/11/bits/streambuf.tcc \ + /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/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/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 \ third_party/uri/include/network/optional.hpp \ - /usr/include/c++/11/memory \ - /usr/include/c++/11/bits/stl_uninitialized.h \ - /usr/include/c++/11/bits/stl_tempbuf.h \ - /usr/include/c++/11/bits/stl_raw_storage_iter.h \ - /usr/include/c++/11/bits/align.h \ - /usr/include/c++/11/bit \ - /usr/include/c++/11/bits/uses_allocator.h \ - /usr/include/c++/11/bits/unique_ptr.h \ - /usr/include/c++/11/tuple \ - /usr/include/c++/11/array \ - /usr/include/c++/11/bits/invoke.h \ - /usr/include/c++/11/bits/shared_ptr.h \ - /usr/include/c++/11/bits/shared_ptr_base.h \ - /usr/include/c++/11/bits/allocated_ptr.h \ - /usr/include/c++/11/bits/refwrap.h \ - /usr/include/c++/11/ext/aligned_buffer.h \ - /usr/include/c++/11/ext/concurrence.h \ - /usr/include/c++/11/bits/shared_ptr_atomic.h \ - /usr/include/c++/11/bits/atomic_base.h \ - /usr/include/c++/11/bits/atomic_lockfree_defines.h \ - /usr/include/c++/11/backward/auto_ptr.h \ - /usr/include/c++/11/algorithm \ - /usr/include/c++/11/bits/stl_algo.h \ - /usr/include/c++/11/bits/algorithmfwd.h \ - /usr/include/c++/11/bits/stl_heap.h \ - /usr/include/c++/11/bits/uniform_int_dist.h \ + /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++/11/cassert \ + /usr/include/c++/12/cassert \ /usr/include/assert.h \ - /usr/include/c++/11/limits + /usr/include/c++/12/limits 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++/11/iterator \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.h \ + /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++/11/x86_64-redhat-linux/bits/os_defines.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 \ @@ -217,28 +218,28 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o: third /usr/include/bits/long-double.h \ /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/cpu_defines.h \ - /usr/include/c++/11/bits/stl_iterator_base_types.h \ - /usr/include/c++/11/type_traits \ - /usr/include/c++/11/bits/stl_iterator_base_funcs.h \ - /usr/include/c++/11/bits/concept_check.h \ - /usr/include/c++/11/debug/assertions.h \ - /usr/include/c++/11/bits/stl_iterator.h \ - /usr/include/c++/11/bits/cpp_type_traits.h \ - /usr/include/c++/11/ext/type_traits.h \ - /usr/include/c++/11/bits/move.h \ - /usr/include/c++/11/bits/ptr_traits.h \ - /usr/include/c++/11/iosfwd \ - /usr/include/c++/11/bits/stringfwd.h \ - /usr/include/c++/11/bits/memoryfwd.h \ - /usr/include/c++/11/bits/postypes.h \ - /usr/include/c++/11/cwchar \ + /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/bits/libc-header-start.h \ /usr/include/bits/floatn.h \ /usr/include/bits/floatn-common.h \ - /usr/lib/gcc/x86_64-redhat-linux/11/include/stddef.h \ - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdarg.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 \ @@ -247,26 +248,26 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o: third /usr/include/bits/types/FILE.h \ /usr/include/bits/types/locale_t.h \ /usr/include/bits/types/__locale_t.h \ - /usr/include/c++/11/bits/stream_iterator.h \ - /usr/include/c++/11/debug/debug.h \ - /usr/include/c++/11/bits/streambuf_iterator.h \ - /usr/include/c++/11/streambuf \ - /usr/include/c++/11/bits/localefwd.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++locale.h \ - /usr/include/c++/11/clocale \ + /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++/11/cctype \ + /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++/11/bits/ios_base.h \ - /usr/include/c++/11/ext/atomicity.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr-default.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 \ @@ -286,45 +287,49 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o: third /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++/11/x86_64-redhat-linux/bits/atomic_word.h \ + /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h \ /usr/include/sys/single_threaded.h \ - /usr/include/c++/11/bits/locale_classes.h \ - /usr/include/c++/11/string \ - /usr/include/c++/11/bits/char_traits.h \ - /usr/include/c++/11/bits/stl_algobase.h \ - /usr/include/c++/11/bits/functexcept.h \ - /usr/include/c++/11/bits/exception_defines.h \ - /usr/include/c++/11/ext/numeric_traits.h \ - /usr/include/c++/11/bits/stl_pair.h \ - /usr/include/c++/11/bits/predefined_ops.h \ - /usr/include/c++/11/cstdint \ - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdint.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++/11/bits/allocator.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h \ - /usr/include/c++/11/ext/new_allocator.h \ - /usr/include/c++/11/new \ - /usr/include/c++/11/bits/exception.h \ - /usr/include/c++/11/bits/ostream_insert.h \ - /usr/include/c++/11/bits/cxxabi_forced.h \ - /usr/include/c++/11/bits/stl_function.h \ - /usr/include/c++/11/backward/binders.h \ - /usr/include/c++/11/bits/range_access.h \ - /usr/include/c++/11/initializer_list \ - /usr/include/c++/11/bits/basic_string.h \ - /usr/include/c++/11/ext/alloc_traits.h \ - /usr/include/c++/11/bits/alloc_traits.h \ - /usr/include/c++/11/bits/stl_construct.h \ - /usr/include/c++/11/ext/string_conversions.h \ - /usr/include/c++/11/cstdlib \ + /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/waitflags.h \ /usr/include/bits/waitstatus.h \ @@ -338,8 +343,8 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o: third /usr/include/alloca.h \ /usr/include/bits/stdlib-bsearch.h \ /usr/include/bits/stdlib-float.h \ - /usr/include/c++/11/bits/std_abs.h \ - /usr/include/c++/11/cstdio \ + /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 \ @@ -347,7 +352,7 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o: third /usr/include/bits/types/cookie_io_functions_t.h \ /usr/include/bits/stdio_lim.h \ /usr/include/bits/stdio.h \ - /usr/include/c++/11/cerrno \ + /usr/include/c++/12/cerrno \ /usr/include/errno.h \ /usr/include/bits/errno.h \ /usr/include/linux/errno.h \ @@ -355,85 +360,82 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o: third /usr/include/asm-generic/errno.h \ /usr/include/asm-generic/errno-base.h \ /usr/include/bits/types/error_t.h \ - /usr/include/c++/11/bits/charconv.h \ - /usr/include/c++/11/bits/functional_hash.h \ - /usr/include/c++/11/bits/hash_bytes.h \ - /usr/include/c++/11/bits/basic_string.tcc \ - /usr/include/c++/11/bits/locale_classes.tcc \ - /usr/include/c++/11/system_error \ - /usr/include/c++/11/x86_64-redhat-linux/bits/error_constants.h \ - /usr/include/c++/11/stdexcept \ - /usr/include/c++/11/exception \ - /usr/include/c++/11/bits/exception_ptr.h \ - /usr/include/c++/11/bits/cxxabi_init_exception.h \ - /usr/include/c++/11/typeinfo \ - /usr/include/c++/11/bits/nested_exception.h \ - /usr/include/c++/11/bits/streambuf.tcc \ - /usr/include/c++/11/algorithm \ - /usr/include/c++/11/utility \ - /usr/include/c++/11/bits/stl_relops.h \ - /usr/include/c++/11/bits/stl_algo.h \ - /usr/include/c++/11/bits/algorithmfwd.h \ - /usr/include/c++/11/bits/stl_heap.h \ - /usr/include/c++/11/bits/stl_tempbuf.h \ - /usr/include/c++/11/bits/uniform_int_dist.h \ - /usr/include/c++/11/functional \ - /usr/include/c++/11/tuple \ - /usr/include/c++/11/array \ - /usr/include/c++/11/bits/uses_allocator.h \ - /usr/include/c++/11/bits/invoke.h \ - /usr/include/c++/11/bits/refwrap.h \ - /usr/include/c++/11/bits/std_function.h \ - /usr/include/c++/11/memory \ - /usr/include/c++/11/bits/stl_uninitialized.h \ - /usr/include/c++/11/bits/stl_raw_storage_iter.h \ - /usr/include/c++/11/bits/align.h \ - /usr/include/c++/11/bit \ - /usr/include/c++/11/bits/unique_ptr.h \ - /usr/include/c++/11/bits/shared_ptr.h \ - /usr/include/c++/11/bits/shared_ptr_base.h \ - /usr/include/c++/11/bits/allocated_ptr.h \ - /usr/include/c++/11/ext/aligned_buffer.h \ - /usr/include/c++/11/ext/concurrence.h \ - /usr/include/c++/11/bits/shared_ptr_atomic.h \ - /usr/include/c++/11/bits/atomic_base.h \ - /usr/include/c++/11/bits/atomic_lockfree_defines.h \ - /usr/include/c++/11/backward/auto_ptr.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 \ third_party/uri/include/network/string_view.hpp \ - /usr/include/c++/11/cassert \ + /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/encode.hpp \ - /usr/include/c++/11/cstring \ + /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/uri_builder.hpp \ third_party/uri/src/detail/uri_percent_encode.hpp \ - /usr/include/c++/11/vector \ - /usr/include/c++/11/bits/stl_vector.h \ - /usr/include/c++/11/bits/stl_bvector.h \ - /usr/include/c++/11/bits/vector.tcc \ - /usr/include/c++/11/locale \ - /usr/include/c++/11/bits/locale_facets.h \ - /usr/include/c++/11/cwctype \ + /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++/11/x86_64-redhat-linux/bits/ctype_base.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/ctype_inline.h \ - /usr/include/c++/11/bits/locale_facets.tcc \ - /usr/include/c++/11/bits/locale_facets_nonio.h \ - /usr/include/c++/11/ctime \ - /usr/include/c++/11/x86_64-redhat-linux/bits/time_members.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/messages_members.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++/11/bits/codecvt.h \ - /usr/include/c++/11/bits/locale_facets_nonio.tcc \ - /usr/include/c++/11/bits/locale_conv.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/src/detail/algorithm.hpp \ third_party/uri/src/detail/algorithm_split.hpp @@ -441,10 +443,10 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o: third_par /usr/include/stdc-predef.h \ third_party/uri/src/detail/uri_parse.hpp \ third_party/uri/include/network/string_view.hpp \ - /usr/include/c++/11/string \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.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++/11/x86_64-redhat-linux/bits/os_defines.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 \ @@ -452,35 +454,18 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o: third_par /usr/include/bits/long-double.h \ /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/cpu_defines.h \ - /usr/include/c++/11/bits/stringfwd.h \ - /usr/include/c++/11/bits/memoryfwd.h \ - /usr/include/c++/11/bits/char_traits.h \ - /usr/include/c++/11/bits/stl_algobase.h \ - /usr/include/c++/11/bits/functexcept.h \ - /usr/include/c++/11/bits/exception_defines.h \ - /usr/include/c++/11/bits/cpp_type_traits.h \ - /usr/include/c++/11/ext/type_traits.h \ - /usr/include/c++/11/ext/numeric_traits.h \ - /usr/include/c++/11/bits/stl_pair.h \ - /usr/include/c++/11/bits/move.h \ - /usr/include/c++/11/type_traits \ - /usr/include/c++/11/bits/stl_iterator_base_types.h \ - /usr/include/c++/11/bits/stl_iterator_base_funcs.h \ - /usr/include/c++/11/bits/concept_check.h \ - /usr/include/c++/11/debug/assertions.h \ - /usr/include/c++/11/bits/stl_iterator.h \ - /usr/include/c++/11/bits/ptr_traits.h \ - /usr/include/c++/11/debug/debug.h \ - /usr/include/c++/11/bits/predefined_ops.h \ - /usr/include/c++/11/bits/postypes.h \ - /usr/include/c++/11/cwchar \ + /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/11/include/stddef.h \ - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdarg.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 \ @@ -489,86 +474,89 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o: third_par /usr/include/bits/types/FILE.h \ /usr/include/bits/types/locale_t.h \ /usr/include/bits/types/__locale_t.h \ - /usr/include/c++/11/cstdint \ - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdint.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++/11/bits/allocator.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h \ - /usr/include/c++/11/ext/new_allocator.h \ - /usr/include/c++/11/new \ - /usr/include/c++/11/bits/exception.h \ - /usr/include/c++/11/bits/localefwd.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++locale.h \ - /usr/include/c++/11/clocale \ + /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++/11/iosfwd \ - /usr/include/c++/11/cctype \ + /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++/11/bits/ostream_insert.h \ - /usr/include/c++/11/bits/cxxabi_forced.h \ - /usr/include/c++/11/bits/stl_function.h \ - /usr/include/c++/11/backward/binders.h \ - /usr/include/c++/11/bits/range_access.h \ - /usr/include/c++/11/initializer_list \ - /usr/include/c++/11/bits/basic_string.h \ - /usr/include/c++/11/ext/atomicity.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr.h \ - /usr/include/c++/11/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/sched.h \ - /usr/include/bits/types/struct_sched_param.h \ - /usr/include/bits/cpu-set.h \ - /usr/include/time.h \ - /usr/include/bits/time.h \ - /usr/include/bits/timex.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/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/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++/11/x86_64-redhat-linux/bits/atomic_word.h \ - /usr/include/sys/single_threaded.h \ - /usr/include/c++/11/ext/alloc_traits.h \ - /usr/include/c++/11/bits/alloc_traits.h \ - /usr/include/c++/11/bits/stl_construct.h \ - /usr/include/c++/11/ext/string_conversions.h \ - /usr/include/c++/11/cstdlib \ + /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/clock_t.h \ + /usr/include/bits/types/clockid_t.h \ + /usr/include/bits/types/time_t.h \ + /usr/include/bits/types/timer_t.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++/11/bits/std_abs.h \ - /usr/include/c++/11/cstdio \ + /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 \ @@ -576,7 +564,7 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o: third_par /usr/include/bits/types/cookie_io_functions_t.h \ /usr/include/bits/stdio_lim.h \ /usr/include/bits/stdio.h \ - /usr/include/c++/11/cerrno \ + /usr/include/c++/12/cerrno \ /usr/include/errno.h \ /usr/include/bits/errno.h \ /usr/include/linux/errno.h \ @@ -584,88 +572,103 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o: third_par /usr/include/asm-generic/errno.h \ /usr/include/asm-generic/errno-base.h \ /usr/include/bits/types/error_t.h \ - /usr/include/c++/11/bits/charconv.h \ - /usr/include/c++/11/bits/functional_hash.h \ - /usr/include/c++/11/bits/hash_bytes.h \ - /usr/include/c++/11/bits/basic_string.tcc \ - /usr/include/c++/11/iterator \ - /usr/include/c++/11/bits/stream_iterator.h \ - /usr/include/c++/11/bits/streambuf_iterator.h \ - /usr/include/c++/11/streambuf \ - /usr/include/c++/11/bits/ios_base.h \ - /usr/include/c++/11/bits/locale_classes.h \ - /usr/include/c++/11/bits/locale_classes.tcc \ - /usr/include/c++/11/system_error \ - /usr/include/c++/11/x86_64-redhat-linux/bits/error_constants.h \ - /usr/include/c++/11/stdexcept \ - /usr/include/c++/11/exception \ - /usr/include/c++/11/bits/exception_ptr.h \ - /usr/include/c++/11/bits/cxxabi_init_exception.h \ - /usr/include/c++/11/typeinfo \ - /usr/include/c++/11/bits/nested_exception.h \ - /usr/include/c++/11/bits/streambuf.tcc \ - /usr/include/c++/11/cassert \ + /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/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/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++/11/algorithm \ - /usr/include/c++/11/utility \ - /usr/include/c++/11/bits/stl_relops.h \ - /usr/include/c++/11/bits/stl_algo.h \ - /usr/include/c++/11/bits/algorithmfwd.h \ - /usr/include/c++/11/bits/stl_heap.h \ - /usr/include/c++/11/bits/stl_tempbuf.h \ - /usr/include/c++/11/bits/uniform_int_dist.h \ - /usr/include/c++/11/limits \ + /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++/11/locale \ - /usr/include/c++/11/bits/locale_facets.h \ - /usr/include/c++/11/cwctype \ + /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++/11/x86_64-redhat-linux/bits/ctype_base.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/ctype_inline.h \ - /usr/include/c++/11/bits/locale_facets.tcc \ - /usr/include/c++/11/bits/locale_facets_nonio.h \ - /usr/include/c++/11/ctime \ - /usr/include/c++/11/x86_64-redhat-linux/bits/time_members.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/messages_members.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++/11/bits/codecvt.h \ - /usr/include/c++/11/bits/locale_facets_nonio.tcc \ - /usr/include/c++/11/bits/locale_conv.h \ - /usr/include/c++/11/bits/unique_ptr.h \ - /usr/include/c++/11/tuple \ - /usr/include/c++/11/array \ - /usr/include/c++/11/bits/uses_allocator.h \ - /usr/include/c++/11/bits/invoke.h \ - /usr/include/c++/11/cstring \ + /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/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++/11/memory \ - /usr/include/c++/11/bits/stl_uninitialized.h \ - /usr/include/c++/11/bits/stl_raw_storage_iter.h \ - /usr/include/c++/11/bits/align.h \ - /usr/include/c++/11/bit \ - /usr/include/c++/11/bits/shared_ptr.h \ - /usr/include/c++/11/bits/shared_ptr_base.h \ - /usr/include/c++/11/bits/allocated_ptr.h \ - /usr/include/c++/11/bits/refwrap.h \ - /usr/include/c++/11/ext/aligned_buffer.h \ - /usr/include/c++/11/ext/concurrence.h \ - /usr/include/c++/11/bits/shared_ptr_atomic.h \ - /usr/include/c++/11/bits/atomic_base.h \ - /usr/include/c++/11/bits/atomic_lockfree_defines.h \ - /usr/include/c++/11/backward/auto_ptr.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/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/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++/11/string \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.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++/11/x86_64-redhat-linux/bits/os_defines.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 \ @@ -673,35 +676,18 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o: /usr/include/bits/long-double.h \ /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/cpu_defines.h \ - /usr/include/c++/11/bits/stringfwd.h \ - /usr/include/c++/11/bits/memoryfwd.h \ - /usr/include/c++/11/bits/char_traits.h \ - /usr/include/c++/11/bits/stl_algobase.h \ - /usr/include/c++/11/bits/functexcept.h \ - /usr/include/c++/11/bits/exception_defines.h \ - /usr/include/c++/11/bits/cpp_type_traits.h \ - /usr/include/c++/11/ext/type_traits.h \ - /usr/include/c++/11/ext/numeric_traits.h \ - /usr/include/c++/11/bits/stl_pair.h \ - /usr/include/c++/11/bits/move.h \ - /usr/include/c++/11/type_traits \ - /usr/include/c++/11/bits/stl_iterator_base_types.h \ - /usr/include/c++/11/bits/stl_iterator_base_funcs.h \ - /usr/include/c++/11/bits/concept_check.h \ - /usr/include/c++/11/debug/assertions.h \ - /usr/include/c++/11/bits/stl_iterator.h \ - /usr/include/c++/11/bits/ptr_traits.h \ - /usr/include/c++/11/debug/debug.h \ - /usr/include/c++/11/bits/predefined_ops.h \ - /usr/include/c++/11/bits/postypes.h \ - /usr/include/c++/11/cwchar \ + /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/11/include/stddef.h \ - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdarg.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 \ @@ -710,86 +696,89 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o: /usr/include/bits/types/FILE.h \ /usr/include/bits/types/locale_t.h \ /usr/include/bits/types/__locale_t.h \ - /usr/include/c++/11/cstdint \ - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdint.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++/11/bits/allocator.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h \ - /usr/include/c++/11/ext/new_allocator.h \ - /usr/include/c++/11/new \ - /usr/include/c++/11/bits/exception.h \ - /usr/include/c++/11/bits/localefwd.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++locale.h \ - /usr/include/c++/11/clocale \ + /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++/11/iosfwd \ - /usr/include/c++/11/cctype \ + /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++/11/bits/ostream_insert.h \ - /usr/include/c++/11/bits/cxxabi_forced.h \ - /usr/include/c++/11/bits/stl_function.h \ - /usr/include/c++/11/backward/binders.h \ - /usr/include/c++/11/bits/range_access.h \ - /usr/include/c++/11/initializer_list \ - /usr/include/c++/11/bits/basic_string.h \ - /usr/include/c++/11/ext/atomicity.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr.h \ - /usr/include/c++/11/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/sched.h \ - /usr/include/bits/types/struct_sched_param.h \ - /usr/include/bits/cpu-set.h \ - /usr/include/time.h \ - /usr/include/bits/time.h \ - /usr/include/bits/timex.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/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/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++/11/x86_64-redhat-linux/bits/atomic_word.h \ - /usr/include/sys/single_threaded.h \ - /usr/include/c++/11/ext/alloc_traits.h \ - /usr/include/c++/11/bits/alloc_traits.h \ - /usr/include/c++/11/bits/stl_construct.h \ - /usr/include/c++/11/ext/string_conversions.h \ - /usr/include/c++/11/cstdlib \ + /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/clock_t.h \ + /usr/include/bits/types/clockid_t.h \ + /usr/include/bits/types/time_t.h \ + /usr/include/bits/types/timer_t.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++/11/bits/std_abs.h \ - /usr/include/c++/11/cstdio \ + /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 \ @@ -797,7 +786,7 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o: /usr/include/bits/types/cookie_io_functions_t.h \ /usr/include/bits/stdio_lim.h \ /usr/include/bits/stdio.h \ - /usr/include/c++/11/cerrno \ + /usr/include/c++/12/cerrno \ /usr/include/errno.h \ /usr/include/bits/errno.h \ /usr/include/linux/errno.h \ @@ -805,77 +794,92 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o: /usr/include/asm-generic/errno.h \ /usr/include/asm-generic/errno-base.h \ /usr/include/bits/types/error_t.h \ - /usr/include/c++/11/bits/charconv.h \ - /usr/include/c++/11/bits/functional_hash.h \ - /usr/include/c++/11/bits/hash_bytes.h \ - /usr/include/c++/11/bits/basic_string.tcc \ - /usr/include/c++/11/utility \ - /usr/include/c++/11/bits/stl_relops.h \ - /usr/include/c++/11/iterator \ - /usr/include/c++/11/bits/stream_iterator.h \ - /usr/include/c++/11/bits/streambuf_iterator.h \ - /usr/include/c++/11/streambuf \ - /usr/include/c++/11/bits/ios_base.h \ - /usr/include/c++/11/bits/locale_classes.h \ - /usr/include/c++/11/bits/locale_classes.tcc \ - /usr/include/c++/11/system_error \ - /usr/include/c++/11/x86_64-redhat-linux/bits/error_constants.h \ - /usr/include/c++/11/stdexcept \ - /usr/include/c++/11/exception \ - /usr/include/c++/11/bits/exception_ptr.h \ - /usr/include/c++/11/bits/cxxabi_init_exception.h \ - /usr/include/c++/11/typeinfo \ - /usr/include/c++/11/bits/nested_exception.h \ - /usr/include/c++/11/bits/streambuf.tcc \ + /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/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/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 \ third_party/uri/include/network/optional.hpp \ - /usr/include/c++/11/memory \ - /usr/include/c++/11/bits/stl_uninitialized.h \ - /usr/include/c++/11/bits/stl_tempbuf.h \ - /usr/include/c++/11/bits/stl_raw_storage_iter.h \ - /usr/include/c++/11/bits/align.h \ - /usr/include/c++/11/bit \ - /usr/include/c++/11/bits/uses_allocator.h \ - /usr/include/c++/11/bits/unique_ptr.h \ - /usr/include/c++/11/tuple \ - /usr/include/c++/11/array \ - /usr/include/c++/11/bits/invoke.h \ - /usr/include/c++/11/bits/shared_ptr.h \ - /usr/include/c++/11/bits/shared_ptr_base.h \ - /usr/include/c++/11/bits/allocated_ptr.h \ - /usr/include/c++/11/bits/refwrap.h \ - /usr/include/c++/11/ext/aligned_buffer.h \ - /usr/include/c++/11/ext/concurrence.h \ - /usr/include/c++/11/bits/shared_ptr_atomic.h \ - /usr/include/c++/11/bits/atomic_base.h \ - /usr/include/c++/11/bits/atomic_lockfree_defines.h \ - /usr/include/c++/11/backward/auto_ptr.h \ - /usr/include/c++/11/algorithm \ - /usr/include/c++/11/bits/stl_algo.h \ - /usr/include/c++/11/bits/algorithmfwd.h \ - /usr/include/c++/11/bits/stl_heap.h \ - /usr/include/c++/11/bits/uniform_int_dist.h \ + /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++/11/cassert \ + /usr/include/c++/12/cassert \ /usr/include/assert.h \ - /usr/include/c++/11/limits \ + /usr/include/c++/12/limits \ third_party/uri/src/detail/grammar.hpp \ - /usr/include/c++/11/locale \ - /usr/include/c++/11/bits/locale_facets.h \ - /usr/include/c++/11/cwctype \ + /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++/11/x86_64-redhat-linux/bits/ctype_base.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/ctype_inline.h \ - /usr/include/c++/11/bits/locale_facets.tcc \ - /usr/include/c++/11/bits/locale_facets_nonio.h \ - /usr/include/c++/11/ctime \ - /usr/include/c++/11/x86_64-redhat-linux/bits/time_members.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/messages_members.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++/11/bits/codecvt.h \ - /usr/include/c++/11/bits/locale_facets_nonio.tcc \ - /usr/include/c++/11/bits/locale_conv.h \ - /usr/include/c++/11/cstring \ + /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 @@ -883,10 +887,10 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o: third_p /usr/include/stdc-predef.h \ third_party/uri/src/detail/uri_resolve.hpp \ third_party/uri/include/network/uri/uri.hpp \ - /usr/include/c++/11/iterator \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.h \ + /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++/11/x86_64-redhat-linux/bits/os_defines.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 \ @@ -894,28 +898,28 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o: third_p /usr/include/bits/long-double.h \ /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/cpu_defines.h \ - /usr/include/c++/11/bits/stl_iterator_base_types.h \ - /usr/include/c++/11/type_traits \ - /usr/include/c++/11/bits/stl_iterator_base_funcs.h \ - /usr/include/c++/11/bits/concept_check.h \ - /usr/include/c++/11/debug/assertions.h \ - /usr/include/c++/11/bits/stl_iterator.h \ - /usr/include/c++/11/bits/cpp_type_traits.h \ - /usr/include/c++/11/ext/type_traits.h \ - /usr/include/c++/11/bits/move.h \ - /usr/include/c++/11/bits/ptr_traits.h \ - /usr/include/c++/11/iosfwd \ - /usr/include/c++/11/bits/stringfwd.h \ - /usr/include/c++/11/bits/memoryfwd.h \ - /usr/include/c++/11/bits/postypes.h \ - /usr/include/c++/11/cwchar \ + /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/bits/libc-header-start.h \ /usr/include/bits/floatn.h \ /usr/include/bits/floatn-common.h \ - /usr/lib/gcc/x86_64-redhat-linux/11/include/stddef.h \ - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdarg.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 \ @@ -924,26 +928,26 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o: third_p /usr/include/bits/types/FILE.h \ /usr/include/bits/types/locale_t.h \ /usr/include/bits/types/__locale_t.h \ - /usr/include/c++/11/bits/stream_iterator.h \ - /usr/include/c++/11/debug/debug.h \ - /usr/include/c++/11/bits/streambuf_iterator.h \ - /usr/include/c++/11/streambuf \ - /usr/include/c++/11/bits/localefwd.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++locale.h \ - /usr/include/c++/11/clocale \ + /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++/11/cctype \ + /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++/11/bits/ios_base.h \ - /usr/include/c++/11/ext/atomicity.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr-default.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 \ @@ -963,45 +967,49 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o: third_p /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++/11/x86_64-redhat-linux/bits/atomic_word.h \ + /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h \ /usr/include/sys/single_threaded.h \ - /usr/include/c++/11/bits/locale_classes.h \ - /usr/include/c++/11/string \ - /usr/include/c++/11/bits/char_traits.h \ - /usr/include/c++/11/bits/stl_algobase.h \ - /usr/include/c++/11/bits/functexcept.h \ - /usr/include/c++/11/bits/exception_defines.h \ - /usr/include/c++/11/ext/numeric_traits.h \ - /usr/include/c++/11/bits/stl_pair.h \ - /usr/include/c++/11/bits/predefined_ops.h \ - /usr/include/c++/11/cstdint \ - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdint.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++/11/bits/allocator.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h \ - /usr/include/c++/11/ext/new_allocator.h \ - /usr/include/c++/11/new \ - /usr/include/c++/11/bits/exception.h \ - /usr/include/c++/11/bits/ostream_insert.h \ - /usr/include/c++/11/bits/cxxabi_forced.h \ - /usr/include/c++/11/bits/stl_function.h \ - /usr/include/c++/11/backward/binders.h \ - /usr/include/c++/11/bits/range_access.h \ - /usr/include/c++/11/initializer_list \ - /usr/include/c++/11/bits/basic_string.h \ - /usr/include/c++/11/ext/alloc_traits.h \ - /usr/include/c++/11/bits/alloc_traits.h \ - /usr/include/c++/11/bits/stl_construct.h \ - /usr/include/c++/11/ext/string_conversions.h \ - /usr/include/c++/11/cstdlib \ + /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/waitflags.h \ /usr/include/bits/waitstatus.h \ @@ -1015,8 +1023,8 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o: third_p /usr/include/alloca.h \ /usr/include/bits/stdlib-bsearch.h \ /usr/include/bits/stdlib-float.h \ - /usr/include/c++/11/bits/std_abs.h \ - /usr/include/c++/11/cstdio \ + /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 \ @@ -1024,7 +1032,7 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o: third_p /usr/include/bits/types/cookie_io_functions_t.h \ /usr/include/bits/stdio_lim.h \ /usr/include/bits/stdio.h \ - /usr/include/c++/11/cerrno \ + /usr/include/c++/12/cerrno \ /usr/include/errno.h \ /usr/include/bits/errno.h \ /usr/include/linux/errno.h \ @@ -1032,73 +1040,70 @@ third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o: third_p /usr/include/asm-generic/errno.h \ /usr/include/asm-generic/errno-base.h \ /usr/include/bits/types/error_t.h \ - /usr/include/c++/11/bits/charconv.h \ - /usr/include/c++/11/bits/functional_hash.h \ - /usr/include/c++/11/bits/hash_bytes.h \ - /usr/include/c++/11/bits/basic_string.tcc \ - /usr/include/c++/11/bits/locale_classes.tcc \ - /usr/include/c++/11/system_error \ - /usr/include/c++/11/x86_64-redhat-linux/bits/error_constants.h \ - /usr/include/c++/11/stdexcept \ - /usr/include/c++/11/exception \ - /usr/include/c++/11/bits/exception_ptr.h \ - /usr/include/c++/11/bits/cxxabi_init_exception.h \ - /usr/include/c++/11/typeinfo \ - /usr/include/c++/11/bits/nested_exception.h \ - /usr/include/c++/11/bits/streambuf.tcc \ - /usr/include/c++/11/algorithm \ - /usr/include/c++/11/utility \ - /usr/include/c++/11/bits/stl_relops.h \ - /usr/include/c++/11/bits/stl_algo.h \ - /usr/include/c++/11/bits/algorithmfwd.h \ - /usr/include/c++/11/bits/stl_heap.h \ - /usr/include/c++/11/bits/stl_tempbuf.h \ - /usr/include/c++/11/bits/uniform_int_dist.h \ - /usr/include/c++/11/functional \ - /usr/include/c++/11/tuple \ - /usr/include/c++/11/array \ - /usr/include/c++/11/bits/uses_allocator.h \ - /usr/include/c++/11/bits/invoke.h \ - /usr/include/c++/11/bits/refwrap.h \ - /usr/include/c++/11/bits/std_function.h \ - /usr/include/c++/11/memory \ - /usr/include/c++/11/bits/stl_uninitialized.h \ - /usr/include/c++/11/bits/stl_raw_storage_iter.h \ - /usr/include/c++/11/bits/align.h \ - /usr/include/c++/11/bit \ - /usr/include/c++/11/bits/unique_ptr.h \ - /usr/include/c++/11/bits/shared_ptr.h \ - /usr/include/c++/11/bits/shared_ptr_base.h \ - /usr/include/c++/11/bits/allocated_ptr.h \ - /usr/include/c++/11/ext/aligned_buffer.h \ - /usr/include/c++/11/ext/concurrence.h \ - /usr/include/c++/11/bits/shared_ptr_atomic.h \ - /usr/include/c++/11/bits/atomic_base.h \ - /usr/include/c++/11/bits/atomic_lockfree_defines.h \ - /usr/include/c++/11/backward/auto_ptr.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 \ third_party/uri/include/network/string_view.hpp \ - /usr/include/c++/11/cassert \ + /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/encode.hpp \ - /usr/include/c++/11/cstring \ + /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/uri_builder.hpp \ third_party/uri/src/detail/algorithm_find.hpp \ - /usr/include/c++/11/cstddef + /usr/include/c++/12/cstddef 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++/11/cassert \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.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++/11/x86_64-redhat-linux/bits/os_defines.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 \ @@ -1106,127 +1111,113 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o: third_party/uri/src/ur /usr/include/bits/long-double.h \ /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/cpu_defines.h \ + /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h \ /usr/include/assert.h \ - /usr/include/c++/11/locale \ - /usr/include/c++/11/bits/localefwd.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++locale.h \ - /usr/include/c++/11/clocale \ + /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/11/include/stddef.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++/11/iosfwd \ - /usr/include/c++/11/bits/stringfwd.h \ - /usr/include/c++/11/bits/memoryfwd.h \ - /usr/include/c++/11/bits/postypes.h \ - /usr/include/c++/11/cwchar \ + /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/11/include/stdarg.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++/11/cctype \ + /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++/11/bits/locale_classes.h \ - /usr/include/c++/11/string \ - /usr/include/c++/11/bits/char_traits.h \ - /usr/include/c++/11/bits/stl_algobase.h \ - /usr/include/c++/11/bits/functexcept.h \ - /usr/include/c++/11/bits/exception_defines.h \ - /usr/include/c++/11/bits/cpp_type_traits.h \ - /usr/include/c++/11/ext/type_traits.h \ - /usr/include/c++/11/ext/numeric_traits.h \ - /usr/include/c++/11/bits/stl_pair.h \ - /usr/include/c++/11/bits/move.h \ - /usr/include/c++/11/type_traits \ - /usr/include/c++/11/bits/stl_iterator_base_types.h \ - /usr/include/c++/11/bits/stl_iterator_base_funcs.h \ - /usr/include/c++/11/bits/concept_check.h \ - /usr/include/c++/11/debug/assertions.h \ - /usr/include/c++/11/bits/stl_iterator.h \ - /usr/include/c++/11/bits/ptr_traits.h \ - /usr/include/c++/11/debug/debug.h \ - /usr/include/c++/11/bits/predefined_ops.h \ - /usr/include/c++/11/cstdint \ - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdint.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/stdint-intn.h \ /usr/include/bits/stdint-uintn.h \ - /usr/include/c++/11/bits/allocator.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h \ - /usr/include/c++/11/ext/new_allocator.h \ - /usr/include/c++/11/new \ - /usr/include/c++/11/bits/exception.h \ - /usr/include/c++/11/bits/ostream_insert.h \ - /usr/include/c++/11/bits/cxxabi_forced.h \ - /usr/include/c++/11/bits/stl_function.h \ - /usr/include/c++/11/backward/binders.h \ - /usr/include/c++/11/bits/range_access.h \ - /usr/include/c++/11/initializer_list \ - /usr/include/c++/11/bits/basic_string.h \ - /usr/include/c++/11/ext/atomicity.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr.h \ - /usr/include/c++/11/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/sched.h \ - /usr/include/bits/types/struct_sched_param.h \ - /usr/include/bits/cpu-set.h \ - /usr/include/time.h \ - /usr/include/bits/time.h \ - /usr/include/bits/timex.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/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/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++/11/x86_64-redhat-linux/bits/atomic_word.h \ - /usr/include/sys/single_threaded.h \ - /usr/include/c++/11/ext/alloc_traits.h \ - /usr/include/c++/11/bits/alloc_traits.h \ - /usr/include/c++/11/bits/stl_construct.h \ - /usr/include/c++/11/ext/string_conversions.h \ - /usr/include/c++/11/cstdlib \ + /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/types/clock_t.h \ + /usr/include/bits/types/clockid_t.h \ + /usr/include/bits/types/time_t.h \ + /usr/include/bits/types/timer_t.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++/11/bits/std_abs.h \ - /usr/include/c++/11/cstdio \ + /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 \ @@ -1234,7 +1225,7 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o: third_party/uri/src/ur /usr/include/bits/types/cookie_io_functions_t.h \ /usr/include/bits/stdio_lim.h \ /usr/include/bits/stdio.h \ - /usr/include/c++/11/cerrno \ + /usr/include/c++/12/cerrno \ /usr/include/errno.h \ /usr/include/bits/errno.h \ /usr/include/linux/errno.h \ @@ -1242,78 +1233,93 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o: third_party/uri/src/ur /usr/include/asm-generic/errno.h \ /usr/include/asm-generic/errno-base.h \ /usr/include/bits/types/error_t.h \ - /usr/include/c++/11/bits/charconv.h \ - /usr/include/c++/11/bits/functional_hash.h \ - /usr/include/c++/11/bits/hash_bytes.h \ - /usr/include/c++/11/bits/basic_string.tcc \ - /usr/include/c++/11/bits/locale_classes.tcc \ - /usr/include/c++/11/bits/locale_facets.h \ - /usr/include/c++/11/cwctype \ + /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/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/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/wctype.h \ /usr/include/bits/wctype-wchar.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/ctype_base.h \ - /usr/include/c++/11/bits/ios_base.h \ - /usr/include/c++/11/system_error \ - /usr/include/c++/11/x86_64-redhat-linux/bits/error_constants.h \ - /usr/include/c++/11/stdexcept \ - /usr/include/c++/11/exception \ - /usr/include/c++/11/bits/exception_ptr.h \ - /usr/include/c++/11/bits/cxxabi_init_exception.h \ - /usr/include/c++/11/typeinfo \ - /usr/include/c++/11/bits/nested_exception.h \ - /usr/include/c++/11/streambuf \ - /usr/include/c++/11/bits/streambuf.tcc \ - /usr/include/c++/11/bits/streambuf_iterator.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/ctype_inline.h \ - /usr/include/c++/11/bits/locale_facets.tcc \ - /usr/include/c++/11/bits/locale_facets_nonio.h \ - /usr/include/c++/11/ctime \ - /usr/include/c++/11/x86_64-redhat-linux/bits/time_members.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/messages_members.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++/11/bits/codecvt.h \ - /usr/include/c++/11/bits/locale_facets_nonio.tcc \ - /usr/include/c++/11/bits/locale_conv.h \ - /usr/include/c++/11/bits/unique_ptr.h \ - /usr/include/c++/11/utility \ - /usr/include/c++/11/bits/stl_relops.h \ - /usr/include/c++/11/tuple \ - /usr/include/c++/11/array \ - /usr/include/c++/11/bits/uses_allocator.h \ - /usr/include/c++/11/bits/invoke.h \ - /usr/include/c++/11/algorithm \ - /usr/include/c++/11/bits/stl_algo.h \ - /usr/include/c++/11/bits/algorithmfwd.h \ - /usr/include/c++/11/bits/stl_heap.h \ - /usr/include/c++/11/bits/stl_tempbuf.h \ - /usr/include/c++/11/bits/uniform_int_dist.h \ - /usr/include/c++/11/functional \ - /usr/include/c++/11/bits/refwrap.h \ - /usr/include/c++/11/bits/std_function.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++/11/iterator \ - /usr/include/c++/11/bits/stream_iterator.h \ - /usr/include/c++/11/memory \ - /usr/include/c++/11/bits/stl_uninitialized.h \ - /usr/include/c++/11/bits/stl_raw_storage_iter.h \ - /usr/include/c++/11/bits/align.h \ - /usr/include/c++/11/bit \ - /usr/include/c++/11/bits/shared_ptr.h \ - /usr/include/c++/11/bits/shared_ptr_base.h \ - /usr/include/c++/11/bits/allocated_ptr.h \ - /usr/include/c++/11/ext/aligned_buffer.h \ - /usr/include/c++/11/ext/concurrence.h \ - /usr/include/c++/11/bits/shared_ptr_atomic.h \ - /usr/include/c++/11/bits/atomic_base.h \ - /usr/include/c++/11/bits/atomic_lockfree_defines.h \ - /usr/include/c++/11/backward/auto_ptr.h \ + /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 \ 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/encode.hpp \ - /usr/include/c++/11/cstring \ + /usr/include/c++/12/cstring \ /usr/include/string.h \ /usr/include/strings.h \ third_party/uri/include/network/uri/detail/decode.hpp \ @@ -1322,21 +1328,21 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o: third_party/uri/src/ur 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++/11/vector \ - /usr/include/c++/11/bits/stl_vector.h \ - /usr/include/c++/11/bits/stl_bvector.h \ - /usr/include/c++/11/bits/vector.tcc \ + /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/CMakeFiles/network-uri.dir/uri_builder.cpp.o: third_party/uri/src/uri_builder.cpp \ /usr/include/stdc-predef.h \ - /usr/include/c++/11/locale \ - /usr/include/c++/11/bits/localefwd.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.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++/11/x86_64-redhat-linux/bits/os_defines.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 \ @@ -1344,124 +1350,110 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o: third_party/ur /usr/include/bits/long-double.h \ /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/cpu_defines.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++locale.h \ - /usr/include/c++/11/clocale \ + /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/11/include/stddef.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++/11/iosfwd \ - /usr/include/c++/11/bits/stringfwd.h \ - /usr/include/c++/11/bits/memoryfwd.h \ - /usr/include/c++/11/bits/postypes.h \ - /usr/include/c++/11/cwchar \ + /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/11/include/stdarg.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++/11/cctype \ + /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++/11/bits/locale_classes.h \ - /usr/include/c++/11/string \ - /usr/include/c++/11/bits/char_traits.h \ - /usr/include/c++/11/bits/stl_algobase.h \ - /usr/include/c++/11/bits/functexcept.h \ - /usr/include/c++/11/bits/exception_defines.h \ - /usr/include/c++/11/bits/cpp_type_traits.h \ - /usr/include/c++/11/ext/type_traits.h \ - /usr/include/c++/11/ext/numeric_traits.h \ - /usr/include/c++/11/bits/stl_pair.h \ - /usr/include/c++/11/bits/move.h \ - /usr/include/c++/11/type_traits \ - /usr/include/c++/11/bits/stl_iterator_base_types.h \ - /usr/include/c++/11/bits/stl_iterator_base_funcs.h \ - /usr/include/c++/11/bits/concept_check.h \ - /usr/include/c++/11/debug/assertions.h \ - /usr/include/c++/11/bits/stl_iterator.h \ - /usr/include/c++/11/bits/ptr_traits.h \ - /usr/include/c++/11/debug/debug.h \ - /usr/include/c++/11/bits/predefined_ops.h \ - /usr/include/c++/11/cstdint \ - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdint.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/stdint-intn.h \ /usr/include/bits/stdint-uintn.h \ - /usr/include/c++/11/bits/allocator.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h \ - /usr/include/c++/11/ext/new_allocator.h \ - /usr/include/c++/11/new \ - /usr/include/c++/11/bits/exception.h \ - /usr/include/c++/11/bits/ostream_insert.h \ - /usr/include/c++/11/bits/cxxabi_forced.h \ - /usr/include/c++/11/bits/stl_function.h \ - /usr/include/c++/11/backward/binders.h \ - /usr/include/c++/11/bits/range_access.h \ - /usr/include/c++/11/initializer_list \ - /usr/include/c++/11/bits/basic_string.h \ - /usr/include/c++/11/ext/atomicity.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr.h \ - /usr/include/c++/11/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/sched.h \ - /usr/include/bits/types/struct_sched_param.h \ - /usr/include/bits/cpu-set.h \ - /usr/include/time.h \ - /usr/include/bits/time.h \ - /usr/include/bits/timex.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/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/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++/11/x86_64-redhat-linux/bits/atomic_word.h \ - /usr/include/sys/single_threaded.h \ - /usr/include/c++/11/ext/alloc_traits.h \ - /usr/include/c++/11/bits/alloc_traits.h \ - /usr/include/c++/11/bits/stl_construct.h \ - /usr/include/c++/11/ext/string_conversions.h \ - /usr/include/c++/11/cstdlib \ + /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/types/clock_t.h \ + /usr/include/bits/types/clockid_t.h \ + /usr/include/bits/types/time_t.h \ + /usr/include/bits/types/timer_t.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++/11/bits/std_abs.h \ - /usr/include/c++/11/cstdio \ + /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 \ @@ -1469,7 +1461,7 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o: third_party/ur /usr/include/bits/types/cookie_io_functions_t.h \ /usr/include/bits/stdio_lim.h \ /usr/include/bits/stdio.h \ - /usr/include/c++/11/cerrno \ + /usr/include/c++/12/cerrno \ /usr/include/errno.h \ /usr/include/bits/errno.h \ /usr/include/linux/errno.h \ @@ -1477,81 +1469,96 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o: third_party/ur /usr/include/asm-generic/errno.h \ /usr/include/asm-generic/errno-base.h \ /usr/include/bits/types/error_t.h \ - /usr/include/c++/11/bits/charconv.h \ - /usr/include/c++/11/bits/functional_hash.h \ - /usr/include/c++/11/bits/hash_bytes.h \ - /usr/include/c++/11/bits/basic_string.tcc \ - /usr/include/c++/11/bits/locale_classes.tcc \ - /usr/include/c++/11/bits/locale_facets.h \ - /usr/include/c++/11/cwctype \ + /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/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/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/wctype.h \ /usr/include/bits/wctype-wchar.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/ctype_base.h \ - /usr/include/c++/11/bits/ios_base.h \ - /usr/include/c++/11/system_error \ - /usr/include/c++/11/x86_64-redhat-linux/bits/error_constants.h \ - /usr/include/c++/11/stdexcept \ - /usr/include/c++/11/exception \ - /usr/include/c++/11/bits/exception_ptr.h \ - /usr/include/c++/11/bits/cxxabi_init_exception.h \ - /usr/include/c++/11/typeinfo \ - /usr/include/c++/11/bits/nested_exception.h \ - /usr/include/c++/11/streambuf \ - /usr/include/c++/11/bits/streambuf.tcc \ - /usr/include/c++/11/bits/streambuf_iterator.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/ctype_inline.h \ - /usr/include/c++/11/bits/locale_facets.tcc \ - /usr/include/c++/11/bits/locale_facets_nonio.h \ - /usr/include/c++/11/ctime \ - /usr/include/c++/11/x86_64-redhat-linux/bits/time_members.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/messages_members.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++/11/bits/codecvt.h \ - /usr/include/c++/11/bits/locale_facets_nonio.tcc \ - /usr/include/c++/11/bits/locale_conv.h \ - /usr/include/c++/11/bits/unique_ptr.h \ - /usr/include/c++/11/utility \ - /usr/include/c++/11/bits/stl_relops.h \ - /usr/include/c++/11/tuple \ - /usr/include/c++/11/array \ - /usr/include/c++/11/bits/uses_allocator.h \ - /usr/include/c++/11/bits/invoke.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++/11/iterator \ - /usr/include/c++/11/bits/stream_iterator.h \ - /usr/include/c++/11/algorithm \ - /usr/include/c++/11/bits/stl_algo.h \ - /usr/include/c++/11/bits/algorithmfwd.h \ - /usr/include/c++/11/bits/stl_heap.h \ - /usr/include/c++/11/bits/stl_tempbuf.h \ - /usr/include/c++/11/bits/uniform_int_dist.h \ - /usr/include/c++/11/functional \ - /usr/include/c++/11/bits/refwrap.h \ - /usr/include/c++/11/bits/std_function.h \ - /usr/include/c++/11/memory \ - /usr/include/c++/11/bits/stl_uninitialized.h \ - /usr/include/c++/11/bits/stl_raw_storage_iter.h \ - /usr/include/c++/11/bits/align.h \ - /usr/include/c++/11/bit \ - /usr/include/c++/11/bits/shared_ptr.h \ - /usr/include/c++/11/bits/shared_ptr_base.h \ - /usr/include/c++/11/bits/allocated_ptr.h \ - /usr/include/c++/11/ext/aligned_buffer.h \ - /usr/include/c++/11/ext/concurrence.h \ - /usr/include/c++/11/bits/shared_ptr_atomic.h \ - /usr/include/c++/11/bits/atomic_base.h \ - /usr/include/c++/11/bits/atomic_lockfree_defines.h \ - /usr/include/c++/11/backward/auto_ptr.h \ + /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 \ third_party/uri/include/network/string_view.hpp \ - /usr/include/c++/11/cassert \ + /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/encode.hpp \ - /usr/include/c++/11/cstring \ + /usr/include/c++/12/cstring \ /usr/include/string.h \ /usr/include/strings.h \ third_party/uri/include/network/uri/detail/decode.hpp \ @@ -1562,10 +1569,10 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o: third_party/ur 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++/11/string \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.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++/11/x86_64-redhat-linux/bits/os_defines.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 \ @@ -1573,35 +1580,18 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o: third_party/uri /usr/include/bits/long-double.h \ /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/cpu_defines.h \ - /usr/include/c++/11/bits/stringfwd.h \ - /usr/include/c++/11/bits/memoryfwd.h \ - /usr/include/c++/11/bits/char_traits.h \ - /usr/include/c++/11/bits/stl_algobase.h \ - /usr/include/c++/11/bits/functexcept.h \ - /usr/include/c++/11/bits/exception_defines.h \ - /usr/include/c++/11/bits/cpp_type_traits.h \ - /usr/include/c++/11/ext/type_traits.h \ - /usr/include/c++/11/ext/numeric_traits.h \ - /usr/include/c++/11/bits/stl_pair.h \ - /usr/include/c++/11/bits/move.h \ - /usr/include/c++/11/type_traits \ - /usr/include/c++/11/bits/stl_iterator_base_types.h \ - /usr/include/c++/11/bits/stl_iterator_base_funcs.h \ - /usr/include/c++/11/bits/concept_check.h \ - /usr/include/c++/11/debug/assertions.h \ - /usr/include/c++/11/bits/stl_iterator.h \ - /usr/include/c++/11/bits/ptr_traits.h \ - /usr/include/c++/11/debug/debug.h \ - /usr/include/c++/11/bits/predefined_ops.h \ - /usr/include/c++/11/bits/postypes.h \ - /usr/include/c++/11/cwchar \ + /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/11/include/stddef.h \ - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdarg.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 \ @@ -1610,86 +1600,89 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o: third_party/uri /usr/include/bits/types/FILE.h \ /usr/include/bits/types/locale_t.h \ /usr/include/bits/types/__locale_t.h \ - /usr/include/c++/11/cstdint \ - /usr/lib/gcc/x86_64-redhat-linux/11/include/stdint.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++/11/bits/allocator.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h \ - /usr/include/c++/11/ext/new_allocator.h \ - /usr/include/c++/11/new \ - /usr/include/c++/11/bits/exception.h \ - /usr/include/c++/11/bits/localefwd.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/c++locale.h \ - /usr/include/c++/11/clocale \ + /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++/11/iosfwd \ - /usr/include/c++/11/cctype \ + /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++/11/bits/ostream_insert.h \ - /usr/include/c++/11/bits/cxxabi_forced.h \ - /usr/include/c++/11/bits/stl_function.h \ - /usr/include/c++/11/backward/binders.h \ - /usr/include/c++/11/bits/range_access.h \ - /usr/include/c++/11/initializer_list \ - /usr/include/c++/11/bits/basic_string.h \ - /usr/include/c++/11/ext/atomicity.h \ - /usr/include/c++/11/x86_64-redhat-linux/bits/gthr.h \ - /usr/include/c++/11/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/sched.h \ - /usr/include/bits/types/struct_sched_param.h \ - /usr/include/bits/cpu-set.h \ - /usr/include/time.h \ - /usr/include/bits/time.h \ - /usr/include/bits/timex.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/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/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++/11/x86_64-redhat-linux/bits/atomic_word.h \ - /usr/include/sys/single_threaded.h \ - /usr/include/c++/11/ext/alloc_traits.h \ - /usr/include/c++/11/bits/alloc_traits.h \ - /usr/include/c++/11/bits/stl_construct.h \ - /usr/include/c++/11/ext/string_conversions.h \ - /usr/include/c++/11/cstdlib \ + /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/clock_t.h \ + /usr/include/bits/types/clockid_t.h \ + /usr/include/bits/types/time_t.h \ + /usr/include/bits/types/timer_t.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++/11/bits/std_abs.h \ - /usr/include/c++/11/cstdio \ + /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 \ @@ -1697,7 +1690,7 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o: third_party/uri /usr/include/bits/types/cookie_io_functions_t.h \ /usr/include/bits/stdio_lim.h \ /usr/include/bits/stdio.h \ - /usr/include/c++/11/cerrno \ + /usr/include/c++/12/cerrno \ /usr/include/errno.h \ /usr/include/bits/errno.h \ /usr/include/linux/errno.h \ @@ -1705,26 +1698,24 @@ third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o: third_party/uri /usr/include/asm-generic/errno.h \ /usr/include/asm-generic/errno-base.h \ /usr/include/bits/types/error_t.h \ - /usr/include/c++/11/bits/charconv.h \ - /usr/include/c++/11/bits/functional_hash.h \ - /usr/include/c++/11/bits/hash_bytes.h \ - /usr/include/c++/11/bits/basic_string.tcc \ + /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++/11/system_error \ - /usr/include/c++/11/x86_64-redhat-linux/bits/error_constants.h \ - /usr/include/c++/11/stdexcept \ - /usr/include/c++/11/exception \ - /usr/include/c++/11/bits/exception_ptr.h \ - /usr/include/c++/11/bits/cxxabi_init_exception.h \ - /usr/include/c++/11/typeinfo \ - /usr/include/c++/11/bits/nested_exception.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 \ third_party/uri/include/network/uri/config.hpp third_party/uri/src/uri_errors.cpp: -third_party/uri/src/uri_builder.cpp: - third_party/uri/src/uri.cpp: third_party/uri/src/detail/algorithm_find.hpp: @@ -1737,484 +1728,488 @@ third_party/uri/src/detail/grammar.hpp: third_party/uri/src/detail/uri_parse.cpp: -third_party/uri/src/detail/algorithm_split.hpp: +/usr/include/c++/12/bits/locale_conv.h: -third_party/uri/src/detail/algorithm.hpp: +/usr/include/c++/12/bits/locale_facets_nonio.tcc: -/usr/include/c++/11/bits/locale_conv.h: +/usr/include/c++/12/bits/codecvt.h: /usr/include/libintl.h: -/usr/include/c++/11/x86_64-redhat-linux/bits/messages_members.h: +/usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h: -/usr/include/c++/11/bits/codecvt.h: +/usr/include/c++/12/ctime: -/usr/include/c++/11/ctime: +/usr/include/c++/12/bits/locale_facets.tcc: -/usr/include/c++/11/x86_64-redhat-linux/bits/time_members.h: +/usr/include/c++/12/locale: -/usr/include/c++/11/bits/locale_facets_nonio.h: +/usr/include/c++/12/bits/stl_bvector.h: -/usr/include/c++/11/bits/locale_facets.tcc: +/usr/include/c++/12/bits/stl_vector.h: -/usr/include/c++/11/cwctype: +third_party/uri/src/detail/uri_percent_encode.hpp: -/usr/include/c++/11/bits/locale_facets.h: +/usr/include/c++/12/cstring: -/usr/include/c++/11/bits/stl_bvector.h: +third_party/uri/include/network/uri/detail/encode.hpp: -third_party/uri/src/detail/uri_percent_encode.hpp: +third_party/uri/include/network/uri/config.hpp: -third_party/uri/include/network/uri/uri_builder.hpp: +/usr/include/c++/12/functional: -/usr/include/strings.h: +third_party/uri/include/network/uri/uri.hpp: -/usr/include/string.h: +/usr/include/c++/12/limits: -/usr/include/c++/11/cstring: +/usr/include/assert.h: -third_party/uri/include/network/uri/detail/encode.hpp: +/usr/include/c++/12/cassert: -third_party/uri/include/network/uri/config.hpp: +/usr/include/c++/12/bits/stl_heap.h: -third_party/uri/include/network/uri/uri.hpp: +/usr/include/c++/12/bits/stl_algo.h: -/usr/include/c++/11/limits: +/usr/include/c++/12/algorithm: -/usr/include/c++/11/bits/stl_heap.h: +/usr/include/c++/12/bits/atomic_lockfree_defines.h: -/usr/include/c++/11/bits/algorithmfwd.h: +/usr/include/c++/12/bits/shared_ptr_atomic.h: -/usr/include/c++/11/cassert: +/usr/include/c++/12/ext/aligned_buffer.h: -/usr/include/c++/11/bits/stl_algo.h: +/usr/include/c++/12/bits/locale_facets.h: -/usr/include/c++/11/ext/concurrence.h: +/usr/include/c++/12/tuple: -/usr/include/c++/11/bits/allocated_ptr.h: +/usr/include/c++/12/cwctype: -/usr/include/c++/11/bits/invoke.h: +/usr/include/c++/12/bits/unique_ptr.h: -third_party/uri/src/detail/uri_resolve.hpp: +/usr/include/c++/12/bit: -/usr/include/c++/11/bits/uses_allocator.h: +/usr/include/c++/12/bits/stl_raw_storage_iter.h: -/usr/include/c++/11/vector: +/usr/include/c++/12/bits/stl_tempbuf.h: -/usr/include/c++/11/bits/align.h: +/usr/include/string.h: -/usr/include/c++/11/bits/stl_raw_storage_iter.h: +/usr/include/c++/12/bits/stl_uninitialized.h: -/usr/include/c++/11/backward/auto_ptr.h: +/usr/include/c++/12/bits/streambuf.tcc: -/usr/include/c++/11/bits/stl_uninitialized.h: +third_party/uri/src/detail/uri_resolve.hpp: -/usr/include/c++/11/memory: +/usr/include/c++/12/bits/nested_exception.h: -third_party/uri/include/network/optional.hpp: +/usr/include/c++/12/bits/cxxabi_init_exception.h: -/usr/include/c++/11/bits/nested_exception.h: +/usr/include/c++/12/bits/exception_ptr.h: -/usr/include/c++/11/typeinfo: +/usr/include/c++/12/system_error: -/usr/include/c++/11/exception: +/usr/include/c++/12/bits/locale_classes.h: -/usr/include/c++/11/stdexcept: +/usr/include/sys/single_threaded.h: -/usr/include/c++/11/bits/stl_vector.h: +/usr/include/bits/pthread_stack_min-dynamic.h: -/usr/include/c++/11/system_error: +/usr/include/c++/12/bits/allocated_ptr.h: -/usr/include/c++/11/bits/locale_classes.tcc: +/usr/include/bits/types/struct___jmp_buf_tag.h: -/usr/include/c++/11/bits/ios_base.h: +third_party/uri/src/detail/uri_parse_authority.cpp: -/usr/include/c++/11/bits/stl_relops.h: +/usr/include/bits/setjmp.h: -/usr/include/c++/11/bits/basic_string.tcc: +/usr/include/bits/types/struct_tm.h: -/usr/include/c++/11/bits/hash_bytes.h: +/usr/include/c++/12/typeinfo: -/usr/include/c++/11/bits/functional_hash.h: +/usr/include/bits/cpu-set.h: -/usr/include/c++/11/bits/charconv.h: +/usr/include/bits/types/struct_sched_param.h: -/usr/include/bits/types/error_t.h: +/usr/include/c++/12/backward/auto_ptr.h: -/usr/include/asm-generic/errno.h: +/usr/include/sched.h: -third_party/uri/include/network/uri/detail/translate.hpp: +/usr/include/pthread.h: -/usr/include/asm/errno.h: +/usr/include/c++/12/bits/ios_base.h: -/usr/include/c++/11/locale: +/usr/include/c++/12/streambuf: -/usr/include/linux/errno.h: +/usr/include/c++/12/vector: -/usr/include/c++/11/utility: +/usr/include/bits/sched.h: -/usr/include/errno.h: +/usr/include/c++/12/bits/streambuf_iterator.h: -/usr/include/bits/stdio.h: +/usr/include/c++/12/bits/stream_iterator.h: -/usr/include/bits/types/__fpos64_t.h: +/usr/include/c++/12/iterator: -/usr/include/stdio.h: +/usr/include/c++/12/bits/hash_bytes.h: -/usr/include/c++/11/cstdio: +/usr/include/bits/types/error_t.h: -/usr/include/c++/11/bits/std_abs.h: +/usr/include/asm-generic/errno-base.h: -/usr/include/c++/11/bits/shared_ptr_atomic.h: +/usr/include/asm-generic/errno.h: -/usr/include/bits/stdlib-bsearch.h: +third_party/uri/include/network/uri/detail/translate.hpp: -/usr/include/alloca.h: +/usr/include/asm/errno.h: -/usr/include/c++/11/x86_64-redhat-linux/bits/ctype_inline.h: +/usr/include/linux/errno.h: -/usr/include/bits/stdlib-float.h: +/usr/include/wctype.h: -/usr/include/bits/time64.h: +/usr/include/bits/timex.h: -/usr/include/bits/typesizes.h: +/usr/include/bits/errno.h: -/usr/include/bits/cpu-set.h: +/usr/include/c++/12/backward/binders.h: -/usr/include/c++/11/bits/vector.tcc: +/usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h: -/usr/include/bits/uintn-identity.h: +/usr/include/c++/12/bits/localefwd.h: -/usr/include/bits/types.h: +/usr/include/c++/12/bits/cpp_type_traits.h: -/usr/include/c++/11/bits/unique_ptr.h: +/usr/include/c++/12/bits/allocator.h: -/usr/include/c++/11/iterator: +/usr/include/c++/12/bits/exception_defines.h: -/usr/lib/gcc/x86_64-redhat-linux/11/include/stdint.h: +/usr/include/locale.h: -/usr/include/bits/types/FILE.h: +/usr/include/bits/types/wint_t.h: -/usr/include/c++/11/bits/streambuf_iterator.h: +third_party/uri/include/network/uri/uri_errors.hpp: -/usr/include/bits/types/__FILE.h: +/usr/include/c++/12/bits/locale_classes.tcc: -/usr/include/c++/11/streambuf: +/usr/include/c++/12/bits/exception.h: -/usr/include/c++/11/bits/functexcept.h: +/usr/include/bits/stdint-uintn.h: -/usr/include/c++/11/bits/stl_tempbuf.h: +/usr/include/c++/12/ext/concurrence.h: -/usr/include/bits/types/locale_t.h: +/usr/include/endian.h: -/usr/include/locale.h: +/usr/include/bits/types/cookie_io_functions_t.h: -/usr/include/bits/wchar.h: +/usr/include/c++/12/memory: -/usr/include/bits/types/struct_tm.h: +/usr/include/bits/stdint-intn.h: -/usr/lib/gcc/x86_64-redhat-linux/11/include/stdarg.h: +/usr/include/strings.h: -/usr/include/bits/types/mbstate_t.h: +/usr/include/c++/12/ext/atomicity.h: -/usr/include/c++/11/cerrno: +/usr/include/c++/12/string: -/usr/include/bits/floatn-common.h: +/usr/include/c++/12/bits/shared_ptr.h: -/usr/include/bits/libc-header-start.h: +/usr/include/c++/12/initializer_list: -/usr/include/bits/types/cookie_io_functions_t.h: +third_party/uri/src/uri_builder.cpp: -/usr/include/c++/11/bits/predefined_ops.h: +/usr/include/c++/12/new: -/usr/include/c++/11/bits/uniform_int_dist.h: +/usr/include/bits/typesizes.h: -/usr/include/c++/11/bits/cxxabi_init_exception.h: +/usr/include/bits/uintn-identity.h: -/usr/include/wchar.h: +/usr/include/bits/types.h: -/usr/lib/gcc/x86_64-redhat-linux/11/include/stddef.h: +/usr/include/stdint.h: -/usr/include/c++/11/new: +/usr/include/c++/12/bits/char_traits.h: -/usr/include/c++/11/bits/stl_iterator.h: +/usr/include/c++/12/bits/stl_relops.h: -/usr/include/c++/11/bits/ptr_traits.h: +/usr/include/c++/12/cstdint: -/usr/include/c++/11/clocale: +/usr/include/bits/types/FILE.h: -/usr/include/bits/stdint-intn.h: +/usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h: -/usr/include/c++/11/debug/assertions.h: +/usr/include/c++/12/exception: -/usr/include/bits/select.h: +/usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h: -/usr/include/c++/11/cstdint: +/usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h: -/usr/include/c++/11/x86_64-redhat-linux/bits/error_constants.h: +/usr/include/gnu/stubs-64.h: -/usr/include/c++/11/bits/stl_iterator_base_funcs.h: +/usr/include/bits/long-double.h: -/usr/include/c++/11/ext/new_allocator.h: +/usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h: -/usr/include/bits/wordsize.h: +/usr/include/c++/12/bits/algorithmfwd.h: -/usr/include/assert.h: +/usr/include/bits/stdlib-float.h: -/usr/include/c++/11/bit: +/usr/include/bits/time64.h: -/usr/include/c++/11/cstdlib: +/usr/include/bits/types/__sigset_t.h: -/usr/include/c++/11/bits/stl_iterator_base_types.h: +third_party/uri/include/network/uri/detail/uri_parts.hpp: -/usr/include/c++/11/debug/debug.h: +/usr/include/c++/12/cstddef: -/usr/include/c++/11/cwchar: +/usr/include/c++/12/bits/new_allocator.h: -/usr/include/c++/11/bits/stl_algobase.h: +/usr/include/bits/wordsize.h: + +/usr/include/c++/12/bits/postypes.h: + +/usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h: third_party/uri/include/network/string_view.hpp: /usr/include/bits/types/sigset_t.h: -/usr/include/c++/11/bits/postypes.h: +/usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h: -/usr/include/c++/11/bits/exception_ptr.h: +/usr/include/c++/12/type_traits: -/usr/include/c++/11/ext/string_conversions.h: +/usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h: -/usr/include/sys/select.h: +/usr/include/bits/endian.h: -/usr/include/features-time64.h: +/usr/include/c++/12/cstdio: -/usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h: +/usr/include/c++/12/ext/string_conversions.h: -/usr/include/c++/11/x86_64-redhat-linux/bits/c++config.h: +third_party/uri/include/network/uri/detail/decode.hpp: -/usr/include/c++/11/bits/exception.h: +/usr/include/c++/12/bits/align.h: -/usr/include/c++/11/cstddef: +/usr/include/gnu/stubs.h: -/usr/include/c++/11/bits/range_access.h: +/usr/include/bits/pthreadtypes-arch.h: -/usr/include/bits/pthread_stack_min-dynamic.h: +/usr/include/c++/12/iosfwd: -third_party/uri/src/detail/uri_normalize.hpp: +/usr/include/c++/12/utility: -third_party/uri/src/detail/uri_advance_parts.cpp: +/usr/include/stdc-predef.h: -/usr/include/bits/long-double.h: +/usr/include/c++/12/bits/move.h: -/usr/include/c++/11/bits/stringfwd.h: +/usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h: -/usr/include/c++/11/bits/memoryfwd.h: +/usr/include/c++/12/bits/charconv.h: -/usr/include/c++/11/bits/atomic_base.h: +/usr/include/bits/pthreadtypes.h: -/usr/include/c++/11/ext/numeric_traits.h: +third_party/uri/src/detail/uri_normalize.hpp: -/usr/include/bits/types/__sigset_t.h: +/usr/include/c++/12/ext/alloc_traits.h: -/usr/include/c++/11/functional: +third_party/uri/src/detail/uri_advance_parts.cpp: -/usr/include/asm-generic/errno-base.h: +third_party/uri/src/detail/algorithm.hpp: -/usr/include/c++/11/bits/char_traits.h: +/usr/include/c++/12/bits/stringfwd.h: -/usr/include/c++/11/x86_64-redhat-linux/bits/ctype_base.h: +/usr/include/bits/floatn.h: -/usr/include/gnu/stubs-64.h: +/usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h: -/usr/include/c++/11/ext/type_traits.h: +/usr/include/c++/12/bits/memoryfwd.h: -/usr/include/bits/types/__locale_t.h: +/usr/include/bits/wctype-wchar.h: -/usr/include/sched.h: +/usr/include/sys/types.h: -/usr/include/bits/endian.h: +/usr/include/bits/locale.h: -/usr/include/sys/cdefs.h: +/usr/include/c++/12/cwchar: -/usr/include/stdc-predef.h: +/usr/include/wchar.h: -third_party/uri/include/network/uri/detail/decode.hpp: +/usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h: -/usr/include/c++/11/x86_64-redhat-linux/bits/os_defines.h: +/usr/include/c++/12/bits/alloc_traits.h: -/usr/include/gnu/stubs.h: +/usr/include/bits/types/mbstate_t.h: -/usr/include/bits/pthreadtypes-arch.h: +third_party/uri/src/detail/algorithm_split.hpp: -third_party/uri/src/detail/uri_parse.hpp: +/usr/include/c++/12/bits/stl_iterator.h: -/usr/include/c++/11/bits/stl_function.h: +/usr/include/c++/12/bits/utility.h: -/usr/include/c++/11/bits/locale_facets_nonio.tcc: +/usr/include/bits/floatn-common.h: -/usr/include/c++/11/bits/stl_pair.h: +/usr/include/c++/12/bits/uses_allocator.h: -/usr/include/c++/11/ext/atomicity.h: +/usr/include/sys/cdefs.h: -/usr/include/c++/11/tuple: +/usr/include/c++/12/bits/stl_iterator_base_funcs.h: -/usr/include/c++/11/type_traits: +/usr/include/bits/libc-header-start.h: -/usr/include/bits/types/struct_FILE.h: +third_party/uri/include/network/optional.hpp: -/usr/include/c++/11/bits/concept_check.h: +/usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h: -/usr/include/c++/11/x86_64-redhat-linux/bits/cpu_defines.h: +/usr/include/bits/wchar.h: -/usr/include/wctype.h: +/usr/include/bits/types/locale_t.h: -/usr/include/bits/errno.h: +/usr/include/c++/12/bits/atomic_base.h: -/usr/include/bits/timex.h: +/usr/include/c++/12/stdexcept: -third_party/uri/include/network/uri/detail/uri_parts.hpp: +/usr/include/features-time64.h: -/usr/include/c++/11/x86_64-redhat-linux/bits/atomic_word.h: +/usr/include/c++/12/cctype: -/usr/include/c++/11/bits/alloc_traits.h: +/usr/include/bits/waitflags.h: -third_party/uri/include/network/uri/uri_errors.hpp: +/usr/include/ctype.h: -/usr/include/c++/11/bits/move.h: +/usr/include/bits/types/__locale_t.h: -/usr/include/bits/struct_mutex.h: +/usr/include/c++/12/bits/stl_algobase.h: -/usr/include/c++/11/string: +/usr/include/features.h: -/usr/include/bits/stdint-uintn.h: +/usr/include/bits/endianness.h: -/usr/include/c++/11/bits/stl_construct.h: +third_party/uri/src/detail/uri_normalize.cpp: -/usr/include/bits/sched.h: +/usr/include/c++/12/bits/ostream_insert.h: -/usr/include/c++/11/ext/aligned_buffer.h: +/usr/include/c++/12/bits/cxxabi_forced.h: -/usr/include/endian.h: +/usr/include/c++/12/bits/stl_iterator_base_types.h: -/usr/include/c++/11/bits/std_function.h: +/usr/include/bits/struct_mutex.h: -/usr/include/c++/11/bits/allocator.h: +/usr/include/bits/types/__FILE.h: -/usr/include/bits/types/wint_t.h: +/usr/include/c++/12/bits/concept_check.h: -/usr/include/c++/11/bits/localefwd.h: +/usr/include/c++/12/debug/debug.h: -/usr/include/c++/11/bits/refwrap.h: +/usr/include/c++/12/bits/uniform_int_dist.h: -/usr/include/bits/floatn.h: +/usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h: -/usr/include/c++/11/x86_64-redhat-linux/bits/c++locale.h: +/usr/include/c++/12/bits/std_abs.h: -/usr/include/bits/locale.h: +/usr/include/c++/12/debug/assertions.h: -/usr/include/c++/11/cctype: +/usr/include/c++/12/bits/ptr_traits.h: -/usr/include/features.h: +/usr/include/bits/types/time_t.h: -/usr/include/bits/endianness.h: +/usr/include/bits/types/struct_itimerspec.h: -/usr/include/c++/11/bits/ostream_insert.h: +/usr/include/bits/struct_rwlock.h: -/usr/include/c++/11/algorithm: +/usr/include/c++/12/bits/std_function.h: -/usr/include/c++/11/backward/binders.h: +/usr/include/c++/12/bits/stl_function.h: -third_party/uri/src/detail/uri_normalize.cpp: +third_party/uri/include/network/uri/uri_builder.hpp: -/usr/include/c++/11/bits/basic_string.h: +/usr/include/c++/12/ext/numeric_traits.h: -/usr/include/stdint.h: +/usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h: -/usr/include/c++/11/x86_64-redhat-linux/bits/gthr-default.h: +/usr/include/c++/12/bits/stl_pair.h: -/usr/include/c++/11/x86_64-redhat-linux/bits/gthr.h: +/usr/include/c++/12/cstdlib: -/usr/include/c++/11/bits/cpp_type_traits.h: +/usr/include/bits/thread-shared-types.h: -/usr/include/pthread.h: +/usr/include/c++/12/bits/stl_construct.h: -/usr/include/bits/types/time_t.h: +/usr/include/c++/12/bits/vector.tcc: -/usr/include/bits/types/struct_timespec.h: +/usr/include/c++/12/bits/functexcept.h: -/usr/include/c++/11/bits/atomic_lockfree_defines.h: +/usr/include/c++/12/bits/predefined_ops.h: -/usr/include/c++/11/bits/streambuf.tcc: +/usr/include/c++/12/bits/invoke.h: -/usr/include/bits/types/struct_sched_param.h: +/usr/include/time.h: -/usr/include/c++/11/bits/stream_iterator.h: +/usr/include/c++/12/bits/range_access.h: -/usr/include/ctype.h: +third_party/uri/src/detail/uri_parse.hpp: -/usr/include/bits/waitflags.h: +/usr/include/c++/12/ext/type_traits.h: -/usr/include/time.h: +/usr/include/c++/12/bits/basic_string.h: -/usr/include/bits/stdio_lim.h: +/usr/include/stdlib.h: -/usr/include/bits/types/__mbstate_t.h: +/usr/include/bits/timesize.h: -/usr/include/c++/11/bits/exception_defines.h: +/usr/include/bits/waitstatus.h: -/usr/include/bits/time.h: +/usr/include/bits/types/clockid_t.h: -/usr/include/bits/types/struct_timeval.h: +/usr/include/bits/atomic_wide_counter.h: -/usr/include/bits/types/__fpos_t.h: +/usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h: -/usr/include/c++/11/iosfwd: +/usr/include/errno.h: -/usr/include/bits/types/clock_t.h: +/usr/include/bits/types/timer_t.h: -/usr/include/c++/11/initializer_list: +/usr/include/c++/12/bits/functional_hash.h: -/usr/include/bits/types/clockid_t.h: +/usr/include/stdio.h: -/usr/include/c++/11/bits/locale_classes.h: +third_party/uri/src/detail/uri_advance_parts.hpp: -/usr/include/bits/types/timer_t.h: +/usr/include/bits/byteswap.h: -/usr/include/bits/struct_rwlock.h: +/usr/include/sys/select.h: -/usr/include/bits/types/struct_itimerspec.h: +/usr/include/c++/12/bits/locale_facets_nonio.h: -/usr/include/bits/wctype-wchar.h: +/usr/include/bits/select.h: -/usr/include/sys/types.h: +/usr/include/c++/12/bits/basic_string.tcc: -/usr/include/bits/pthreadtypes.h: +/usr/include/bits/types/struct_timeval.h: -/usr/include/c++/11/bits/shared_ptr.h: +/usr/include/bits/time.h: -/usr/include/bits/thread-shared-types.h: +/usr/include/bits/types/__mbstate_t.h: -third_party/uri/src/detail/uri_parse_authority.cpp: +/usr/include/bits/stdio_lim.h: -/usr/include/bits/setjmp.h: +/usr/include/bits/types/struct_timespec.h: -/usr/include/bits/types/struct___jmp_buf_tag.h: +/usr/include/alloca.h: -/usr/include/sys/single_threaded.h: +/usr/include/bits/stdlib-bsearch.h: -/usr/include/c++/11/bits/cxxabi_forced.h: +/usr/include/c++/12/bits/shared_ptr_base.h: -/usr/include/c++/11/ext/alloc_traits.h: +/usr/include/bits/types/clock_t.h: -/usr/include/stdlib.h: +/usr/include/bits/types/__fpos_t.h: -/usr/include/c++/11/bits/shared_ptr_base.h: +/usr/include/c++/12/clocale: -/usr/include/bits/timesize.h: +/usr/include/bits/types/__fpos64_t.h: -/usr/include/bits/waitstatus.h: +/usr/include/bits/types/struct_FILE.h: -/usr/include/c++/11/array: +/usr/include/bits/stdio.h: -third_party/uri/src/detail/uri_advance_parts.hpp: +/usr/include/c++/12/bits/refwrap.h: -/usr/include/bits/byteswap.h: +/usr/include/c++/12/cerrno: diff --git a/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/flags.make b/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/flags.make index ffdfe61c01..92f7bade59 100644 --- a/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/flags.make +++ b/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/flags.make @@ -1,10 +1,10 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.22 +# Generated by "Unix Makefiles" Generator, CMake Version 3.25 # compile CXX with /bin/c++ CXX_DEFINES = -CXX_INCLUDES = -I/usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src -I/usr/local/src/asymptote-2.83/LspCpp/third_party/uri/include +CXX_INCLUDES = -I/usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src -I/usr/local/src/asymptote-2.84/LspCpp/third_party/uri/include -CXX_FLAGS = -fPIE -D_FILE_OFFSET_BITS=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 -I../gc-8.2.0/include -std=c++11 -Wall -Werror -Wno-parentheses -O2 -g -DNDEBUG diff --git a/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/link.txt b/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/link.txt index 2294b8160a..f804330c4f 100644 --- a/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/link.txt +++ b/graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/link.txt @@ -1,2 +1,2 @@ -/bin/ar qc libnetwork-uri.a CMakeFiles/network-uri.dir/uri.cpp.o CMakeFiles/network-uri.dir/uri_builder.cpp.o CMakeFiles/network-uri.dir/uri_errors.cpp.o CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o +/bin/ar qc libnetwork-uri.a "CMakeFiles/network-uri.dir/uri.cpp.o" "CMakeFiles/network-uri.dir/uri_builder.cpp.o" "CMakeFiles/network-uri.dir/uri_errors.cpp.o" "CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o" "CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o" "CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o" "CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o" "CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o" /bin/ranlib libnetwork-uri.a diff --git a/graphics/asymptote/LspCpp/third_party/uri/src/Makefile b/graphics/asymptote/LspCpp/third_party/uri/src/Makefile index 3ffc68f8da..c767b14344 100644 --- a/graphics/asymptote/LspCpp/third_party/uri/src/Makefile +++ b/graphics/asymptote/LspCpp/third_party/uri/src/Makefile @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.22 +# Generated by "Unix Makefiles" Generator, CMake Version 3.25 # Default target executed when no arguments are given to make. default_target: all @@ -60,10 +60,10 @@ RM = /usr/bin/cmake -E rm -f EQUALS = = # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.83/LspCpp +CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.84/LspCpp # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.83/LspCpp +CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.84/LspCpp #============================================================================= # Targets provided globally by CMake. @@ -135,14 +135,14 @@ install/strip/fast: preinstall/fast # The main all target all: cmake_check_build_system - cd /usr/local/src/asymptote-2.83/LspCpp && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.83/LspCpp/CMakeFiles /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src//CMakeFiles/progress.marks - cd /usr/local/src/asymptote-2.83/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/all - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.83/LspCpp/CMakeFiles 0 + cd /usr/local/src/asymptote-2.84/LspCpp && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.84/LspCpp/CMakeFiles /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src//CMakeFiles/progress.marks + cd /usr/local/src/asymptote-2.84/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/all + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.84/LspCpp/CMakeFiles 0 .PHONY : all # The main clean target clean: - cd /usr/local/src/asymptote-2.83/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/clean + cd /usr/local/src/asymptote-2.84/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/clean .PHONY : clean # The main clean target @@ -151,22 +151,22 @@ clean/fast: clean # Prepare targets for installation. preinstall: all - cd /usr/local/src/asymptote-2.83/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/preinstall + cd /usr/local/src/asymptote-2.84/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.83/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/preinstall + cd /usr/local/src/asymptote-2.84/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/preinstall .PHONY : preinstall/fast # clear depends depend: - cd /usr/local/src/asymptote-2.83/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 + cd /usr/local/src/asymptote-2.84/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.83/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/CMakeFiles/network-uri.dir/rule + cd /usr/local/src/asymptote-2.84/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 @@ network-uri: third_party/uri/src/CMakeFiles/network-uri.dir/rule # fast build rule for target. network-uri/fast: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ detail/uri_advance_parts.o: detail/uri_advance_parts.cpp.o # target to build an object file detail/uri_advance_parts.cpp.o: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ detail/uri_advance_parts.i: detail/uri_advance_parts.cpp.i # target to preprocess a source file detail/uri_advance_parts.cpp.i: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ detail/uri_advance_parts.s: detail/uri_advance_parts.cpp.s # target to generate assembly for a file detail/uri_advance_parts.cpp.s: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ detail/uri_normalize.o: detail/uri_normalize.cpp.o # target to build an object file detail/uri_normalize.cpp.o: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ detail/uri_normalize.i: detail/uri_normalize.cpp.i # target to preprocess a source file detail/uri_normalize.cpp.i: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ detail/uri_normalize.s: detail/uri_normalize.cpp.s # target to generate assembly for a file detail/uri_normalize.cpp.s: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ detail/uri_parse.o: detail/uri_parse.cpp.o # target to build an object file detail/uri_parse.cpp.o: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ detail/uri_parse.i: detail/uri_parse.cpp.i # target to preprocess a source file detail/uri_parse.cpp.i: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ detail/uri_parse.s: detail/uri_parse.cpp.s # target to generate assembly for a file detail/uri_parse.cpp.s: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ detail/uri_parse_authority.o: detail/uri_parse_authority.cpp.o # target to build an object file detail/uri_parse_authority.cpp.o: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ detail/uri_parse_authority.i: detail/uri_parse_authority.cpp.i # target to preprocess a source file detail/uri_parse_authority.cpp.i: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ detail/uri_parse_authority.s: detail/uri_parse_authority.cpp.s # target to generate assembly for a file detail/uri_parse_authority.cpp.s: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ detail/uri_resolve.o: detail/uri_resolve.cpp.o # target to build an object file detail/uri_resolve.cpp.o: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ detail/uri_resolve.i: detail/uri_resolve.cpp.i # target to preprocess a source file detail/uri_resolve.cpp.i: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ detail/uri_resolve.s: detail/uri_resolve.cpp.s # target to generate assembly for a file detail/uri_resolve.cpp.s: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ uri.o: uri.cpp.o # target to build an object file uri.cpp.o: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ uri.i: uri.cpp.i # target to preprocess a source file uri.cpp.i: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ uri.s: uri.cpp.s # target to generate assembly for a file uri.cpp.s: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ uri_builder.o: uri_builder.cpp.o # target to build an object file uri_builder.cpp.o: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ uri_builder.i: uri_builder.cpp.i # target to preprocess a source file uri_builder.cpp.i: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ uri_builder.s: uri_builder.cpp.s # target to generate assembly for a file uri_builder.cpp.s: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ uri_errors.o: uri_errors.cpp.o # target to build an object file uri_errors.cpp.o: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ uri_errors.i: uri_errors.cpp.i # target to preprocess a source file uri_errors.cpp.i: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ uri_errors.s: uri_errors.cpp.s # target to generate assembly for a file uri_errors.cpp.s: - cd /usr/local/src/asymptote-2.83/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.84/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 @@ help: # 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.83/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 + cd /usr/local/src/asymptote-2.84/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/graphics/asymptote/LspCpp/third_party/uri/src/cmake_install.cmake b/graphics/asymptote/LspCpp/third_party/uri/src/cmake_install.cmake index f01ba61a01..6132ea4547 100644 --- a/graphics/asymptote/LspCpp/third_party/uri/src/cmake_install.cmake +++ b/graphics/asymptote/LspCpp/third_party/uri/src/cmake_install.cmake @@ -1,4 +1,4 @@ -# Install script for directory: /usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src +# Install script for directory: /usr/local/src/asymptote-2.84/LspCpp/third_party/uri/src # Set the install prefix if(NOT DEFINED CMAKE_INSTALL_PREFIX) @@ -42,7 +42,7 @@ if(NOT DEFINED CMAKE_OBJDUMP) set(CMAKE_OBJDUMP "/bin/objdump") endif() -if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xUnspecifiedx" OR NOT CMAKE_INSTALL_COMPONENT) - file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY FILES "/usr/local/src/asymptote-2.83/LspCpp/third_party/uri/src/libnetwork-uri.a") +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.84/LspCpp/third_party/uri/src/libnetwork-uri.a") endif() diff --git a/graphics/asymptote/Makefile.in b/graphics/asymptote/Makefile.in index a59ebd9d8d..31dcb616c8 100644 --- a/graphics/asymptote/Makefile.in +++ b/graphics/asymptote/Makefile.in @@ -46,7 +46,7 @@ PRC = PRCbitStream oPRCFile PRCdouble writePRC COREFILES = $(CAMP) $(SYMBOL_FILES) env genv stm dec errormsg \ callable name symbol entry exp newexp stack camp.tab lex.yy \ access virtualfieldaccess absyn record interact fileio \ - fftw++asy simpson coder coenv impdatum \ + fftw++asy parallel simpson coder coenv impdatum \ @getopt@ locate parser program application varinit fundec refaccess \ envcompleter process constructor array Delaunay predicates \ $(PRC) glrender tr shaders jsfile v3dfile tinyexr EXRFiles GLTextures \ @@ -63,7 +63,7 @@ ASYGENERATEDENUMS=$(addprefix base/,$(GENERATEDENUMS:=.asy)) PYGENERATEDENUMS=$(GENERATEDENUMS:=.py) DIST = camp.tab.h camp.tab.cc lex.yy.cc runtime.cc keywords.cc \ - asy-keywords.el $(RUNTIME_FILES:=.cc) $(RUNTIME_FILES:=.h) asy.list \ + asy-keywords.el $(RUNTIME_FILES:=.cc) asy.list \ $(SYMBOLSH) $(PYFILES) $(GENERATEDENUMS:=.h) $(ASYGENERATEDENUMS) NAME = asy @@ -126,7 +126,7 @@ endif export prefix docdir exampledir mandir infodir INSTALL MAKE DESTDIR TEXI2DVI -asy: version glew.o @LSPLIB@ +asy: version $(FILES:=.o) glew.o @LSPLIB@ if test -n "$(MSDOS)"; then \ $(CXX) $(OPTS) -o $(NAME) $(FILES:=.o) revision.o asy.o $(DOSLIBS); \ else \ @@ -134,7 +134,7 @@ asy: version glew.o @LSPLIB@ $(CXX) $(OPTS) -o $(NAME) $(FILES:=.o) revision.o $(LIBS); \ fi -version: $(GCLIB) $(FILES:=.o) $(notdir $(UIFILES:.ui=.py)) GUI/icons_rc.py $(ASYGENERATEDENUMS) $(PYGENERATEDENUMS) +version: $(GCLIB) $(notdir $(UIFILES:.ui=.py)) GUI/icons_rc.py $(ASYGENERATEDENUMS) $(PYGENERATEDENUMS) if test ! -s revision.cc || test "$(revision)" != "$(last)"; then \ echo $(REVISION)\"$(revision)\"\; > revision.cc; \ echo const char *AsyGLVersion=\"$(ASYGLVERSION)\"\; >> revision.cc; \ @@ -380,7 +380,7 @@ glew.o: glew.c GL/glew.h GL/glew.c config.h $(CC) -I. $(GLEWOPTS) -o glew.o -c glew.c .SUFFIXES: .c .cc .o .d .ui .py -%.o: %.cc $(GENERATEDENUMS:=.h) +%.o: %.cc $(GENERATEDENUMS:=.h) $(RUNTIME_FILES:=.cc) $(CXX) $(OPTS) -o $@ -c $< %.d: %.cc $(GENERATEDENUMS:=.h) $(GCLIB) @echo Creating $@; \ diff --git a/graphics/asymptote/ReleaseNotes b/graphics/asymptote/ReleaseNotes index 9aadf88477..840284e031 100644 --- a/graphics/asymptote/ReleaseNotes +++ b/graphics/asymptote/ReleaseNotes @@ -1,3 +1,14 @@ +Release Notes for Version 2.84 + +PDF image compression is now disabled by default for alternative output +formats. The default UNIX postscript and PDF viewers were changed to evince. +Makefile dependencies were fixed. A Qt compatibility bug was fixed in Xasy. +A bug in XDR reads was fixed. A runtime error in the TexHead arrow was fixed. +An inversion bug was fixed in the geometry module. A division by zero error +in the vectorfield function was fixed. An option to display environment +settings was added. The default labelmargin function now accounts for +the pen linewidth. The resolution of the wall clock timer was improved. + Release Notes for Version 2.83 WebGL triangle groups were fixed. Context menus were added to Xasy objects diff --git a/graphics/asymptote/asy-keywords.el b/graphics/asymptote/asy-keywords.el index 14dd188ba2..00c79ad847 100644 --- a/graphics/asymptote/asy-keywords.el +++ b/graphics/asymptote/asy-keywords.el @@ -2,7 +2,7 @@ ;; This file is automatically generated by asy-list.pl. ;; Changes will be overwritten. ;; -(defvar asy-keywords-version "2.83") +(defvar asy-keywords-version "2.84") (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 )) @@ -14,4 +14,4 @@ Braid FitResult Label Legend Solution TreeNode abscissa arc arrowhead binarytree 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 ask 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 drawVertexBoxO 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 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 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 )) (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 RdYlBu 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 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 doublelinepen 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 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 )) +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 RdYlBu 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 doublelinepen 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 )) diff --git a/graphics/asymptote/asy.list b/graphics/asymptote/asy.list index 5e0417ff01..c802ef3bd6 100644 --- a/graphics/asymptote/asy.list +++ b/graphics/asymptote/asy.list @@ -68,8 +68,8 @@ path3 subpath(path3 p, real a, real b); bool isnan(real x); string jobname(string name); void print_random_addresses(int n=<default>); -void attach(picture dest=<default>, frame src, pair position=<default>, bool group=<default>, filltype filltype=<default>, bool above=<default>); void attach(picture dest=<default>, frame src, pair position, pair align, bool group=<default>, filltype filltype=<default>, bool above=<default>); +void attach(picture dest=<default>, frame src, pair position=<default>, bool group=<default>, filltype filltype=<default>, bool above=<default>); real[] quadraticroots(real a, real b, real c); pair[] quadraticroots(explicit pair a, explicit pair b, explicit pair c); pen darkcyan; @@ -106,8 +106,8 @@ void atupdate(void f()); void atupdate()(); void unfill(frame f, path[] g, bool copy=<default>); void unfill(picture pic=<default>, path[] g, bool copy=<default>); -bool Bar(picture, path, pen, marginT(path, pen)); bool Bar(picture, path, pen, marginT(path, pen))(real size=<default>); +bool Bar(picture, path, pen, marginT(path, pen)); bool eol(file f); pen zerowinding; void atbreakpoint(string f(string, int, int, code)); @@ -147,8 +147,8 @@ pen rgb(real r, real g, real b); pen rgb(real[] a); pen rgb(string s); real inch; -bool ArcArrow(picture, path, pen, marginT(path, pen))(arrowhead arrowhead=<default>, real size=<default>, real angle=<default>, filltype filltype=<default>, position position=<default>); bool ArcArrow(picture, path, pen, marginT(path, pen)); +bool ArcArrow(picture, path, pen, marginT(path, pen))(arrowhead arrowhead=<default>, real size=<default>, real angle=<default>, filltype filltype=<default>, position position=<default>); bool ArcArrows(picture, path, pen, marginT(path, pen))(arrowhead arrowhead=<default>, real size=<default>, real angle=<default>, filltype filltype=<default>); bool ArcArrows(picture, path, pen, marginT(path, pen)); pen currentpen; @@ -256,24 +256,24 @@ int search(int[] a, int key); int search(real[] a, real key); int search(string[] a, string key); int search(void()()[] a, void key()(), bool less(void()(), void()())); -int search(Label[] a, Label key, bool less(Label, Label)); +int search(picture[] a, picture key, bool less(picture, picture)); int search(real[] a, real key, bool less(real, real)); int search(guide[] a, guide key, bool less(guide, guide)); -int search(Legend[] a, Legend key, bool less(Legend, Legend)); +int search(object[] a, object key, bool less(object, object)); int search(pair[] a, pair key, bool less(pair, pair)); -int search(frame[] a, frame key, bool less(frame, frame)); int search(coord[] a, coord key, bool less(coord, coord)); +int search(Label[] a, Label key, bool less(Label, Label)); +int search(frame[] a, frame key, bool less(frame, frame)); int search(coord[] a, coord key, bool less(coord, coord)); +int search(Legend[] a, Legend key, bool less(Legend, Legend)); int search(int[] a, int key, bool less(int, int)); int search(bool3[] a, bool3 key, bool less(bool3, bool3)); -int search(marker[] a, marker key, bool less(marker, marker)); int search(string[] a, string key, bool less(string, string)); int search(path[] a, path key, bool less(path, path)); int search(pen[] a, pen key, bool less(pen, pen)); -int search(picture[] a, picture key, bool less(picture, picture)); int search(bool[] a, bool key, bool less(bool, bool)); int search(triple[] a, triple key, bool less(triple, triple)); -int search(object[] a, object key, bool less(object, object)); +int search(marker[] a, marker key, bool less(marker, marker)); filltype RadialShadeDraw(real xmargin=<default>, real ymargin=<default>, pen penc, pen penr, pen drawpen=<default>); real sin(real x); real[] sin(real[] a); @@ -349,18 +349,18 @@ pair max(explicit path p); pair max(path[] p); triple max(path3 p); real max(real M, scaling s, coord[] c); -real max(real M, scaling s, coord[] c); int max(... int[] a); pair max(picture pic, bool user=<default>); real max(... real[] a); +real max(real M, scaling s, coord[] c); +Label Label(Label L, pair position, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); Label Label(string s, string size=<default>, explicit position position, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); Label Label(Label L, explicit position position, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); Label Label(explicit pair position, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); -Label Label(string s=<default>, string size=<default>, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); Label Label; +Label Label(string s=<default>, string size=<default>, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); Label Label(string s, string size=<default>, pair position, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); Label Label(Label L, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); -Label Label(Label L, pair position, align align=<default>, pen p=<default>, transform embed(transform)=<default>, filltype filltype=<default>); string font(pen p=<default>); pen font(string name, string options=<default>); pen font(string encoding, string family, string series, string shape); @@ -405,9 +405,9 @@ void label(picture pic=<default>, Label L, explicit path g, align align=<default real fabs(real x); real[] fabs(real[] a); bool labels(frame f); -light light(explicit light light); light light(pen diffuse=<default>, pen specular=<default>, pen background=<default>, real x, real y, real z); light light(pen diffuse=<default>, pen specular=<default>, pen background=<default>, real specularfactor=<default> ... triple[] position); +light light(explicit light light); light light(pen[] diffuse, pen[] specular=<default>, pen background=<default>, real specularfactor=<default>, triple[] position); real remainder(real x, real y); int byte(real x); @@ -433,10 +433,10 @@ real erf(real x); void saveline(string name, string value, bool store=<default>); pen fuchsia; filltype filltype(int type=<default>, pen fillpen=<default>, pen drawpen=<default>, void fill2(frame f, path[] g, pen fillpen)); -path box(pair a, pair b); +pen Bookman(string series=<default>, string shape=<default>); path box(frame dest, frame src=<default>, real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>); path box(frame f, Label L, real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>); -pen Bookman(string series=<default>, string shape=<default>); +path box(pair a, pair b); frame[] fit(string prefix=<default>, picture[] pictures, string format=<default>, bool view=<default>, string options=<default>, string script=<default>, projection P=<default>); void seekeof(file f); path unitcircle; @@ -529,7 +529,6 @@ bool[] copy(bool[] a, int depth=<default>); real[][] copy(real[][] a, int depth=<default>); pen[] copy(pen[] a, int depth=<default>); coord[] copy(coord[] a, int depth=<default>); -coord[] copy(coord[] a, int depth=<default>); object[] copy(object[] a, int depth=<default>); marker[] copy(marker[] a, int depth=<default>); Legend[] copy(Legend[] a, int depth=<default>); @@ -542,6 +541,7 @@ string[][] copy(string[][] a, int depth=<default>); frame[] copy(frame[] a, int depth=<default>); pair[] copy(pair[] a, int depth=<default>); bool3[] copy(bool3[] a, int depth=<default>); +coord[] copy(coord[] a, int depth=<default>); Label[] copy(Label[] a, int depth=<default>); picture[] copy(picture[] a, int depth=<default>); pair[][] copy(pair[][] a, int depth=<default>); @@ -579,25 +579,25 @@ int[] map(int f(real), real[] a); bool3[] map(bool3 f(bool3), bool3[] a); frame[] map(frame f(frame), frame[] a); coord[] map(coord f(coord), coord[] a); -coord[] map(coord f(coord), coord[] a); +Legend[] map(Legend f(Legend), Legend[] a); pen[][] map(pen[] f(pen[]), pen[][] a); triple[] map(triple f(triple), triple[] a); pen[] map(pen f(pen), pen[] a); +coord[] map(coord f(coord), coord[] a); +Label[] map(Label f(Label), Label[] a); pair[] map(pair f(pair), pair[] a); -Legend[] map(Legend f(Legend), Legend[] a); +object[] map(object f(object), object[] a); string[] map(string f(string), string[] a); -Label[] map(Label f(Label), Label[] a); +picture[] map(picture f(picture), picture[] a); void()()[] map(void f()()(void()()), void()()[] a); pair[][] map(pair[] f(pair[]), pair[][] a); real[] map(real f(real), real[] a); -object[] map(object f(object), object[] a); +marker[] map(marker f(marker), marker[] a); int[] map(int f(int), int[] a); string[][] map(string[] f(string[]), string[][] a); -picture[] map(picture f(picture), picture[] a); bool[] map(bool f(bool), bool[] a); path[] map(path f(path), path[] a); real[][] map(real[] f(real[]), real[][] a); -marker[] map(marker f(marker), marker[] a); guide[] map(guide f(guide), guide[] a); path unstraighten(path p); path3 unstraighten(path3 p); @@ -613,7 +613,6 @@ pair minratio(path3 g); int[] sequence(int n); pen[][] sequence(pen[] f(int), int n); coord[] sequence(coord f(int), int n); -coord[] sequence(coord f(int), int n); object[] sequence(object f(int), int n); marker[] sequence(marker f(int), int n); Legend[] sequence(Legend f(int), int n); @@ -628,6 +627,7 @@ bool[] sequence(bool f(int), int n); string[] sequence(string f(int), int n); pair[][] sequence(pair[] f(int), int n); bool3[] sequence(bool3 f(int), int n); +coord[] sequence(coord f(int), int n); Label[] sequence(Label f(int), int n); picture[] sequence(picture f(int), int n); real[][] sequence(real[] f(int), int n); @@ -706,23 +706,23 @@ slice cut(path p, path knife, int n); bool is3D(frame f); bool is3D(string format=<default>); void add(frame dest, frame src); -void add(picture pic=<default>, void d(frame f, transform t), bool exact=<default>); -void add(frame dest, frame src, filltype filltype, bool above=<default>); -void add(frame dest, frame src, bool group, filltype filltype=<default>, bool above=<default>); -void add(picture pic=<default>, void d(picture, real[][]), bool exact=<default>); -void add(frame dest, frame src, pair position, bool group=<default>, filltype filltype=<default>, bool above=<default>); -void add(picture dest=<default>, frame src, pair position=<default>, bool group=<default>, filltype filltype=<default>, bool above=<default>); -void add(picture src, pair position, bool group=<default>, filltype filltype=<default>, bool above=<default>); -void add(picture pic=<default>, Label L); -void add(frame f, transform t=<default>, Label L); void add(picture dest=<default>, frame src, pair position, pair align, bool group=<default>, filltype filltype=<default>, bool above=<default>); void add(frame dest, frame src, pair position, pair align, bool group=<default>, filltype filltype=<default>, bool above=<default>); void add(picture src, bool group=<default>, filltype filltype=<default>, bool above=<default>); +void add(picture pic=<default>, void d(frame f, transform t), bool exact=<default>); void add(picture pic=<default>, void d(frame f, real[][] t, picture pic, projection P), bool exact=<default>); -void add(picture pic=<default>, void d(picture, transform), bool exact=<default>); +void add(picture pic=<default>, void d(picture, real[][]), bool exact=<default>); void add(picture dest, picture src, bool group=<default>, filltype filltype=<default>, bool above=<default>); void add(picture dest, picture src, pair position, bool group=<default>, filltype filltype=<default>, bool above=<default>); void add(picture dest=<default>, object F, pair position=<default>, bool group=<default>, filltype filltype=<default>, bool above=<default>); +void add(frame dest, frame src, filltype filltype, bool above=<default>); +void add(frame dest, frame src, bool group, filltype filltype=<default>, bool above=<default>); +void add(frame dest, frame src, pair position, bool group=<default>, filltype filltype=<default>, bool above=<default>); +void add(picture dest=<default>, frame src, pair position=<default>, bool group=<default>, filltype filltype=<default>, bool above=<default>); +void add(picture pic=<default>, Label L); +void add(picture pic=<default>, void d(picture, transform), bool exact=<default>); +void add(frame f, transform t=<default>, Label L); +void add(picture src, pair position, bool group=<default>, filltype filltype=<default>, bool above=<default>); plain plain; void purge(int divisor=<default>); int Round(real x); @@ -742,15 +742,16 @@ plain_scaling plain_scaling; string file(string s); plain_bounds plain_bounds; string outprefix(string prefix=<default>); -object object(Label L); -object object(frame f); object object(Label L, path e(frame dest, frame src=<default>, real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>), real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>); +object object(frame f); +object object(Label L); file stdin; void()()[] array(int n, void value()(), int depth=<default>); bool[] array(int n, bool value, int depth=<default>); string[] array(int n, string value, int depth=<default>); pair[][] array(int n, pair[] value, int depth=<default>); bool3[] array(int n, bool3 value, int depth=<default>); +coord[] array(int n, coord value, int depth=<default>); Label[] array(int n, Label value, int depth=<default>); picture[] array(int n, picture value, int depth=<default>); real[][] array(int n, real[] value, int depth=<default>); @@ -760,7 +761,6 @@ path[] array(int n, path value, int depth=<default>); frame[] array(int n, frame value, int depth=<default>); pen[][] array(int n, pen[] value, int depth=<default>); coord[] array(int n, coord value, int depth=<default>); -coord[] array(int n, coord value, int depth=<default>); object[] array(int n, object value, int depth=<default>); marker[] array(int n, marker value, int depth=<default>); Legend[] array(int n, Legend value, int depth=<default>); @@ -811,18 +811,18 @@ void draw(frame f, triple[] p, real[] knot, real[] weights=<default>, pen p); void draw(frame f, triple[][] p, real[] uknot, real[] vknot, real[][] weights=<default>, pen[] p, real opacity, real shininess, real metallic, real fresnel0, pen[] colors); void draw(frame f, triple[] v, int[][] vi, triple center=<default>, triple[] n, int[][] ni, pen[] p, real opacity, real shininess, real metallic, real fresnel0, pen[] c=<default>, int[][] ci=<default>, int interaction); void draw(picture pic=<default>, path[] g, pen fillrule=<default>, pen[] p); -object draw(picture pic=<default>, Label L, path e(frame dest, frame src=<default>, real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>), real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>); +object draw(picture pic=<default>, Label L, path e(frame dest, frame src=<default>, real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>), pair position, real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>); void draw(frame f, explicit path[] g, pen p=<default>); -void draw(frame f, path g, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))); +void draw(picture pic=<default>, guide[] g, pen p=<default>, Label legend=<default>, marker marker=<default>); +void draw(pair origin, picture pic=<default>, guide[] g, pen p=<default>, Label legend=<default>, marker marker=<default>); void draw(picture pic=<default>, explicit path[] g, pen p=<default>, Label legend=<default>, marker marker=<default>); void draw(pair origin, picture pic=<default>, explicit path[] g, pen p=<default>, Label legend=<default>, marker marker=<default>); -object draw(picture pic=<default>, Label L, path e(frame dest, frame src=<default>, real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>), pair position, real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>); -void draw(picture pic=<default>, Label L=<default>, path g, align align=<default>, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, bool bar(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, Label legend=<default>, marker marker=<default>); -void draw(pair origin, picture pic=<default>, Label L=<default>, path g, align align=<default>, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, bool bar(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, Label legend=<default>, marker marker=<default>); +object draw(picture pic=<default>, Label L, path e(frame dest, frame src=<default>, real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>), real xmargin=<default>, real ymargin=<default>, pen p=<default>, filltype filltype=<default>, bool above=<default>); void draw(frame f, guide[] g, pen p=<default>); void draw(frame f, path g, pen p=<default>); -void draw(picture pic=<default>, guide[] g, pen p=<default>, Label legend=<default>, marker marker=<default>); -void draw(pair origin, picture pic=<default>, guide[] g, pen p=<default>, Label legend=<default>, marker marker=<default>); +void draw(picture pic=<default>, Label L=<default>, path g, align align=<default>, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, bool bar(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, Label legend=<default>, marker marker=<default>); +void draw(pair origin, picture pic=<default>, Label L=<default>, path g, align align=<default>, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, bool bar(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, Label legend=<default>, marker marker=<default>); +void draw(frame f, path g, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))); int mantissaBits; real identity(real x); real[] identity(real[] a); @@ -886,13 +886,13 @@ void write(file file=<default>, string s=<default>, guide x, void suffix(file)=< void write(file file=<default>, string s=<default>, pen x, void suffix(file)=<default> ... pen[]); void write(file file, string s=<default>, explicit guide[] x, void suffix(file)=<default>); void write(string s=<default>, cputime c, string format=<default>, void suffix(file)=<default>); -void write(pairOrTriple a); void write(string s=<default>, explicit path[] x, void suffix(file)=<default>); void write(file file, void suffix(file)=<default>); void write(file file=<default>, string s=<default>, pen[] p); void write(void suffix(file)=<default>); void write(file file, string s=<default>, explicit path[] x, void suffix(file)=<default>); void write(file file=<default>, align align, void suffix(file)=<default>); +void write(pairOrTriple a); void write(file file, string s=<default>, cputime c, string format=<default>, void suffix(file)=<default>); void write(string s=<default>, bool3 b, void suffix(file)=<default>); void write(file file, string s=<default>, bool3 b, void suffix(file)=<default>); @@ -949,22 +949,22 @@ pen dotted; string blend(pen p); arrowhead HookHead; arrowhead HookHead(real dir=<default>, real barb=<default>); -object[] concat(... object[][]); +marker[] concat(... marker[][]); real[] concat(... real[][]); -Label[] concat(... Label[][]); +picture[] concat(... picture[][]); pair[] concat(... pair[][]); -Legend[] concat(... Legend[][]); +object[] concat(... object[][]); pen[] concat(... pen[][]); -path[] concat(... path[][]); coord[] concat(... coord[][]); +Label[] concat(... Label[][]); +path[] concat(... path[][]); coord[] concat(... coord[][]); +Legend[] concat(... Legend[][]); int[] concat(... int[][]); void()()[] concat(... void()()[][]); bool3[] concat(... bool3[][]); string[] concat(... string[][]); -marker[] concat(... marker[][]); triple[] concat(... triple[][]); -picture[] concat(... picture[][]); frame[] concat(... frame[][]); guide[] concat(... guide[][]); bool[] concat(... bool[][]); @@ -974,63 +974,63 @@ real[] log1p(real[] a); real infinity; bool alias(pair[][] a, pair[][] b); bool alias(guide[] a, guide[] b); -bool alias(filltype a, filltype b); -bool alias(coord[] a, coord[] b); +bool alias(marginT a, marginT b); bool alias(coord[] a, coord[] b); -bool alias(coords3 a, coords3 b); -bool alias(marker a, marker b); +bool alias(autoscaleT a, autoscaleT b); +bool alias(align a, align b); +bool alias(Legend[] a, Legend[] b); +bool alias(processtime a, processtime b); bool alias(pair[] a, pair[] b); bool alias(scaling a, scaling b); -bool alias(scaling a, scaling b); -bool alias(ScaleT a, ScaleT b); -bool alias(side a, side b); -bool alias(arrowhead a, arrowhead b); -bool alias(picture[] a, picture[] b); +bool alias(coord a, coord b); +bool alias(light a, light b); +bool alias(node a, node b); +bool alias(Label a, Label b); bool alias(schur a, schur b); bool alias(int[] a, int[] b); bool alias(string[][] a, string[][] b); bool alias(slice a, slice b); -bool alias(simplex a, simplex b); -bool alias(projection a, projection b); -bool alias(pairOrTriple a, pairOrTriple b); -bool alias(object a, object b); -bool alias(Legend[] a, Legend[] b); +bool alias(freezableBounds a, freezableBounds b); +bool alias(transformation a, transformation b); +bool alias(coords3 a, coords3 b); +bool alias(object[] a, object[] b); +bool alias(marker a, marker b); bool alias(real[][] a, real[][] b); bool alias(bool3 a, bool3 b); bool alias(bool3[] a, bool3[] b); -bool alias(bounds a, bounds b); bool alias(scaleT a, scaleT b); -bool alias(processtime a, processtime b); +bool alias(ScaleT a, ScaleT b); +bool alias(side a, side b); bool alias(cputime a, cputime b); bool alias(string[] a, string[] b); bool alias(frame[] a, frame[] b); bool alias(coords2 a, coords2 b); -bool alias(coords2 a, coords2 b); -bool alias(Legend a, Legend b); -bool alias(position a, position b); -bool alias(object[] a, object[] b); +bool alias(scaling a, scaling b); +bool alias(pairOrTriple a, pairOrTriple b); +bool alias(object a, object b); +bool alias(marker[] a, marker[] b); bool alias(bool[] a, bool[] b); bool alias(void()()[] a, void()()[] b); bool alias(pen[][] a, pen[][] b); -bool alias(marginT a, marginT b); -bool alias(light a, light b); -bool alias(picture a, picture b); +bool alias(filltype a, filltype b); +bool alias(simplex a, simplex b); +bool alias(coord[] a, coord[] b); +bool alias(projection a, projection b); +bool alias(Label[] a, Label[] b); +bool alias(arrowhead a, arrowhead b); bool alias(path[] a, path[] b); bool alias(triple[] a, triple[] b); bool alias(coord a, coord b); -bool alias(coord a, coord b); -bool alias(autoscaleT a, autoscaleT b); -bool alias(align a, align b); -bool alias(marker[] a, marker[] b); +bool alias(bounds a, bounds b); +bool alias(Legend a, Legend b); +bool alias(position a, position b); bool alias(realschur a, realschur b); bool alias(real[] a, real[] b); bool alias(pen[] a, pen[] b); bool alias(hsv a, hsv b); -bool alias(freezableBounds a, freezableBounds b); -bool alias(transformation a, transformation b); -bool alias(node a, node b); -bool alias(Label a, Label b); -bool alias(Label[] a, Label[] b); +bool alias(coords2 a, coords2 b); +bool alias(picture a, picture b); +bool alias(picture[] a, picture[] b); real pi; int getint(string name=<default>, int default=<default>, string prompt=<default>, bool store=<default>); int bitreverse(int a, int bits); @@ -1060,7 +1060,6 @@ real[][] sort(real[][] a); string[] sort(string[] a); string[][] sort(string[][] a); coord[] sort(coord[] a, bool less(coord, coord), bool stable=<default>); -coord[] sort(coord[] a, bool less(coord, coord), bool stable=<default>); object[] sort(object[] a, bool less(object, object), bool stable=<default>); marker[] sort(marker[] a, bool less(marker, marker), bool stable=<default>); Legend[] sort(Legend[] a, bool less(Legend, Legend), bool stable=<default>); @@ -1072,6 +1071,7 @@ bool[] sort(bool[] a, bool less(bool, bool), bool stable=<default>); void()()[] sort(void()()[] a, bool less(void()(), void()()), bool stable=<default>); frame[] sort(frame[] a, bool less(frame, frame), bool stable=<default>); bool3[] sort(bool3[] a, bool less(bool3, bool3), bool stable=<default>); +coord[] sort(coord[] a, bool less(coord, coord), bool stable=<default>); Label[] sort(Label[] a, bool less(Label, Label), bool stable=<default>); picture[] sort(picture[] a, bool less(picture, picture), bool stable=<default>); int[] sort(int[] a, bool less(int, int), bool stable=<default>); @@ -1091,11 +1091,11 @@ void latticeshade(picture pic=<default>, path[] g, bool stroke=<default>, pen fi pair[] pairs(real[] x, real[] y); void eval(code s, bool embedded=<default>); void eval(string s, bool embedded=<default>); -bool Arrow(picture, path, pen, marginT(path, pen)); bool Arrow(picture, path, pen, marginT(path, pen))(arrowhead arrowhead=<default>, real size=<default>, real angle=<default>, filltype filltype=<default>, position position=<default>); +bool Arrow(picture, path, pen, marginT(path, pen)); void drawTube(frame f, triple[] g, real width, pen[] p, real opacity, real shininess, real metallic, real fresnel0, triple min, triple max, bool core=<default>); -bool Arrows(picture, path, pen, marginT(path, pen)); bool Arrows(picture, path, pen, marginT(path, pen))(arrowhead arrowhead=<default>, real size=<default>, real angle=<default>, filltype filltype=<default>); +bool Arrows(picture, path, pen, marginT(path, pen)); int tell(file f); pen Yellow; pair up; @@ -1121,9 +1121,9 @@ pen[] mean(pen[][] palette, real opacity(real[])=<default>); string mktemp(string s); void sleep(int seconds); void drawstrokepath(picture pic=<default>, path g, pen strokepen, pen p=<default>); -void unitsize(picture pic=<default>, real x, real y=<default>, real z=<default>); void arrow(picture pic=<default>, Label L=<default>, pair b, pair dir, real length=<default>, align align=<default>, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>); picture arrow(arrowhead arrowhead=<default>, path g, pen p=<default>, real size=<default>, real angle=<default>, filltype filltype=<default>, position position=<default>, bool forwards=<default>, marginT margin(path, pen)=<default>, bool center=<default>); +void unitsize(picture pic=<default>, real x, real y=<default>, real z=<default>); picture arrow2(arrowhead arrowhead=<default>, path g, pen p=<default>, real size=<default>, real angle=<default>, filltype filltype=<default>, marginT margin(path, pen)=<default>); path unitsquare; real arrowdir; @@ -1299,10 +1299,10 @@ triple[] operator +(triple[] a); pen operator +(pen a, pen b); transform operator +(transform a, transform b); pen operator +(pen p, real w); -marginT operator +(path, pen)(marginT ma(path, pen), marginT mb(path, pen)); pen[] operator +(pen a, pen[] b); pen operator +(real w, pen p); string operator +(... string[] a); +marginT operator +(path, pen)(marginT ma(path, pen), marginT mb(path, pen)); pen[] operator +(pen[] a, pen b); int operator -(int a, int b); int[] operator -(int a, int[] b); @@ -1376,15 +1376,15 @@ triple operator *(real[][] t, triple v); triple operator *(real x, triple v); triple operator *(triple v, real x); path3 operator *(real[][] t, path3 g); +side operator *(real x, side s); +Label operator *(real[][] t, Label L); picture operator *(transform t, picture orig); object operator *(transform t, explicit object F); -Label operator *(transform t, Label L); path[] operator *(transform t, explicit path[] p); +Label operator *(transform t, Label L); pair[] operator *(transform t, pair[] z); -picture operator *(real[][] t, picture orig); bounds operator *(transform t, bounds b); -side operator *(real x, side s); -Label operator *(real[][] t, Label L); +picture operator *(real[][] t, picture orig); bool operator init(); int operator init(); real operator init(); @@ -1398,40 +1398,40 @@ path3 operator init(); pen operator init(); frame operator init(); file operator init(); -filltype operator init(); -coords3 operator init(); -marker operator init(); marginT operator init(); -light operator init(); -picture operator init(); -slice operator init(); +autoscaleT operator init(); +align operator init(); +processtime operator init(); +filltype operator init(); simplex operator init(); projection operator init(); -pairOrTriple operator init(); -object operator init(); -hsv operator init(); +arrowhead operator init(); +slice operator init(); transformation operator init(); -node operator init(); -Label operator init(); +coords3 operator init(); +marker operator init(); +hsv operator init(); coords2 operator init(); +picture operator init(); coords2 operator init(); -Legend operator init(); -position operator init(); scaling operator init(); +pairOrTriple operator init(); +object operator init(); scaling operator init(); -ScaleT operator init(); -side operator init(); -arrowhead operator init(); -schur operator init(); coord operator init(); +light operator init(); +node operator init(); +Label operator init(); +schur operator init(); coord operator init(); -autoscaleT operator init(); -align operator init(); +bounds operator init(); +Legend operator init(); +position operator init(); realschur operator init(); bool3 operator init(); -bounds operator init(); scaleT operator init(); -processtime operator init(); +ScaleT operator init(); +side operator init(); cputime operator init(); real operator cast(int); pair operator cast(int); @@ -1474,33 +1474,33 @@ string[][][] operator cast(file); guide operator cast(cycleToken tok); guide operator cast(curlSpecifier spec); guide operator cast(tensionSpecifier t); +align operator cast(side side); guide[] operator cast(path[] g); -pair operator cast(position P); +pair operator cast(pairOrTriple a); +triple operator cast(pairOrTriple a); +frame operator cast(object F); hsv operator cast(pen p); -object operator cast(frame f); bool3[] operator cast(bool[] b); -align operator cast(pair dir); +position operator cast(pair x); +object operator cast(Label L); +Label operator cast(object F); +pair operator cast(position P); +object operator cast(frame f); guide[] operator cast(pair[] z); -align operator cast(triple dir); path[] operator cast(guide[] g); bool operator cast(bool3 b); +align operator cast(pair dir); path[] operator cast(guide g); -align operator cast(side side); -position operator cast(int x); -object operator cast(string s); path[] operator cast(pair[] z); +align operator cast(triple dir); path[] operator cast(path p); bool[] operator cast(bool3[] b); -position operator cast(real x); -Label operator cast(string s); -object operator cast(Label L); -Label operator cast(object F); -pair operator cast(pairOrTriple a); -triple operator cast(pairOrTriple a); -frame operator cast(object F); bool3 operator cast(bool b); +position operator cast(int x); +object operator cast(string s); pen operator cast(hsv hsv); -position operator cast(pair x); +position operator cast(real x); +Label operator cast(string s); pen deepred; bool error(file f); string operator ecast(int); @@ -1605,43 +1605,43 @@ bool operator ==(file a, file b); bool operator ==(path a, path b); bool operator ==(path3 a, path3 b); bool operator ==(bool3 a, bool3 b); -bool operator ==(bounds a, bounds b); bool operator ==(scaleT a, scaleT b); -bool operator ==(processtime a, processtime b); +bool operator ==(ScaleT a, ScaleT b); +bool operator ==(side a, side b); bool operator ==(cputime a, cputime b); bool operator ==(coords2 a, coords2 b); -bool operator ==(coords2 a, coords2 b); +bool operator ==(scaling a, scaling b); +bool operator ==(pairOrTriple a, pairOrTriple b); +bool operator ==(object a, object b); +bool operator ==(filltype a, filltype b); +bool operator ==(simplex a, simplex b); +bool operator ==(projection a, projection b); +bool operator ==(arrowhead a, arrowhead b); +bool operator ==(coord a, coord b); +bool operator ==(bounds a, bounds b); bool operator ==(Legend a, Legend b); bool operator ==(position a, position b); -bool operator ==(marginT a, marginT b); -bool operator ==(light a, light b); +bool operator ==(realschur a, realschur b); +bool operator ==(hsv a, hsv b); +bool operator ==(coords2 a, coords2 b); bool operator ==(picture a, picture b); -bool operator ==(coord a, coord b); -bool operator ==(coord a, coord b); +bool operator ==(bool3 a, bool b); +bool operator ==(marginT a, marginT b); bool operator ==(autoscaleT a, autoscaleT b); bool operator ==(align a, align b); -bool operator ==(realschur a, realschur b); -bool operator ==(hsv a, hsv b); -bool operator ==(freezableBounds a, freezableBounds b); -bool operator ==(transformation a, transformation b); +bool operator ==(processtime a, processtime b); +bool operator ==(scaling a, scaling b); +bool operator ==(coord a, coord b); +bool operator ==(light a, light b); bool operator ==(node a, node b); bool operator ==(Label a, Label b); -bool operator ==(bool3 a, bool b); -bool operator ==(filltype a, filltype b); -bool operator ==(coords3 a, coords3 b); -bool operator ==(marker a, marker b); -bool operator ==(scaling a, scaling b); -bool operator ==(scaling a, scaling b); -bool operator ==(ScaleT a, ScaleT b); -bool operator ==(side a, side b); -bool operator ==(arrowhead a, arrowhead b); bool operator ==(schur a, schur b); bool operator ==(bool a, bool3 b); bool operator ==(slice a, slice b); -bool operator ==(simplex a, simplex b); -bool operator ==(projection a, projection b); -bool operator ==(pairOrTriple a, pairOrTriple b); -bool operator ==(object a, object b); +bool operator ==(freezableBounds a, freezableBounds b); +bool operator ==(transformation a, transformation b); +bool operator ==(coords3 a, coords3 b); +bool operator ==(marker a, marker b); bool operator !=(bool a, bool b); bool[] operator !=(bool a, bool[] b); bool[] operator !=(bool[] a, bool b); @@ -1679,43 +1679,43 @@ bool operator !=(file a, file b); bool operator !=(path a, path b); bool operator !=(path3 a, path3 b); bool operator !=(bool3 a, bool3 b); -bool operator !=(bounds a, bounds b); bool operator !=(scaleT a, scaleT b); -bool operator !=(processtime a, processtime b); +bool operator !=(ScaleT a, ScaleT b); +bool operator !=(side a, side b); bool operator !=(cputime a, cputime b); bool operator !=(coords2 a, coords2 b); -bool operator !=(coords2 a, coords2 b); +bool operator !=(scaling a, scaling b); +bool operator !=(pairOrTriple a, pairOrTriple b); +bool operator !=(object a, object b); +bool operator !=(filltype a, filltype b); +bool operator !=(simplex a, simplex b); +bool operator !=(projection a, projection b); +bool operator !=(arrowhead a, arrowhead b); +bool operator !=(coord a, coord b); +bool operator !=(bounds a, bounds b); bool operator !=(Legend a, Legend b); bool operator !=(position a, position b); -bool operator !=(marginT a, marginT b); -bool operator !=(light a, light b); +bool operator !=(realschur a, realschur b); +bool operator !=(hsv a, hsv b); +bool operator !=(coords2 a, coords2 b); bool operator !=(picture a, picture b); -bool operator !=(coord a, coord b); -bool operator !=(coord a, coord b); +bool operator !=(bool3 a, bool b); +bool operator !=(marginT a, marginT b); bool operator !=(autoscaleT a, autoscaleT b); bool operator !=(align a, align b); -bool operator !=(realschur a, realschur b); -bool operator !=(hsv a, hsv b); -bool operator !=(freezableBounds a, freezableBounds b); -bool operator !=(transformation a, transformation b); +bool operator !=(processtime a, processtime b); +bool operator !=(scaling a, scaling b); +bool operator !=(coord a, coord b); +bool operator !=(light a, light b); bool operator !=(node a, node b); bool operator !=(Label a, Label b); -bool operator !=(bool3 a, bool b); -bool operator !=(filltype a, filltype b); -bool operator !=(coords3 a, coords3 b); -bool operator !=(marker a, marker b); -bool operator !=(scaling a, scaling b); -bool operator !=(scaling a, scaling b); -bool operator !=(ScaleT a, ScaleT b); -bool operator !=(side a, side b); -bool operator !=(arrowhead a, arrowhead b); bool operator !=(schur a, schur b); bool operator !=(bool a, bool3 b); bool operator !=(slice a, slice b); -bool operator !=(simplex a, simplex b); -bool operator !=(projection a, projection b); -bool operator !=(pairOrTriple a, pairOrTriple b); -bool operator !=(object a, object b); +bool operator !=(freezableBounds a, freezableBounds b); +bool operator !=(transformation a, transformation b); +bool operator !=(coords3 a, coords3 b); +bool operator !=(marker a, marker b); bool operator <(int a, int b); bool[] operator <(int a, int[] b); bool[] operator <(int[] a, int b); @@ -1862,6 +1862,7 @@ real dot(real[] a, real[] b); pair dot(pair[] a, pair[] b); real dot(explicit pair z, explicit pair w); real dot(triple u, triple v); +void dot(picture pic=<default>, Label[] L=<default>, explicit path g, align align=<default>, string format=<default>, pen p=<default>, filltype filltype=<default>); marker dot(pen p=<default>, filltype filltype=<default>); void dot(picture pic=<default>, pair z, pen p=<default>, filltype filltype=<default>); void dot(frame f, pair z, pen p=<default>, filltype filltype=<default>); @@ -1870,7 +1871,6 @@ void dot(picture pic=<default>, Label[] L=<default>, pair[] z, align align=<defa void dot(picture pic=<default>, path[] g, pen p=<default>, filltype filltype=<default>); marker dot; void dot(picture pic=<default>, Label L, pair z, align align=<default>, string format=<default>, pen p=<default>, filltype filltype=<default>); -void dot(picture pic=<default>, Label[] L=<default>, explicit path g, align align=<default>, string format=<default>, pen p=<default>, filltype filltype=<default>); void list(string s, bool imports=<default>); pair NNW; string phantom(string s); @@ -1989,8 +1989,8 @@ pen Black; triple size3(frame f); void size3(picture pic=<default>, real x, real y=<default>, real z=<default>, bool keepAspect=<default>); bool eof(file f); -frame dotframe; frame dotframe(pen p=<default>, filltype filltype=<default>); +frame dotframe; real realMax; pair NE; real realMin; @@ -3545,11 +3545,13 @@ rational sum(rational[] a); int lcm(int m, int n); rational max(rational a, rational b); rational max(rational[] a); +bool optimizeTableau; simplex operator init(); void simplexInit(rational[] c, rational[][] A, int[] s=<default>, rational[] b, int count); void simplexPhase1(rational[] c, rational[][] A, rational[] b, int[] Bindices); -void simplexTableau(rational[][] E, int[] Bindices, int I=<default>, int J=<default>); +void simplexTableau(rational[][] E, int[] Bindices, int I=<default>, int J=<default>, int n=<default>); void simplexPhase2(); +int[] artificialColumn; void simplexWrite(rational[][] E, int[] Bindices, int, int); path roundedpath(path A, real R, real S=<default>); simplex operator init(); diff --git a/graphics/asymptote/asymptote.spec b/graphics/asymptote/asymptote.spec index 524804f52f..f8917660c3 100644 --- a/graphics/asymptote/asymptote.spec +++ b/graphics/asymptote/asymptote.spec @@ -3,7 +3,7 @@ %global __python %{__python3} Name: asymptote -Version: 2.83 +Version: 2.84 Release: 1%{?dist} Summary: Descriptive vector graphics language diff --git a/graphics/asymptote/base/geometry.asy b/graphics/asymptote/base/geometry.asy index 9f0631f447..37d085cb1c 100644 --- a/graphics/asymptote/base/geometry.asy +++ b/graphics/asymptote/base/geometry.asy @@ -6418,13 +6418,13 @@ inversion inversion(circle c1, circle c2, real sgn = 1) point O = radicalcenter(c1, c2); return inversion(O^c1, O); } - real a = abs(c1.r/c2.r); - if(sgn > 0) { - point O = c1.C + a/abs(1 - a) * (c2.C - c1.C); - return inversion(a * abs(abs(O - c2.C)^2 - c2.r^2), O); + 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)); } - point O = c1.C + a/abs(1 + a) * (c2.C - c1.C); - return inversion(-a * abs(abs(O - c2.C)^2 - c2.r^2), O); } /*<asyxml><function type="inversion" signature="inversion(circle,circle,circle)"><code></asyxml>*/ diff --git a/graphics/asymptote/base/graph.asy b/graphics/asymptote/base/graph.asy index 18821b456d..433aa2fc20 100644 --- a/graphics/asymptote/base/graph.asy +++ b/graphics/asymptote/base/graph.asy @@ -2213,7 +2213,13 @@ picture vectorfield(path vector(pair), pair a, pair b, max=maxbound(max,size((x,y))); } } - scale=min(dx/max.x,dy/max.y); + + if(max.x == 0) + scale=max.y == 0 ? 1.0 : dy/max.y; + else if(max.y == 0) + scale=dx/max.x; + else + scale=min(dx/max.x,dy/max.y); for(int i=0; i < nx; ++i) { real x=a.x+i*dx; diff --git a/graphics/asymptote/base/plain_arrows.asy b/graphics/asymptote/base/plain_arrows.asy index a172a0d07f..d9c08636fc 100644 --- a/graphics/asymptote/base/plain_arrows.asy +++ b/graphics/asymptote/base/plain_arrows.asy @@ -157,7 +157,7 @@ TeXHead.head=new path(path g, position position=EndPoint, pen p=currentpen, if(relative) position=reltime(g,position); path r=subpath(g,position,0); pair y=point(r,arctime(r,size)); - return shift(y)*rotate(degrees(-dir(r,arctime(r,0.5*size))))*gp; + return shift(y)*rotate(degrees(-dir(r,arctime(r,0.5*size)),false))*gp; }; TeXHead.defaultfilltype=new filltype(pen p) {return Fill(p);}; diff --git a/graphics/asymptote/base/plain_pens.asy b/graphics/asymptote/base/plain_pens.asy index 2e3a4449a3..2f47855a9f 100644 --- a/graphics/asymptote/base/plain_pens.asy +++ b/graphics/asymptote/base/plain_pens.asy @@ -1,4 +1,4 @@ -real labelmargin=0.3; +real labelmargin=0.28; real dotfactor=6; pen solid=linetype(new real[]); @@ -173,7 +173,7 @@ pen fontsize(real size) real labelmargin(pen p=currentpen) { - return labelmargin*fontsize(p); + return labelmargin*fontsize(p)+0.5*linewidth(p); } void write(file file=stdout, string s="", pen[] p) diff --git a/graphics/asymptote/base/rationalSimplex.asy b/graphics/asymptote/base/rationalSimplex.asy index 3a376ba2dd..b6ce98c4ae 100644 --- a/graphics/asymptote/base/rationalSimplex.asy +++ b/graphics/asymptote/base/rationalSimplex.asy @@ -1,9 +1,14 @@ // Rational simplex solver written by John C. Bowman and Pouria Ramazi, 2018. import rational; +bool optimizeTableau=true; + +int[] artificialColumn; + void simplexInit(rational[] c, rational[][] A, int[] s=new int[], rational[] b, int count) {} -void simplexTableau(rational[][] E, int[] Bindices, int I=-1, int J=-1) {} +void simplexTableau(rational[][] E, int[] Bindices, int I=-1, int J=-1, + int n=E[0].length-1) {} void simplexPhase1(rational[] c, rational[][] A, rational[] b, int[] Bindices) {} void simplexPhase2() {} @@ -71,7 +76,7 @@ struct simplex { } } - int iterate(rational[][] E, int N, int[] Bindices) { + int iterate(rational[][] E, int N, int[] Bindices, bool phase1=false) { while(true) { // Bland's rule: first negative entry in reduced cost (bottom) row enters rational[] Em=E[m]; @@ -108,11 +113,13 @@ struct simplex { // Generate new tableau Bindices[I]=J; rowreduce(E,N,I,J); + + if(phase1 && Em[0] == 0) break; } return OPTIMAL; } - int iterateDual(rational[][] E, int N, int[] Bindices) { + int iterateDual(rational[][] E, int N, int[] Bindices, bool phase1=false) { while(true) { // Bland's rule: negative variable with smallest subscript exits int I; @@ -211,30 +218,31 @@ struct simplex { if(phase1) { Bindices=new int[m]; - int p=0; + int k=0; + artificialColumn.delete(); // Check for redundant basis vectors. - bool checkBasis(int j) { - for(int i=0; i < m; ++i) { - rational[] Ei=E[i]; - if(i != p ? Ei[j] != 0 : Ei[j] <= 0) return false; + for(int p=0; p < m; ++p) { + bool checkBasis(int j) { + for(int i=0; i < m; ++i) { + rational[] Ei=E[i]; + if(i != p ? Ei[j] != 0 : Ei[j] <= 0) + return false; + } + return true; } - return true; - } - int checkTableau() { - for(int j=1; j <= n; ++j) - if(checkBasis(j)) return j; - return 0; - } + int checkTableau() { + if(optimizeTableau) + for(int j=1; j <= n; ++j) + if(checkBasis(j)) return j; + return 0; + } - int k=0; - while(p < m) { int j=checkTableau(); - if(j > 0) - Bindices[p]=j; - else { // Add an artificial variable - Bindices[p]=n+1+k; + Bindices[p]=n+1+p; + if(j == 0) { // Add an artificial variable + artificialColumn.push(p+1); for(int i=0; i < p; ++i) E[i].push(0); E[p].push(1); @@ -243,14 +251,13 @@ struct simplex { E[m].push(0); ++k; } - ++p; } basicValues(); simplexPhase1(c,A,b,Bindices); - iterate(E,n+k,Bindices); + iterate(E,n+k,Bindices,true); if(Em[0] != 0) { simplexTableau(E,Bindices); @@ -265,23 +272,22 @@ struct simplex { rational[] cB=phase1 ? new rational[m] : c[n-m:n]; rational[][] D=phase1 ? new rational[m+1][n+1] : E; if(phase1) { - bool output=true; + write("n=",n); + write(Bindices); // Drive artificial variables out of basis. for(int i=0; i < m; ++i) { - int k=Bindices[i]; - if(k > n) { + if(Bindices[i] > n) { rational[] Ei=E[i]; int j; for(j=1; j <= n; ++j) if(Ei[j] != 0) break; if(j > n) continue; - output=false; - simplexTableau(E,Bindices,i,j); + simplexTableau(E,Bindices,i,j,n); Bindices[i]=j; rowreduce(E,n,i,j); } } - if(output) simplexTableau(E,Bindices); + simplexTableau(E,Bindices,-1,-1,n); int ip=0; // reduced i for(int i=0; i < m; ++i) { int k=Bindices[i]; @@ -307,7 +313,6 @@ struct simplex { D.delete(ip,m-1); m=ip; } - if(!output) simplexTableau(D,Bindices); } rational[] Dm=D[m]; @@ -335,6 +340,8 @@ struct simplex { for(int k=0; k < m; ++k) x[Bindices[k]-1]=D[k][0]; + + xStandard=copy(x); } if(case == UNBOUNDED) { @@ -414,10 +421,7 @@ struct simplex { simplexInit(C,a,b,count); operator init(C,a,b,phase1); - if(case != INFEASIBLE) { - xStandard=copy(x); - if(count > 0) - x.delete(n,n+count-1); - } + if(case != INFEASIBLE && count > 0) + x.delete(n,n+count-1); } } diff --git a/graphics/asymptote/base/simplex.asy b/graphics/asymptote/base/simplex.asy index 3bc74635db..8b53ede6eb 100644 --- a/graphics/asymptote/base/simplex.asy +++ b/graphics/asymptote/base/simplex.asy @@ -42,7 +42,7 @@ struct simplex { } } - int iterate(real[][] E, int N, int[] Bindices) { + int iterate(real[][] E, int N, int[] Bindices, bool phase1=false) { while(true) { // Bland's rule: first negative entry in reduced cost (bottom) row enters real[] Em=E[m]; @@ -77,11 +77,13 @@ struct simplex { // Generate new tableau Bindices[I]=J; rowreduce(E,N,I,J); + + if(phase1 && abs(Em[0]) <= EpsilonA) break; } return OPTIMAL; } - int iterateDual(real[][] E, int N, int[] Bindices) { + int iterateDual(real[][] E, int N, int[] Bindices, bool phase1=false) { while(true) { // Bland's rule: negative variable with smallest subscript exits int I; @@ -182,30 +184,28 @@ struct simplex { if(phase1) { Bindices=new int[m]; - int p=0; + int k=0; // Check for redundant basis vectors. - bool checkBasis(int j) { - for(int i=0; i < m; ++i) { - real[] Ei=E[i]; - if(i != p ? abs(Ei[j]) >= epsilonA : Ei[j] <= epsilonA) return false; + for(int p=0; p < m; ++p) { + bool checkBasis(int j) { + for(int i=0; i < m; ++i) { + real[] Ei=E[i]; + if(i != p ? abs(Ei[j]) >= epsilonA : Ei[j] <= epsilonA) + return false; + } + return true; } - return true; - } - int checkTableau() { - for(int j=1; j <= n; ++j) - if(checkBasis(j)) return j; - return 0; - } + int checkTableau() { + for(int j=1; j <= n; ++j) + if(checkBasis(j)) return j; + return 0; + } - int k=0; - while(p < m) { int j=checkTableau(); - if(j > 0) - Bindices[p]=j; - else { // Add an artificial variable - Bindices[p]=n+1+k; + Bindices[p]=n+1+p; + if(j == 0) { // Add an artificial variable for(int i=0; i < p; ++i) E[i].push(0.0); E[p].push(1.0); @@ -214,11 +214,11 @@ struct simplex { E[m].push(0.0); ++k; } - ++p; } basicValues(); - iterate(E,n+k,Bindices); + + iterate(E,n+k,Bindices,true); if(abs(Em[0]) > EpsilonA) { case=INFEASIBLE; @@ -234,8 +234,7 @@ struct simplex { if(phase1) { // Drive artificial variables out of basis. for(int i=0; i < m; ++i) { - int k=Bindices[i]; - if(k > n) { + if(Bindices[i] > n) { real[] Ei=E[i]; int j; for(j=1; j <= n; ++j) diff --git a/graphics/asymptote/base/three.asy b/graphics/asymptote/base/three.asy index c208f59df8..9dfad6ce79 100644 --- a/graphics/asymptote/base/three.asy +++ b/graphics/asymptote/base/three.asy @@ -2907,11 +2907,6 @@ object embed(string prefix=outprefix(), string label=prefix, if((preview || (prc && settings.render == 0)) && settings.embed) { image=prefix; if(settings.inlinetex) image += "_0"; - if(!preview && !S.pic2.empty2()) { - transform T=S.pic2.scaling(S.width,S.height); - _shipout(image,S.pic2.fit(T),newframe,nativeformat(),false,false); - } - image += "."+nativeformat(); if(!settings.inlinetex) file3.push(image); image=graphic(image,"hiresbb"); diff --git a/graphics/asymptote/base/v3dheadertypes.asy b/graphics/asymptote/base/v3dheadertypes.asy index 9c966a47cb..653a8ba2d9 100644 --- a/graphics/asymptote/base/v3dheadertypes.asy +++ b/graphics/asymptote/base/v3dheadertypes.asy @@ -1,6 +1,6 @@ // Enum class for v3dheadertypes // AUTO-GENERATED from v3dheadertypes.csv -// Generated at 2022-09-17 12:47:07.633830 +// Generated at 2023-01-23 00:17:44 struct v3dheadertypes { diff --git a/graphics/asymptote/base/v3dtypes.asy b/graphics/asymptote/base/v3dtypes.asy index 7de241a2d0..c101488827 100644 --- a/graphics/asymptote/base/v3dtypes.asy +++ b/graphics/asymptote/base/v3dtypes.asy @@ -1,6 +1,6 @@ // Enum class for v3dtypes // AUTO-GENERATED from v3dtypes.csv -// Generated at 2022-09-17 12:47:07.568303 +// Generated at 2023-01-23 00:17:44 struct v3dtypes { diff --git a/graphics/asymptote/camp.tab.cc b/graphics/asymptote/camp.tab.cc index 3a61e702a0..1b2eda1ff8 100644 --- a/graphics/asymptote/camp.tab.cc +++ b/graphics/asymptote/camp.tab.cc @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 3.7.6. */ +/* A Bison parser, made by GNU Bison 3.8.2. */ /* Bison implementation for Yacc-like parsers in C @@ -46,10 +46,10 @@ USER NAME SPACE" below. */ /* Identify Bison output, and Bison version. */ -#define YYBISON 30706 +#define YYBISON 30802 /* Bison version string. */ -#define YYBISON_VERSION "3.7.6" +#define YYBISON_VERSION "3.8.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -437,12 +437,18 @@ typedef int yy_state_fast_t; # define YY_USE(E) /* empty */ #endif -#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ /* Suppress an incorrect diagnostic about yylval being uninitialized. */ -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ +#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__ +# if __GNUC__ * 100 + __GNUC_MINOR__ < 407 +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") +# else +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") \ _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# endif # define YY_IGNORE_MAYBE_UNINITIALIZED_END \ _Pragma ("GCC diagnostic pop") #else @@ -662,7 +668,7 @@ static const yytype_int8 yytranslate[] = }; #if YYDEBUG - /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ +/* 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, @@ -728,22 +734,6 @@ yysymbol_name (yysymbol_kind_t yysymbol) } #endif -#ifdef YYPRINT -/* YYTOKNUM[NUM] -- (External) token number corresponding to the - (internal) symbol number NUM (which must be that of a token). */ -static const yytype_int16 yytoknum[] = -{ - 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 278, 279, 43, 45, 42, 47, 37, - 35, 94, 280, 281, 282, 63, 58, 283, 284, 285, - 123, 125, 40, 41, 46, 44, 91, 93, 59, 286, - 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, - 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, - 307, 308, 309, 310, 311, 312 -}; -#endif - #define YYPACT_NINF (-285) #define yypact_value_is_default(Yyn) \ @@ -754,8 +744,8 @@ static const yytype_int16 yytoknum[] = #define yytable_value_is_error(Yyn) \ 0 - /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ static const yytype_int16 yypact[] = { -285, 41, 472, -285, -285, 873, 873, 873, 873, -285, @@ -798,9 +788,9 @@ static const yytype_int16 yypact[] = -285, -285, 614, -285, -285, -285 }; - /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. - Performed when YYTABLE does not specify something else to do. Zero - means the default is an error. */ +/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ static const yytype_uint8 yydefact[] = { 3, 0, 2, 1, 7, 0, 0, 0, 0, 9, @@ -843,7 +833,7 @@ static const yytype_uint8 yydefact[] = 63, 185, 0, 165, 79, 184 }; - /* YYPGOTO[NTERM-NUM]. */ +/* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { -285, -285, 250, -285, 10, 263, -285, 285, 36, 170, @@ -853,7 +843,7 @@ static const yytype_int16 yypgoto[] = 205, -285, -285, -19, -79, -138, -285, -285, -285, -8 }; - /* YYDEFGOTO[NTERM-NUM]. */ +/* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { 0, 1, 2, 57, 51, 36, 37, 38, 233, 234, @@ -863,9 +853,9 @@ static const yytype_int16 yydefgoto[] = 135, 196, 197, 48, 49, 50, 169, 316, 364, 170 }; - /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule whose - number is the opposite. If YYTABLE_NINF, syntax error. */ +/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { 52, 53, 54, 55, 168, 56, 82, 60, 77, 258, @@ -1270,8 +1260,8 @@ static const yytype_int16 yycheck[] = 31, 40, -1, -1, -1, -1, -1, -1, -1, 40 }; - /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ +/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of + state STATE-NUM. */ static const yytype_int8 yystos[] = { 0, 77, 78, 0, 3, 7, 8, 25, 26, 29, @@ -1314,7 +1304,7 @@ static const yytype_int8 yystos[] = 41, 119, 43, 41, 98, 119 }; - /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM. */ static const yytype_int8 yyr1[] = { 0, 76, 77, 78, 78, 79, 79, 80, 80, 80, @@ -1340,7 +1330,7 @@ static const yytype_int8 yyr1[] = 125 }; - /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ +/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM. */ static const yytype_int8 yyr2[] = { 0, 2, 1, 0, 2, 0, 2, 1, 3, 1, @@ -1375,6 +1365,7 @@ enum { YYENOMEM = -2 }; #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab #define YYERROR goto yyerrorlab +#define YYNOMEM goto yyexhaustedlab #define YYRECOVERING() (!!yyerrstatus) @@ -1415,10 +1406,7 @@ do { \ YYFPRINTF Args; \ } while (0) -/* This macro is provided for backward compatibility. */ -# ifndef YY_LOCATION_PRINT -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif + # define YY_SYMBOL_PRINT(Title, Kind, Value, Location) \ @@ -1445,10 +1433,6 @@ yy_symbol_value_print (FILE *yyo, YY_USE (yyoutput); if (!yyvaluep) return; -# ifdef YYPRINT - if (yykind < YYNTOKENS) - YYPRINT (yyo, yytoknum[yykind], *yyvaluep); -# endif YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN YY_USE (yykind); YY_IGNORE_MAYBE_UNINITIALIZED_END @@ -1633,6 +1617,7 @@ yyparse (void) YYDPRINTF ((stderr, "Starting parse\n")); yychar = YYEMPTY; /* Cause a token to be read. */ + goto yysetstate; @@ -1658,7 +1643,7 @@ yysetstate: if (yyss + yystacksize - 1 <= yyssp) #if !defined yyoverflow && !defined YYSTACK_RELOCATE - goto yyexhaustedlab; + YYNOMEM; #else { /* Get the current used size of the three stacks, in elements. */ @@ -1686,7 +1671,7 @@ yysetstate: # else /* defined YYSTACK_RELOCATE */ /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + YYNOMEM; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; @@ -1697,7 +1682,7 @@ yysetstate: YY_CAST (union yyalloc *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize)))); if (! yyptr) - goto yyexhaustedlab; + YYNOMEM; YYSTACK_RELOCATE (yyss_alloc, yyss); YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE @@ -1719,6 +1704,7 @@ yysetstate: } #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ + if (yystate == YYFINAL) YYACCEPT; @@ -1833,555 +1819,555 @@ yyreduce: case 2: /* file: fileblock */ #line 191 "camp.y" { absyntax::root = (yyvsp[0].b); } -#line 1837 "camp.tab.c" +#line 1823 "camp.tab.c" break; case 3: /* fileblock: %empty */ #line 195 "camp.y" { (yyval.b) = new file(lexerPos(), false); } -#line 1843 "camp.tab.c" +#line 1829 "camp.tab.c" break; case 4: /* fileblock: fileblock runnable */ #line 197 "camp.y" { (yyval.b) = (yyvsp[-1].b); (yyval.b)->add((yyvsp[0].run)); } -#line 1849 "camp.tab.c" +#line 1835 "camp.tab.c" break; case 5: /* bareblock: %empty */ #line 201 "camp.y" { (yyval.b) = new block(lexerPos(), true); } -#line 1855 "camp.tab.c" +#line 1841 "camp.tab.c" break; case 6: /* bareblock: bareblock runnable */ #line 203 "camp.y" { (yyval.b) = (yyvsp[-1].b); (yyval.b)->add((yyvsp[0].run)); } -#line 1861 "camp.tab.c" +#line 1847 "camp.tab.c" break; case 7: /* name: ID */ #line 207 "camp.y" { (yyval.n) = new simpleName((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); } -#line 1867 "camp.tab.c" +#line 1853 "camp.tab.c" break; case 8: /* name: name '.' ID */ #line 208 "camp.y" { (yyval.n) = new qualifiedName((yyvsp[-1].pos), (yyvsp[-2].n), (yyvsp[0].ps).sym); } -#line 1873 "camp.tab.c" +#line 1859 "camp.tab.c" break; case 9: /* name: '%' */ #line 209 "camp.y" { (yyval.n) = new simpleName((yyvsp[0].ps).pos, symbol::trans("operator answer")); } -#line 1880 "camp.tab.c" +#line 1866 "camp.tab.c" break; case 10: /* runnable: dec */ #line 214 "camp.y" { (yyval.run) = (yyvsp[0].d); } -#line 1886 "camp.tab.c" +#line 1872 "camp.tab.c" break; case 11: /* runnable: stm */ #line 215 "camp.y" { (yyval.run) = (yyvsp[0].s); } -#line 1892 "camp.tab.c" +#line 1878 "camp.tab.c" break; case 12: /* runnable: modifiers dec */ #line 217 "camp.y" { (yyval.run) = new modifiedRunnable((yyvsp[-1].ml)->getPos(), (yyvsp[-1].ml), (yyvsp[0].d)); } -#line 1898 "camp.tab.c" +#line 1884 "camp.tab.c" break; case 13: /* runnable: modifiers stm */ #line 219 "camp.y" { (yyval.run) = new modifiedRunnable((yyvsp[-1].ml)->getPos(), (yyvsp[-1].ml), (yyvsp[0].s)); } -#line 1904 "camp.tab.c" +#line 1890 "camp.tab.c" break; case 14: /* modifiers: MODIFIER */ #line 223 "camp.y" { (yyval.ml) = new modifierList((yyvsp[0].mod).pos); (yyval.ml)->add((yyvsp[0].mod).val); } -#line 1910 "camp.tab.c" +#line 1896 "camp.tab.c" break; case 15: /* modifiers: PERM */ #line 224 "camp.y" { (yyval.ml) = new modifierList((yyvsp[0].perm).pos); (yyval.ml)->add((yyvsp[0].perm).val); } -#line 1916 "camp.tab.c" +#line 1902 "camp.tab.c" break; case 16: /* modifiers: modifiers MODIFIER */ #line 226 "camp.y" { (yyval.ml) = (yyvsp[-1].ml); (yyval.ml)->add((yyvsp[0].mod).val); } -#line 1922 "camp.tab.c" +#line 1908 "camp.tab.c" break; case 17: /* modifiers: modifiers PERM */ #line 228 "camp.y" { (yyval.ml) = (yyvsp[-1].ml); (yyval.ml)->add((yyvsp[0].perm).val); } -#line 1928 "camp.tab.c" +#line 1914 "camp.tab.c" break; case 18: /* dec: vardec */ #line 232 "camp.y" { (yyval.d) = (yyvsp[0].vd); } -#line 1934 "camp.tab.c" +#line 1920 "camp.tab.c" break; case 19: /* dec: fundec */ #line 233 "camp.y" { (yyval.d) = (yyvsp[0].d); } -#line 1940 "camp.tab.c" +#line 1926 "camp.tab.c" break; case 20: /* dec: typedec */ #line 234 "camp.y" { (yyval.d) = (yyvsp[0].d); } -#line 1946 "camp.tab.c" +#line 1932 "camp.tab.c" break; case 21: /* dec: ACCESS stridpairlist ';' */ #line 236 "camp.y" { (yyval.d) = new accessdec((yyvsp[-2].pos), (yyvsp[-1].ipl)); } -#line 1952 "camp.tab.c" +#line 1938 "camp.tab.c" break; case 22: /* dec: FROM name UNRAVEL idpairlist ';' */ #line 238 "camp.y" { (yyval.d) = new unraveldec((yyvsp[-4].pos), (yyvsp[-3].n), (yyvsp[-1].ipl)); } -#line 1958 "camp.tab.c" +#line 1944 "camp.tab.c" break; case 23: /* dec: FROM name UNRAVEL '*' ';' */ #line 240 "camp.y" { (yyval.d) = new unraveldec((yyvsp[-4].pos), (yyvsp[-3].n), WILDCARD); } -#line 1964 "camp.tab.c" +#line 1950 "camp.tab.c" break; case 24: /* dec: UNRAVEL name ';' */ #line 241 "camp.y" { (yyval.d) = new unraveldec((yyvsp[-2].pos), (yyvsp[-1].n), WILDCARD); } -#line 1970 "camp.tab.c" +#line 1956 "camp.tab.c" break; case 25: /* dec: FROM strid ACCESS idpairlist ';' */ #line 243 "camp.y" { (yyval.d) = new fromaccessdec((yyvsp[-4].pos), (yyvsp[-3].ps).sym, (yyvsp[-1].ipl)); } -#line 1976 "camp.tab.c" +#line 1962 "camp.tab.c" break; case 26: /* dec: FROM strid ACCESS '*' ';' */ #line 245 "camp.y" { (yyval.d) = new fromaccessdec((yyvsp[-4].pos), (yyvsp[-3].ps).sym, WILDCARD); } -#line 1982 "camp.tab.c" +#line 1968 "camp.tab.c" break; case 27: /* dec: IMPORT stridpair ';' */ #line 247 "camp.y" { (yyval.d) = new importdec((yyvsp[-2].pos), (yyvsp[-1].ip)); } -#line 1988 "camp.tab.c" +#line 1974 "camp.tab.c" break; case 28: /* dec: INCLUDE ID ';' */ #line 248 "camp.y" { (yyval.d) = new includedec((yyvsp[-2].pos), (yyvsp[-1].ps).sym); } -#line 1994 "camp.tab.c" +#line 1980 "camp.tab.c" break; case 29: /* dec: INCLUDE STRING ';' */ #line 250 "camp.y" { (yyval.d) = new includedec((yyvsp[-2].pos), (yyvsp[-1].stre)->getString()); } -#line 2000 "camp.tab.c" +#line 1986 "camp.tab.c" break; case 30: /* idpair: ID */ #line 254 "camp.y" { (yyval.ip) = new idpair((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); } -#line 2006 "camp.tab.c" +#line 1992 "camp.tab.c" break; case 31: /* idpair: ID ID ID */ #line 256 "camp.y" { (yyval.ip) = new idpair((yyvsp[-2].ps).pos, (yyvsp[-2].ps).sym, (yyvsp[-1].ps).sym , (yyvsp[0].ps).sym); } -#line 2012 "camp.tab.c" +#line 1998 "camp.tab.c" break; case 32: /* idpairlist: idpair */ #line 260 "camp.y" { (yyval.ipl) = new idpairlist(); (yyval.ipl)->add((yyvsp[0].ip)); } -#line 2018 "camp.tab.c" +#line 2004 "camp.tab.c" break; case 33: /* idpairlist: idpairlist ',' idpair */ #line 262 "camp.y" { (yyval.ipl) = (yyvsp[-2].ipl); (yyval.ipl)->add((yyvsp[0].ip)); } -#line 2024 "camp.tab.c" +#line 2010 "camp.tab.c" break; case 34: /* strid: ID */ #line 266 "camp.y" { (yyval.ps) = (yyvsp[0].ps); } -#line 2030 "camp.tab.c" +#line 2016 "camp.tab.c" break; case 35: /* strid: STRING */ #line 267 "camp.y" { (yyval.ps).pos = (yyvsp[0].stre)->getPos(); (yyval.ps).sym = symbol::literalTrans((yyvsp[0].stre)->getString()); } -#line 2037 "camp.tab.c" +#line 2023 "camp.tab.c" break; case 36: /* stridpair: ID */ #line 272 "camp.y" { (yyval.ip) = new idpair((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); } -#line 2043 "camp.tab.c" +#line 2029 "camp.tab.c" break; case 37: /* stridpair: strid ID ID */ #line 274 "camp.y" { (yyval.ip) = new idpair((yyvsp[-2].ps).pos, (yyvsp[-2].ps).sym, (yyvsp[-1].ps).sym , (yyvsp[0].ps).sym); } -#line 2049 "camp.tab.c" +#line 2035 "camp.tab.c" break; case 38: /* stridpairlist: stridpair */ #line 278 "camp.y" { (yyval.ipl) = new idpairlist(); (yyval.ipl)->add((yyvsp[0].ip)); } -#line 2055 "camp.tab.c" +#line 2041 "camp.tab.c" break; case 39: /* stridpairlist: stridpairlist ',' stridpair */ #line 280 "camp.y" { (yyval.ipl) = (yyvsp[-2].ipl); (yyval.ipl)->add((yyvsp[0].ip)); } -#line 2061 "camp.tab.c" +#line 2047 "camp.tab.c" break; case 40: /* vardec: barevardec ';' */ #line 284 "camp.y" { (yyval.vd) = (yyvsp[-1].vd); } -#line 2067 "camp.tab.c" +#line 2053 "camp.tab.c" break; case 41: /* barevardec: type decidlist */ #line 288 "camp.y" { (yyval.vd) = new vardec((yyvsp[-1].t)->getPos(), (yyvsp[-1].t), (yyvsp[0].dil)); } -#line 2073 "camp.tab.c" +#line 2059 "camp.tab.c" break; case 42: /* type: celltype */ #line 292 "camp.y" { (yyval.t) = (yyvsp[0].t); } -#line 2079 "camp.tab.c" +#line 2065 "camp.tab.c" break; case 43: /* type: name dims */ #line 293 "camp.y" { (yyval.t) = new arrayTy((yyvsp[-1].n), (yyvsp[0].dim)); } -#line 2085 "camp.tab.c" +#line 2071 "camp.tab.c" break; case 44: /* celltype: name */ #line 297 "camp.y" { (yyval.t) = new nameTy((yyvsp[0].n)); } -#line 2091 "camp.tab.c" +#line 2077 "camp.tab.c" break; case 45: /* dims: '[' ']' */ #line 301 "camp.y" { (yyval.dim) = new dimensions((yyvsp[-1].pos)); } -#line 2097 "camp.tab.c" +#line 2083 "camp.tab.c" break; case 46: /* dims: dims '[' ']' */ #line 302 "camp.y" { (yyval.dim) = (yyvsp[-2].dim); (yyval.dim)->increase(); } -#line 2103 "camp.tab.c" +#line 2089 "camp.tab.c" break; case 47: /* dimexps: '[' exp ']' */ #line 306 "camp.y" { (yyval.elist) = new explist((yyvsp[-2].pos)); (yyval.elist)->add((yyvsp[-1].e)); } -#line 2109 "camp.tab.c" +#line 2095 "camp.tab.c" break; case 48: /* dimexps: dimexps '[' exp ']' */ #line 308 "camp.y" { (yyval.elist) = (yyvsp[-3].elist); (yyval.elist)->add((yyvsp[-1].e)); } -#line 2115 "camp.tab.c" +#line 2101 "camp.tab.c" break; case 49: /* decidlist: decid */ #line 312 "camp.y" { (yyval.dil) = new decidlist((yyvsp[0].di)->getPos()); (yyval.dil)->add((yyvsp[0].di)); } -#line 2121 "camp.tab.c" +#line 2107 "camp.tab.c" break; case 50: /* decidlist: decidlist ',' decid */ #line 314 "camp.y" { (yyval.dil) = (yyvsp[-2].dil); (yyval.dil)->add((yyvsp[0].di)); } -#line 2127 "camp.tab.c" +#line 2113 "camp.tab.c" break; case 51: /* decid: decidstart */ #line 318 "camp.y" { (yyval.di) = new decid((yyvsp[0].dis)->getPos(), (yyvsp[0].dis)); } -#line 2133 "camp.tab.c" +#line 2119 "camp.tab.c" break; case 52: /* decid: decidstart ASSIGN varinit */ #line 320 "camp.y" { (yyval.di) = new decid((yyvsp[-2].dis)->getPos(), (yyvsp[-2].dis), (yyvsp[0].vi)); } -#line 2139 "camp.tab.c" +#line 2125 "camp.tab.c" break; case 53: /* decidstart: ID */ #line 324 "camp.y" { (yyval.dis) = new decidstart((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); } -#line 2145 "camp.tab.c" +#line 2131 "camp.tab.c" break; case 54: /* decidstart: ID dims */ #line 325 "camp.y" { (yyval.dis) = new decidstart((yyvsp[-1].ps).pos, (yyvsp[-1].ps).sym, (yyvsp[0].dim)); } -#line 2151 "camp.tab.c" +#line 2137 "camp.tab.c" break; case 55: /* decidstart: ID '(' ')' */ #line 326 "camp.y" { (yyval.dis) = new fundecidstart((yyvsp[-2].ps).pos, (yyvsp[-2].ps).sym, 0, new formals((yyvsp[-1].pos))); } -#line 2158 "camp.tab.c" +#line 2144 "camp.tab.c" break; case 56: /* decidstart: ID '(' formals ')' */ #line 329 "camp.y" { (yyval.dis) = new fundecidstart((yyvsp[-3].ps).pos, (yyvsp[-3].ps).sym, 0, (yyvsp[-1].fls)); } -#line 2164 "camp.tab.c" +#line 2150 "camp.tab.c" break; case 57: /* varinit: exp */ #line 333 "camp.y" { (yyval.vi) = (yyvsp[0].e); } -#line 2170 "camp.tab.c" +#line 2156 "camp.tab.c" break; case 58: /* varinit: arrayinit */ #line 334 "camp.y" { (yyval.vi) = (yyvsp[0].ai); } -#line 2176 "camp.tab.c" +#line 2162 "camp.tab.c" break; case 59: /* block: '{' bareblock '}' */ #line 339 "camp.y" { (yyval.b) = (yyvsp[-1].b); } -#line 2182 "camp.tab.c" +#line 2168 "camp.tab.c" break; case 60: /* arrayinit: '{' '}' */ #line 343 "camp.y" { (yyval.ai) = new arrayinit((yyvsp[-1].pos)); } -#line 2188 "camp.tab.c" +#line 2174 "camp.tab.c" break; case 61: /* arrayinit: '{' ELLIPSIS varinit '}' */ #line 345 "camp.y" { (yyval.ai) = new arrayinit((yyvsp[-3].pos)); (yyval.ai)->addRest((yyvsp[-1].vi)); } -#line 2194 "camp.tab.c" +#line 2180 "camp.tab.c" break; case 62: /* arrayinit: '{' basearrayinit '}' */ #line 347 "camp.y" { (yyval.ai) = (yyvsp[-1].ai); } -#line 2200 "camp.tab.c" +#line 2186 "camp.tab.c" break; case 63: /* arrayinit: '{' basearrayinit ELLIPSIS varinit '}' */ #line 349 "camp.y" { (yyval.ai) = (yyvsp[-3].ai); (yyval.ai)->addRest((yyvsp[-1].vi)); } -#line 2206 "camp.tab.c" +#line 2192 "camp.tab.c" break; case 64: /* basearrayinit: ',' */ #line 353 "camp.y" { (yyval.ai) = new arrayinit((yyvsp[0].pos)); } -#line 2212 "camp.tab.c" +#line 2198 "camp.tab.c" break; case 65: /* basearrayinit: varinits */ #line 354 "camp.y" { (yyval.ai) = (yyvsp[0].ai); } -#line 2218 "camp.tab.c" +#line 2204 "camp.tab.c" break; case 66: /* basearrayinit: varinits ',' */ #line 355 "camp.y" { (yyval.ai) = (yyvsp[-1].ai); } -#line 2224 "camp.tab.c" +#line 2210 "camp.tab.c" break; case 67: /* varinits: varinit */ #line 359 "camp.y" { (yyval.ai) = new arrayinit((yyvsp[0].vi)->getPos()); (yyval.ai)->add((yyvsp[0].vi));} -#line 2231 "camp.tab.c" +#line 2217 "camp.tab.c" break; case 68: /* varinits: varinits ',' varinit */ #line 362 "camp.y" { (yyval.ai) = (yyvsp[-2].ai); (yyval.ai)->add((yyvsp[0].vi)); } -#line 2237 "camp.tab.c" +#line 2223 "camp.tab.c" break; case 69: /* formals: formal */ #line 366 "camp.y" { (yyval.fls) = new formals((yyvsp[0].fl)->getPos()); (yyval.fls)->add((yyvsp[0].fl)); } -#line 2243 "camp.tab.c" +#line 2229 "camp.tab.c" break; case 70: /* formals: ELLIPSIS formal */ #line 367 "camp.y" { (yyval.fls) = new formals((yyvsp[-1].pos)); (yyval.fls)->addRest((yyvsp[0].fl)); } -#line 2249 "camp.tab.c" +#line 2235 "camp.tab.c" break; case 71: /* formals: formals ',' formal */ #line 369 "camp.y" { (yyval.fls) = (yyvsp[-2].fls); (yyval.fls)->add((yyvsp[0].fl)); } -#line 2255 "camp.tab.c" +#line 2241 "camp.tab.c" break; case 72: /* formals: formals ELLIPSIS formal */ #line 371 "camp.y" { (yyval.fls) = (yyvsp[-2].fls); (yyval.fls)->addRest((yyvsp[0].fl)); } -#line 2261 "camp.tab.c" +#line 2247 "camp.tab.c" break; case 73: /* explicitornot: EXPLICIT */ #line 375 "camp.y" { (yyval.boo) = true; } -#line 2267 "camp.tab.c" +#line 2253 "camp.tab.c" break; case 74: /* explicitornot: %empty */ #line 376 "camp.y" { (yyval.boo) = false; } -#line 2273 "camp.tab.c" +#line 2259 "camp.tab.c" break; case 75: /* formal: explicitornot type */ #line 381 "camp.y" { (yyval.fl) = new formal((yyvsp[0].t)->getPos(), (yyvsp[0].t), 0, 0, (yyvsp[-1].boo), 0); } -#line 2279 "camp.tab.c" +#line 2265 "camp.tab.c" break; case 76: /* formal: explicitornot type decidstart */ #line 383 "camp.y" { (yyval.fl) = new formal((yyvsp[-1].t)->getPos(), (yyvsp[-1].t), (yyvsp[0].dis), 0, (yyvsp[-2].boo), 0); } -#line 2285 "camp.tab.c" +#line 2271 "camp.tab.c" break; case 77: /* formal: explicitornot type decidstart ASSIGN varinit */ #line 385 "camp.y" { (yyval.fl) = new formal((yyvsp[-3].t)->getPos(), (yyvsp[-3].t), (yyvsp[-2].dis), (yyvsp[0].vi), (yyvsp[-4].boo), 0); } -#line 2291 "camp.tab.c" +#line 2277 "camp.tab.c" break; case 78: /* formal: explicitornot type ID decidstart */ #line 388 "camp.y" { bool k = checkKeyword((yyvsp[-1].ps).pos, (yyvsp[-1].ps).sym); (yyval.fl) = new formal((yyvsp[-2].t)->getPos(), (yyvsp[-2].t), (yyvsp[0].dis), 0, (yyvsp[-3].boo), k); } -#line 2298 "camp.tab.c" +#line 2284 "camp.tab.c" break; case 79: /* formal: explicitornot type ID decidstart ASSIGN varinit */ #line 391 "camp.y" { bool k = checkKeyword((yyvsp[-3].ps).pos, (yyvsp[-3].ps).sym); (yyval.fl) = new formal((yyvsp[-4].t)->getPos(), (yyvsp[-4].t), (yyvsp[-2].dis), (yyvsp[0].vi), (yyvsp[-5].boo), k); } -#line 2305 "camp.tab.c" +#line 2291 "camp.tab.c" break; case 80: /* fundec: type ID '(' ')' blockstm */ #line 397 "camp.y" { (yyval.d) = new fundec((yyvsp[-2].pos), (yyvsp[-4].t), (yyvsp[-3].ps).sym, new formals((yyvsp[-2].pos)), (yyvsp[0].s)); } -#line 2311 "camp.tab.c" +#line 2297 "camp.tab.c" break; case 81: /* fundec: type ID '(' formals ')' blockstm */ #line 399 "camp.y" { (yyval.d) = new fundec((yyvsp[-3].pos), (yyvsp[-5].t), (yyvsp[-4].ps).sym, (yyvsp[-2].fls), (yyvsp[0].s)); } -#line 2317 "camp.tab.c" +#line 2303 "camp.tab.c" break; case 82: /* typedec: STRUCT ID block */ #line 403 "camp.y" { (yyval.d) = new recorddec((yyvsp[-2].pos), (yyvsp[-1].ps).sym, (yyvsp[0].b)); } -#line 2323 "camp.tab.c" +#line 2309 "camp.tab.c" break; case 83: /* typedec: TYPEDEF vardec */ #line 404 "camp.y" { (yyval.d) = new typedec((yyvsp[-1].pos), (yyvsp[0].vd)); } -#line 2329 "camp.tab.c" +#line 2315 "camp.tab.c" break; case 84: /* slice: ':' */ #line 408 "camp.y" { (yyval.slice) = new slice((yyvsp[0].pos), 0, 0); } -#line 2335 "camp.tab.c" +#line 2321 "camp.tab.c" break; case 85: /* slice: exp ':' */ #line 409 "camp.y" { (yyval.slice) = new slice((yyvsp[0].pos), (yyvsp[-1].e), 0); } -#line 2341 "camp.tab.c" +#line 2327 "camp.tab.c" break; case 86: /* slice: ':' exp */ #line 410 "camp.y" { (yyval.slice) = new slice((yyvsp[-1].pos), 0, (yyvsp[0].e)); } -#line 2347 "camp.tab.c" +#line 2333 "camp.tab.c" break; case 87: /* slice: exp ':' exp */ #line 411 "camp.y" { (yyval.slice) = new slice((yyvsp[-1].pos), (yyvsp[-2].e), (yyvsp[0].e)); } -#line 2353 "camp.tab.c" +#line 2339 "camp.tab.c" break; case 88: /* value: value '.' ID */ #line 415 "camp.y" { (yyval.e) = new fieldExp((yyvsp[-1].pos), (yyvsp[-2].e), (yyvsp[0].ps).sym); } -#line 2359 "camp.tab.c" +#line 2345 "camp.tab.c" break; case 89: /* value: name '[' exp ']' */ #line 416 "camp.y" { (yyval.e) = new subscriptExp((yyvsp[-2].pos), new nameExp((yyvsp[-3].n)->getPos(), (yyvsp[-3].n)), (yyvsp[-1].e)); } -#line 2366 "camp.tab.c" +#line 2352 "camp.tab.c" break; case 90: /* value: value '[' exp ']' */ #line 418 "camp.y" { (yyval.e) = new subscriptExp((yyvsp[-2].pos), (yyvsp[-3].e), (yyvsp[-1].e)); } -#line 2372 "camp.tab.c" +#line 2358 "camp.tab.c" break; case 91: /* value: name '[' slice ']' */ #line 419 "camp.y" { (yyval.e) = new sliceExp((yyvsp[-2].pos), new nameExp((yyvsp[-3].n)->getPos(), (yyvsp[-3].n)), (yyvsp[-1].slice)); } -#line 2379 "camp.tab.c" +#line 2365 "camp.tab.c" break; case 92: /* value: value '[' slice ']' */ #line 421 "camp.y" { (yyval.e) = new sliceExp((yyvsp[-2].pos), (yyvsp[-3].e), (yyvsp[-1].slice)); } -#line 2385 "camp.tab.c" +#line 2371 "camp.tab.c" break; case 93: /* value: name '(' ')' */ @@ -2389,7 +2375,7 @@ yyreduce: { (yyval.e) = new callExp((yyvsp[-1].pos), new nameExp((yyvsp[-2].n)->getPos(), (yyvsp[-2].n)), new arglist()); } -#line 2393 "camp.tab.c" +#line 2379 "camp.tab.c" break; case 94: /* value: name '(' arglist ')' */ @@ -2397,301 +2383,301 @@ yyreduce: { (yyval.e) = new callExp((yyvsp[-2].pos), new nameExp((yyvsp[-3].n)->getPos(), (yyvsp[-3].n)), (yyvsp[-1].alist)); } -#line 2401 "camp.tab.c" +#line 2387 "camp.tab.c" break; case 95: /* value: value '(' ')' */ #line 429 "camp.y" { (yyval.e) = new callExp((yyvsp[-1].pos), (yyvsp[-2].e), new arglist()); } -#line 2407 "camp.tab.c" +#line 2393 "camp.tab.c" break; case 96: /* value: value '(' arglist ')' */ #line 431 "camp.y" { (yyval.e) = new callExp((yyvsp[-2].pos), (yyvsp[-3].e), (yyvsp[-1].alist)); } -#line 2413 "camp.tab.c" +#line 2399 "camp.tab.c" break; case 97: /* value: '(' exp ')' */ #line 433 "camp.y" { (yyval.e) = (yyvsp[-1].e); } -#line 2419 "camp.tab.c" +#line 2405 "camp.tab.c" break; case 98: /* value: '(' name ')' */ #line 435 "camp.y" { (yyval.e) = new nameExp((yyvsp[-1].n)->getPos(), (yyvsp[-1].n)); } -#line 2425 "camp.tab.c" +#line 2411 "camp.tab.c" break; case 99: /* value: THIS */ #line 436 "camp.y" { (yyval.e) = new thisExp((yyvsp[0].pos)); } -#line 2431 "camp.tab.c" +#line 2417 "camp.tab.c" break; case 100: /* argument: exp */ #line 440 "camp.y" { (yyval.arg).name = symbol::nullsym; (yyval.arg).val=(yyvsp[0].e); } -#line 2437 "camp.tab.c" +#line 2423 "camp.tab.c" break; case 101: /* argument: ID ASSIGN exp */ #line 441 "camp.y" { (yyval.arg).name = (yyvsp[-2].ps).sym; (yyval.arg).val=(yyvsp[0].e); } -#line 2443 "camp.tab.c" +#line 2429 "camp.tab.c" break; case 102: /* arglist: argument */ #line 445 "camp.y" { (yyval.alist) = new arglist(); (yyval.alist)->add((yyvsp[0].arg)); } -#line 2449 "camp.tab.c" +#line 2435 "camp.tab.c" break; case 103: /* arglist: ELLIPSIS argument */ #line 447 "camp.y" { (yyval.alist) = new arglist(); (yyval.alist)->addRest((yyvsp[0].arg)); } -#line 2455 "camp.tab.c" +#line 2441 "camp.tab.c" break; case 104: /* arglist: arglist ',' argument */ #line 449 "camp.y" { (yyval.alist) = (yyvsp[-2].alist); (yyval.alist)->add((yyvsp[0].arg)); } -#line 2461 "camp.tab.c" +#line 2447 "camp.tab.c" break; case 105: /* arglist: arglist ELLIPSIS argument */ #line 451 "camp.y" { (yyval.alist) = (yyvsp[-2].alist); (yyval.alist)->addRest((yyvsp[0].arg)); } -#line 2467 "camp.tab.c" +#line 2453 "camp.tab.c" break; case 106: /* tuple: exp ',' exp */ #line 456 "camp.y" { (yyval.alist) = new arglist(); (yyval.alist)->add((yyvsp[-2].e)); (yyval.alist)->add((yyvsp[0].e)); } -#line 2473 "camp.tab.c" +#line 2459 "camp.tab.c" break; case 107: /* tuple: tuple ',' exp */ #line 457 "camp.y" { (yyval.alist) = (yyvsp[-2].alist); (yyval.alist)->add((yyvsp[0].e)); } -#line 2479 "camp.tab.c" +#line 2465 "camp.tab.c" break; case 108: /* exp: name */ #line 461 "camp.y" { (yyval.e) = new nameExp((yyvsp[0].n)->getPos(), (yyvsp[0].n)); } -#line 2485 "camp.tab.c" +#line 2471 "camp.tab.c" break; case 109: /* exp: value */ #line 462 "camp.y" { (yyval.e) = (yyvsp[0].e); } -#line 2491 "camp.tab.c" +#line 2477 "camp.tab.c" break; case 110: /* exp: LIT */ #line 463 "camp.y" { (yyval.e) = (yyvsp[0].e); } -#line 2497 "camp.tab.c" +#line 2483 "camp.tab.c" break; case 111: /* exp: STRING */ #line 464 "camp.y" { (yyval.e) = (yyvsp[0].stre); } -#line 2503 "camp.tab.c" +#line 2489 "camp.tab.c" break; case 112: /* exp: LIT exp */ #line 466 "camp.y" { (yyval.e) = new scaleExp((yyvsp[-1].e)->getPos(), (yyvsp[-1].e), (yyvsp[0].e)); } -#line 2509 "camp.tab.c" +#line 2495 "camp.tab.c" break; case 113: /* exp: '(' name ')' exp */ #line 468 "camp.y" { (yyval.e) = new castExp((yyvsp[-2].n)->getPos(), new nameTy((yyvsp[-2].n)), (yyvsp[0].e)); } -#line 2515 "camp.tab.c" +#line 2501 "camp.tab.c" break; case 114: /* exp: '(' name dims ')' exp */ #line 470 "camp.y" { (yyval.e) = new castExp((yyvsp[-3].n)->getPos(), new arrayTy((yyvsp[-3].n), (yyvsp[-2].dim)), (yyvsp[0].e)); } -#line 2521 "camp.tab.c" +#line 2507 "camp.tab.c" break; case 115: /* exp: '+' exp */ #line 472 "camp.y" { (yyval.e) = new unaryExp((yyvsp[-1].ps).pos, (yyvsp[0].e), (yyvsp[-1].ps).sym); } -#line 2527 "camp.tab.c" +#line 2513 "camp.tab.c" break; case 116: /* exp: '-' exp */ #line 474 "camp.y" { (yyval.e) = new unaryExp((yyvsp[-1].ps).pos, (yyvsp[0].e), (yyvsp[-1].ps).sym); } -#line 2533 "camp.tab.c" +#line 2519 "camp.tab.c" break; case 117: /* exp: OPERATOR exp */ #line 475 "camp.y" { (yyval.e) = new unaryExp((yyvsp[-1].ps).pos, (yyvsp[0].e), (yyvsp[-1].ps).sym); } -#line 2539 "camp.tab.c" +#line 2525 "camp.tab.c" break; case 118: /* exp: exp '+' exp */ #line 476 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2545 "camp.tab.c" +#line 2531 "camp.tab.c" break; case 119: /* exp: exp '-' exp */ #line 477 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2551 "camp.tab.c" +#line 2537 "camp.tab.c" break; case 120: /* exp: exp '*' exp */ #line 478 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2557 "camp.tab.c" +#line 2543 "camp.tab.c" break; case 121: /* exp: exp '/' exp */ #line 479 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2563 "camp.tab.c" +#line 2549 "camp.tab.c" break; case 122: /* exp: exp '%' exp */ #line 480 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2569 "camp.tab.c" +#line 2555 "camp.tab.c" break; case 123: /* exp: exp '#' exp */ #line 481 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2575 "camp.tab.c" +#line 2561 "camp.tab.c" break; case 124: /* exp: exp '^' exp */ #line 482 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2581 "camp.tab.c" +#line 2567 "camp.tab.c" break; case 125: /* exp: exp LT exp */ #line 483 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2587 "camp.tab.c" +#line 2573 "camp.tab.c" break; case 126: /* exp: exp LE exp */ #line 484 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2593 "camp.tab.c" +#line 2579 "camp.tab.c" break; case 127: /* exp: exp GT exp */ #line 485 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2599 "camp.tab.c" +#line 2585 "camp.tab.c" break; case 128: /* exp: exp GE exp */ #line 486 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2605 "camp.tab.c" +#line 2591 "camp.tab.c" break; case 129: /* exp: exp EQ exp */ #line 487 "camp.y" { (yyval.e) = new equalityExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2611 "camp.tab.c" +#line 2597 "camp.tab.c" break; case 130: /* exp: exp NEQ exp */ #line 488 "camp.y" { (yyval.e) = new equalityExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2617 "camp.tab.c" +#line 2603 "camp.tab.c" break; case 131: /* exp: exp CAND exp */ #line 489 "camp.y" { (yyval.e) = new andExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2623 "camp.tab.c" +#line 2609 "camp.tab.c" break; case 132: /* exp: exp COR exp */ #line 490 "camp.y" { (yyval.e) = new orExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2629 "camp.tab.c" +#line 2615 "camp.tab.c" break; case 133: /* exp: exp CARETS exp */ #line 491 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2635 "camp.tab.c" +#line 2621 "camp.tab.c" break; case 134: /* exp: exp AMPERSAND exp */ #line 492 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2641 "camp.tab.c" +#line 2627 "camp.tab.c" break; case 135: /* exp: exp BAR exp */ #line 493 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2647 "camp.tab.c" +#line 2633 "camp.tab.c" break; case 136: /* exp: exp OPERATOR exp */ #line 494 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2653 "camp.tab.c" +#line 2639 "camp.tab.c" break; case 137: /* exp: exp INCR exp */ #line 495 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2659 "camp.tab.c" +#line 2645 "camp.tab.c" break; case 138: /* exp: NEW celltype */ #line 497 "camp.y" { (yyval.e) = new newRecordExp((yyvsp[-1].pos), (yyvsp[0].t)); } -#line 2665 "camp.tab.c" +#line 2651 "camp.tab.c" break; case 139: /* exp: NEW celltype dimexps */ #line 499 "camp.y" { (yyval.e) = new newArrayExp((yyvsp[-2].pos), (yyvsp[-1].t), (yyvsp[0].elist), 0, 0); } -#line 2671 "camp.tab.c" +#line 2657 "camp.tab.c" break; case 140: /* exp: NEW celltype dimexps dims */ #line 501 "camp.y" { (yyval.e) = new newArrayExp((yyvsp[-3].pos), (yyvsp[-2].t), (yyvsp[-1].elist), (yyvsp[0].dim), 0); } -#line 2677 "camp.tab.c" +#line 2663 "camp.tab.c" break; case 141: /* exp: NEW celltype dims */ #line 503 "camp.y" { (yyval.e) = new newArrayExp((yyvsp[-2].pos), (yyvsp[-1].t), 0, (yyvsp[0].dim), 0); } -#line 2683 "camp.tab.c" +#line 2669 "camp.tab.c" break; case 142: /* exp: NEW celltype dims arrayinit */ #line 505 "camp.y" { (yyval.e) = new newArrayExp((yyvsp[-3].pos), (yyvsp[-2].t), 0, (yyvsp[-1].dim), (yyvsp[0].ai)); } -#line 2689 "camp.tab.c" +#line 2675 "camp.tab.c" break; case 143: /* exp: NEW celltype '(' ')' blockstm */ #line 507 "camp.y" { (yyval.e) = new newFunctionExp((yyvsp[-4].pos), (yyvsp[-3].t), new formals((yyvsp[-2].pos)), (yyvsp[0].s)); } -#line 2695 "camp.tab.c" +#line 2681 "camp.tab.c" break; case 144: /* exp: NEW celltype dims '(' ')' blockstm */ @@ -2700,13 +2686,13 @@ yyreduce: new arrayTy((yyvsp[-4].t)->getPos(), (yyvsp[-4].t), (yyvsp[-3].dim)), new formals((yyvsp[-2].pos)), (yyvsp[0].s)); } -#line 2704 "camp.tab.c" +#line 2690 "camp.tab.c" break; case 145: /* exp: NEW celltype '(' formals ')' blockstm */ #line 514 "camp.y" { (yyval.e) = new newFunctionExp((yyvsp[-5].pos), (yyvsp[-4].t), (yyvsp[-2].fls), (yyvsp[0].s)); } -#line 2710 "camp.tab.c" +#line 2696 "camp.tab.c" break; case 146: /* exp: NEW celltype dims '(' formals ')' blockstm */ @@ -2715,31 +2701,31 @@ yyreduce: new arrayTy((yyvsp[-5].t)->getPos(), (yyvsp[-5].t), (yyvsp[-4].dim)), (yyvsp[-2].fls), (yyvsp[0].s)); } -#line 2719 "camp.tab.c" +#line 2705 "camp.tab.c" break; case 147: /* exp: exp '?' exp ':' exp */ #line 521 "camp.y" { (yyval.e) = new conditionalExp((yyvsp[-3].pos), (yyvsp[-4].e), (yyvsp[-2].e), (yyvsp[0].e)); } -#line 2725 "camp.tab.c" +#line 2711 "camp.tab.c" break; case 148: /* exp: exp ASSIGN exp */ #line 522 "camp.y" { (yyval.e) = new assignExp((yyvsp[-1].pos), (yyvsp[-2].e), (yyvsp[0].e)); } -#line 2731 "camp.tab.c" +#line 2717 "camp.tab.c" break; case 149: /* exp: '(' tuple ')' */ #line 523 "camp.y" { (yyval.e) = new callExp((yyvsp[-2].pos), new nameExp((yyvsp[-2].pos), SYM_TUPLE), (yyvsp[-1].alist)); } -#line 2737 "camp.tab.c" +#line 2723 "camp.tab.c" break; case 150: /* exp: exp join exp */ #line 525 "camp.y" { (yyvsp[-1].j)->pushFront((yyvsp[-2].e)); (yyvsp[-1].j)->pushBack((yyvsp[0].e)); (yyval.e) = (yyvsp[-1].j); } -#line 2743 "camp.tab.c" +#line 2729 "camp.tab.c" break; case 151: /* exp: exp dir */ @@ -2749,314 +2735,314 @@ yyreduce: new joinExp((yyvsp[0].se)->getPos(), SYM_DOTS); (yyval.e)=jexp; jexp->pushBack((yyvsp[-1].e)); jexp->pushBack((yyvsp[0].se)); } -#line 2753 "camp.tab.c" +#line 2739 "camp.tab.c" break; case 152: /* exp: INCR exp */ #line 533 "camp.y" { (yyval.e) = new prefixExp((yyvsp[-1].ps).pos, (yyvsp[0].e), SYM_PLUS); } -#line 2759 "camp.tab.c" +#line 2745 "camp.tab.c" break; case 153: /* exp: DASHES exp */ #line 535 "camp.y" { (yyval.e) = new prefixExp((yyvsp[-1].ps).pos, (yyvsp[0].e), SYM_MINUS); } -#line 2765 "camp.tab.c" +#line 2751 "camp.tab.c" break; case 154: /* exp: exp INCR */ #line 538 "camp.y" { (yyval.e) = new postfixExp((yyvsp[0].ps).pos, (yyvsp[-1].e), SYM_PLUS); } -#line 2771 "camp.tab.c" +#line 2757 "camp.tab.c" break; case 155: /* exp: exp SELFOP exp */ #line 539 "camp.y" { (yyval.e) = new selfExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); } -#line 2777 "camp.tab.c" +#line 2763 "camp.tab.c" break; case 156: /* exp: QUOTE '{' fileblock '}' */ #line 541 "camp.y" { (yyval.e) = new quoteExp((yyvsp[-3].pos), (yyvsp[-1].b)); } -#line 2783 "camp.tab.c" +#line 2769 "camp.tab.c" break; case 157: /* join: DASHES */ #line 547 "camp.y" { (yyval.j) = new joinExp((yyvsp[0].ps).pos,(yyvsp[0].ps).sym); } -#line 2789 "camp.tab.c" +#line 2775 "camp.tab.c" break; case 158: /* join: basicjoin */ #line 549 "camp.y" { (yyval.j) = (yyvsp[0].j); } -#line 2795 "camp.tab.c" +#line 2781 "camp.tab.c" break; case 159: /* join: dir basicjoin */ #line 551 "camp.y" { (yyvsp[-1].se)->setSide(camp::OUT); (yyval.j) = (yyvsp[0].j); (yyval.j)->pushFront((yyvsp[-1].se)); } -#line 2802 "camp.tab.c" +#line 2788 "camp.tab.c" break; case 160: /* join: basicjoin dir */ #line 554 "camp.y" { (yyvsp[0].se)->setSide(camp::IN); (yyval.j) = (yyvsp[-1].j); (yyval.j)->pushBack((yyvsp[0].se)); } -#line 2809 "camp.tab.c" +#line 2795 "camp.tab.c" break; case 161: /* join: dir basicjoin dir */ #line 557 "camp.y" { (yyvsp[-2].se)->setSide(camp::OUT); (yyvsp[0].se)->setSide(camp::IN); (yyval.j) = (yyvsp[-1].j); (yyval.j)->pushFront((yyvsp[-2].se)); (yyval.j)->pushBack((yyvsp[0].se)); } -#line 2816 "camp.tab.c" +#line 2802 "camp.tab.c" break; case 162: /* dir: '{' CURL exp '}' */ #line 562 "camp.y" { (yyval.se) = new specExp((yyvsp[-2].ps).pos, (yyvsp[-2].ps).sym, (yyvsp[-1].e)); } -#line 2822 "camp.tab.c" +#line 2808 "camp.tab.c" break; case 163: /* dir: '{' exp '}' */ #line 563 "camp.y" { (yyval.se) = new specExp((yyvsp[-2].pos), symbol::opTrans("spec"), (yyvsp[-1].e)); } -#line 2828 "camp.tab.c" +#line 2814 "camp.tab.c" break; case 164: /* dir: '{' exp ',' exp '}' */ #line 565 "camp.y" { (yyval.se) = new specExp((yyvsp[-4].pos), symbol::opTrans("spec"), new pairExp((yyvsp[-2].pos), (yyvsp[-3].e), (yyvsp[-1].e))); } -#line 2835 "camp.tab.c" +#line 2821 "camp.tab.c" break; case 165: /* dir: '{' exp ',' exp ',' exp '}' */ #line 568 "camp.y" { (yyval.se) = new specExp((yyvsp[-6].pos), symbol::opTrans("spec"), new tripleExp((yyvsp[-4].pos), (yyvsp[-5].e), (yyvsp[-3].e), (yyvsp[-1].e))); } -#line 2842 "camp.tab.c" +#line 2828 "camp.tab.c" break; case 166: /* basicjoin: DOTS */ #line 573 "camp.y" { (yyval.j) = new joinExp((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); } -#line 2848 "camp.tab.c" +#line 2834 "camp.tab.c" break; case 167: /* basicjoin: DOTS tension DOTS */ #line 575 "camp.y" { (yyval.j) = new joinExp((yyvsp[-2].ps).pos, (yyvsp[-2].ps).sym); (yyval.j)->pushBack((yyvsp[-1].e)); } -#line 2854 "camp.tab.c" +#line 2840 "camp.tab.c" break; case 168: /* basicjoin: DOTS controls DOTS */ #line 577 "camp.y" { (yyval.j) = new joinExp((yyvsp[-2].ps).pos, (yyvsp[-2].ps).sym); (yyval.j)->pushBack((yyvsp[-1].e)); } -#line 2860 "camp.tab.c" +#line 2846 "camp.tab.c" break; case 169: /* basicjoin: COLONS */ #line 578 "camp.y" { (yyval.j) = new joinExp((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); } -#line 2866 "camp.tab.c" +#line 2852 "camp.tab.c" break; case 170: /* basicjoin: LONGDASH */ #line 579 "camp.y" { (yyval.j) = new joinExp((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); } -#line 2872 "camp.tab.c" +#line 2858 "camp.tab.c" break; case 171: /* tension: TENSION exp */ #line 583 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[0].e), (yyvsp[-1].ps).sym, new booleanExp((yyvsp[-1].ps).pos, false)); } -#line 2879 "camp.tab.c" +#line 2865 "camp.tab.c" break; case 172: /* tension: TENSION exp AND exp */ #line 586 "camp.y" { (yyval.e) = new ternaryExp((yyvsp[-3].ps).pos, (yyvsp[-2].e), (yyvsp[-3].ps).sym, (yyvsp[0].e), new booleanExp((yyvsp[-3].ps).pos, false)); } -#line 2886 "camp.tab.c" +#line 2872 "camp.tab.c" break; case 173: /* tension: TENSION ATLEAST exp */ #line 589 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-2].ps).pos, (yyvsp[0].e), (yyvsp[-2].ps).sym, new booleanExp((yyvsp[-1].ps).pos, true)); } -#line 2893 "camp.tab.c" +#line 2879 "camp.tab.c" break; case 174: /* tension: TENSION ATLEAST exp AND exp */ #line 592 "camp.y" { (yyval.e) = new ternaryExp((yyvsp[-4].ps).pos, (yyvsp[-2].e), (yyvsp[-4].ps).sym, (yyvsp[0].e), new booleanExp((yyvsp[-3].ps).pos, true)); } -#line 2900 "camp.tab.c" +#line 2886 "camp.tab.c" break; case 175: /* controls: CONTROLS exp */ #line 597 "camp.y" { (yyval.e) = new unaryExp((yyvsp[-1].ps).pos, (yyvsp[0].e), (yyvsp[-1].ps).sym); } -#line 2906 "camp.tab.c" +#line 2892 "camp.tab.c" break; case 176: /* controls: CONTROLS exp AND exp */ #line 599 "camp.y" { (yyval.e) = new binaryExp((yyvsp[-3].ps).pos, (yyvsp[-2].e), (yyvsp[-3].ps).sym, (yyvsp[0].e)); } -#line 2912 "camp.tab.c" +#line 2898 "camp.tab.c" break; case 177: /* stm: ';' */ #line 603 "camp.y" { (yyval.s) = new emptyStm((yyvsp[0].pos)); } -#line 2918 "camp.tab.c" +#line 2904 "camp.tab.c" break; case 178: /* stm: blockstm */ #line 604 "camp.y" { (yyval.s) = (yyvsp[0].s); } -#line 2924 "camp.tab.c" +#line 2910 "camp.tab.c" break; case 179: /* stm: stmexp ';' */ #line 605 "camp.y" { (yyval.s) = (yyvsp[-1].s); } -#line 2930 "camp.tab.c" +#line 2916 "camp.tab.c" break; case 180: /* stm: IF '(' exp ')' stm */ #line 607 "camp.y" { (yyval.s) = new ifStm((yyvsp[-4].pos), (yyvsp[-2].e), (yyvsp[0].s)); } -#line 2936 "camp.tab.c" +#line 2922 "camp.tab.c" break; case 181: /* stm: IF '(' exp ')' stm ELSE stm */ #line 609 "camp.y" { (yyval.s) = new ifStm((yyvsp[-6].pos), (yyvsp[-4].e), (yyvsp[-2].s), (yyvsp[0].s)); } -#line 2942 "camp.tab.c" +#line 2928 "camp.tab.c" break; case 182: /* stm: WHILE '(' exp ')' stm */ #line 611 "camp.y" { (yyval.s) = new whileStm((yyvsp[-4].pos), (yyvsp[-2].e), (yyvsp[0].s)); } -#line 2948 "camp.tab.c" +#line 2934 "camp.tab.c" break; case 183: /* stm: DO stm WHILE '(' exp ')' ';' */ #line 613 "camp.y" { (yyval.s) = new doStm((yyvsp[-6].pos), (yyvsp[-5].s), (yyvsp[-2].e)); } -#line 2954 "camp.tab.c" +#line 2940 "camp.tab.c" break; case 184: /* stm: FOR '(' forinit ';' fortest ';' forupdate ')' stm */ #line 615 "camp.y" { (yyval.s) = new forStm((yyvsp[-8].pos), (yyvsp[-6].run), (yyvsp[-4].e), (yyvsp[-2].sel), (yyvsp[0].s)); } -#line 2960 "camp.tab.c" +#line 2946 "camp.tab.c" break; case 185: /* stm: FOR '(' type ID ':' exp ')' stm */ #line 617 "camp.y" { (yyval.s) = new extendedForStm((yyvsp[-7].pos), (yyvsp[-5].t), (yyvsp[-4].ps).sym, (yyvsp[-2].e), (yyvsp[0].s)); } -#line 2966 "camp.tab.c" +#line 2952 "camp.tab.c" break; case 186: /* stm: BREAK ';' */ #line 618 "camp.y" { (yyval.s) = new breakStm((yyvsp[-1].pos)); } -#line 2972 "camp.tab.c" +#line 2958 "camp.tab.c" break; case 187: /* stm: CONTINUE ';' */ #line 619 "camp.y" { (yyval.s) = new continueStm((yyvsp[-1].pos)); } -#line 2978 "camp.tab.c" +#line 2964 "camp.tab.c" break; case 188: /* stm: RETURN_ ';' */ #line 620 "camp.y" { (yyval.s) = new returnStm((yyvsp[-1].pos)); } -#line 2984 "camp.tab.c" +#line 2970 "camp.tab.c" break; case 189: /* stm: RETURN_ exp ';' */ #line 621 "camp.y" { (yyval.s) = new returnStm((yyvsp[-2].pos), (yyvsp[-1].e)); } -#line 2990 "camp.tab.c" +#line 2976 "camp.tab.c" break; case 190: /* stmexp: exp */ #line 625 "camp.y" { (yyval.s) = new expStm((yyvsp[0].e)->getPos(), (yyvsp[0].e)); } -#line 2996 "camp.tab.c" +#line 2982 "camp.tab.c" break; case 191: /* blockstm: block */ #line 629 "camp.y" { (yyval.s) = new blockStm((yyvsp[0].b)->getPos(), (yyvsp[0].b)); } -#line 3002 "camp.tab.c" +#line 2988 "camp.tab.c" break; case 192: /* forinit: %empty */ #line 633 "camp.y" { (yyval.run) = 0; } -#line 3008 "camp.tab.c" +#line 2994 "camp.tab.c" break; case 193: /* forinit: stmexplist */ #line 634 "camp.y" { (yyval.run) = (yyvsp[0].sel); } -#line 3014 "camp.tab.c" +#line 3000 "camp.tab.c" break; case 194: /* forinit: barevardec */ #line 635 "camp.y" { (yyval.run) = (yyvsp[0].vd); } -#line 3020 "camp.tab.c" +#line 3006 "camp.tab.c" break; case 195: /* fortest: %empty */ #line 639 "camp.y" { (yyval.e) = 0; } -#line 3026 "camp.tab.c" +#line 3012 "camp.tab.c" break; case 196: /* fortest: exp */ #line 640 "camp.y" { (yyval.e) = (yyvsp[0].e); } -#line 3032 "camp.tab.c" +#line 3018 "camp.tab.c" break; case 197: /* forupdate: %empty */ #line 644 "camp.y" { (yyval.sel) = 0; } -#line 3038 "camp.tab.c" +#line 3024 "camp.tab.c" break; case 198: /* forupdate: stmexplist */ #line 645 "camp.y" { (yyval.sel) = (yyvsp[0].sel); } -#line 3044 "camp.tab.c" +#line 3030 "camp.tab.c" break; case 199: /* stmexplist: stmexp */ #line 649 "camp.y" { (yyval.sel) = new stmExpList((yyvsp[0].s)->getPos()); (yyval.sel)->add((yyvsp[0].s)); } -#line 3050 "camp.tab.c" +#line 3036 "camp.tab.c" break; case 200: /* stmexplist: stmexplist ',' stmexp */ #line 651 "camp.y" { (yyval.sel) = (yyvsp[-2].sel); (yyval.sel)->add((yyvsp[0].s)); } -#line 3056 "camp.tab.c" +#line 3042 "camp.tab.c" break; -#line 3060 "camp.tab.c" +#line 3046 "camp.tab.c" default: break; } @@ -3138,6 +3124,7 @@ yyerrorlab: label yyerrorlab therefore never appears in user code. */ if (0) YYERROR; + ++yynerrs; /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ @@ -3198,7 +3185,7 @@ yyerrlab1: `-------------------------------------*/ yyacceptlab: yyresult = 0; - goto yyreturn; + goto yyreturnlab; /*-----------------------------------. @@ -3206,24 +3193,22 @@ yyacceptlab: `-----------------------------------*/ yyabortlab: yyresult = 1; - goto yyreturn; + goto yyreturnlab; -#if !defined yyoverflow -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ +/*-----------------------------------------------------------. +| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here. | +`-----------------------------------------------------------*/ yyexhaustedlab: yyerror (YY_("memory exhausted")); yyresult = 2; - goto yyreturn; -#endif + goto yyreturnlab; -/*-------------------------------------------------------. -| yyreturn -- parsing is finished, clean up and return. | -`-------------------------------------------------------*/ -yyreturn: +/*----------------------------------------------------------. +| yyreturnlab -- parsing is finished, clean up and return. | +`----------------------------------------------------------*/ +yyreturnlab: if (yychar != YYEMPTY) { /* Make sure we have latest lookahead translation. See comments at diff --git a/graphics/asymptote/camp.tab.h b/graphics/asymptote/camp.tab.h index 6ba33e85fb..48d41824e8 100644 --- a/graphics/asymptote/camp.tab.h +++ b/graphics/asymptote/camp.tab.h @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 3.7.6. */ +/* A Bison parser, made by GNU Bison 3.8.2. */ /* Bison interface for Yacc-like parsers in C @@ -175,6 +175,8 @@ typedef union YYSTYPE YYSTYPE; extern YYSTYPE yylval; + int yyparse (void); + #endif /* !YY_YY_CAMP_TAB_H_INCLUDED */ diff --git a/graphics/asymptote/config.h.in b/graphics/asymptote/config.h.in index 891681e848..aadf8dbe14 100644 --- a/graphics/asymptote/config.h.in +++ b/graphics/asymptote/config.h.in @@ -114,9 +114,6 @@ /* Define to 1 if you have Language server protocol. */ #undef HAVE_LSP -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - /* Define to 1 if you have the `memrchr' function. */ #undef HAVE_MEMRCHR @@ -153,6 +150,9 @@ /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the <stdio.h> header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H @@ -229,7 +229,9 @@ your system. */ #undef PTHREAD_CREATE_JOINABLE -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most @@ -260,7 +262,7 @@ #undef inline #endif -/* Define to `int' if <sys/types.h> does not define. */ +/* Define as a signed integer type capable of holding a process identifier. */ #undef pid_t /* Define to `unsigned int' if <sys/types.h> does not define. */ diff --git a/graphics/asymptote/configure b/graphics/asymptote/configure index 155644a558..abfd8b5c01 100755 --- a/graphics/asymptote/configure +++ b/graphics/asymptote/configure @@ -1,11 +1,12 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Asymptote 2.83. +# Generated by GNU Autoconf 2.71 for Asymptote 2.84. # # Report bugs to <https://github.com/vectorgraphics/asymptote/issues>. # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -16,14 +17,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -33,46 +36,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi +if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -81,13 +84,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -96,8 +92,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -109,30 +109,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -154,20 +134,22 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else +else \$as_nop case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -187,42 +169,52 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : -else +else \$as_nop exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" + if (eval "$as_required") 2>/dev/null +then : as_have_required=yes -else +else $as_nop as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : -else +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : break 2 fi fi @@ -230,14 +222,21 @@ fi esac as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi +fi - if test "x$CONFIG_SHELL" != x; then : + if test "x$CONFIG_SHELL" != x +then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -255,18 +254,19 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and $0: https://github.com/vectorgraphics/asymptote/issues $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or @@ -295,6 +295,7 @@ as_fn_unset () } as_unset=as_fn_unset + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -312,6 +313,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -326,7 +335,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -335,7 +344,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -374,12 +383,13 @@ as_fn_executable_p () # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -391,18 +401,27 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -414,9 +433,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -443,7 +462,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -487,7 +506,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -501,6 +520,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -514,6 +537,13 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -581,48 +611,46 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Asymptote' PACKAGE_TARNAME='asymptote' -PACKAGE_VERSION='2.83' -PACKAGE_STRING='Asymptote 2.83' +PACKAGE_VERSION='2.84' +PACKAGE_STRING='Asymptote 2.84' PACKAGE_BUGREPORT='https://github.com/vectorgraphics/asymptote/issues' PACKAGE_URL='' # Factoring default headers for most tests. ac_includes_default="\ -#include <stdio.h> -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> +#include <stddef.h> +#ifdef HAVE_STDIO_H +# include <stdio.h> #endif -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include <stdlib.h> -# include <stddef.h> -#else -# ifdef HAVE_STDLIB_H -# include <stdlib.h> -# endif #endif #ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include <memory.h> -# endif # include <string.h> #endif -#ifdef HAVE_STRINGS_H -# include <strings.h> -#endif #ifdef HAVE_INTTYPES_H # include <inttypes.h> #endif #ifdef HAVE_STDINT_H # include <stdint.h> #endif +#ifdef HAVE_STRINGS_H +# include <strings.h> +#endif +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif" +ac_header_c_list= ac_unique_file="absyn.cc" +ac_header_cxx_list= +ac_func_cxx_list= ac_subst_vars='LTLIBOBJS LIBOBJS PTHREAD_CFLAGS @@ -641,9 +669,8 @@ ATOMICVERSION ASYGLVERSION GCVERSION getopt -CXXCPP -YFLAGS -YACC +FLEX +BISON SET_MAKE INSTALL_DATA INSTALL_SCRIPT @@ -667,9 +694,6 @@ build_os build_vendor build_cpu build -EGREP -GREP -CPP OBJEXT EXEEXT ac_ct_CC @@ -748,13 +772,11 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP CXX CXXFLAGS CCC -YACC -YFLAGS -CXXCPP' +BISON +FLEX' # Initialize some variables set by options. @@ -823,8 +845,6 @@ do *) ac_optarg=yes ;; esac - # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -865,9 +885,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -891,9 +911,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1104,9 +1124,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1120,9 +1140,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1166,9 +1186,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1184,7 +1204,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1248,7 +1268,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1305,7 +1325,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Asymptote 2.83 to adapt to many kinds of systems. +\`configure' configures Asymptote 2.84 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1371,7 +1391,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Asymptote 2.83:";; + short | recursive ) echo "Configuration of Asymptote 2.84:";; esac cat <<\_ACEOF @@ -1414,16 +1434,10 @@ Some influential environment variables: LIBS libraries to pass to the linker, e.g. -l<library> CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> - CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags - YACC The `Yet Another Compiler Compiler' implementation to use. - Defaults to the first program found out of: `bison -y', `byacc', - `yacc'. - YFLAGS The list of arguments that will be passed by default to $YACC. - This script will default YFLAGS to the empty string to avoid a - default value of `-d' given by some make applications. - CXXCPP C++ preprocessor + BISON bison command + FLEX flex command Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1444,9 +1458,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1474,7 +1488,8 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -1482,7 +1497,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1491,10 +1506,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Asymptote configure 2.83 -generated by GNU Autoconf 2.69 +Asymptote configure 2.84 +generated by GNU Autoconf 2.71 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1511,14 +1526,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1526,14 +1541,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1545,8 +1561,8 @@ fi # ac_fn_c_try_run LINENO # ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. +# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that +# executables *can* be run. ac_fn_c_try_run () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack @@ -1556,25 +1572,26 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then : ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: program exited with status $ac_status" >&5 + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status @@ -1585,43 +1602,6 @@ fi } # ac_fn_c_try_run -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists and can be compiled using the include files in @@ -1629,26 +1609,28 @@ fi ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1659,14 +1641,14 @@ $as_echo "$ac_res" >&6; } ac_fn_cxx_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1674,14 +1656,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1697,14 +1680,14 @@ fi ac_fn_cxx_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext + rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1712,17 +1695,18 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1737,133 +1721,38 @@ fi } # ac_fn_cxx_try_link -# ac_fn_cxx_try_cpp LINENO -# ------------------------ -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_cpp - -# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES +# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES # --------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_cxx_check_header_mongrel () +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_cxx_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no +if ac_fn_cxx_try_compile "$LINENO" +then : + eval "$3=yes" +else $as_nop + eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ----------------------------------------------------------------- ## -## Report this to https://github.com/vectorgraphics/asymptote/issues ## -## ----------------------------------------------------------------- ##" - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -} # ac_fn_cxx_check_header_mongrel +} # ac_fn_cxx_check_header_compile # ac_fn_cxx_check_func LINENO FUNC VAR # ------------------------------------ @@ -1871,11 +1760,12 @@ fi ac_fn_cxx_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case <limits.h> declares $2. @@ -1883,16 +1773,9 @@ else #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif + which can conflict with char $2 (); below. */ +#include <limits.h> #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -1910,24 +1793,25 @@ choke me #endif int -main () +main (void) { return $2 (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_cxx_check_func @@ -1938,14 +1822,14 @@ $as_echo "$ac_res" >&6; } ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext + rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1953,17 +1837,18 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1985,17 +1870,18 @@ fi ac_fn_cxx_check_type () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof ($2)) return 0; @@ -2003,12 +1889,13 @@ if (sizeof ($2)) return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof (($2))) return 0; @@ -2016,26 +1903,27 @@ if (sizeof (($2))) return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : -else +else $as_nop eval "$3=yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_cxx_check_type # ac_fn_cxx_try_run LINENO # ------------------------ -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. +# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that +# executables *can* be run. ac_fn_cxx_try_run () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack @@ -2045,25 +1933,26 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then : ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: program exited with status $ac_status" >&5 + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status @@ -2073,14 +1962,34 @@ fi as_fn_set_status $ac_retval } # ac_fn_cxx_try_run +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done + +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +esac + cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Asymptote $as_me 2.83, which was -generated by GNU Autoconf 2.69. Invocation command line was +It was created by Asymptote $as_me 2.84, which was +generated by GNU Autoconf 2.71. Invocation command line was - $ $0 $@ + $ $0$ac_configure_args_raw _ACEOF exec 5>>config.log @@ -2113,8 +2022,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS @@ -2149,7 +2062,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -2184,11 +2097,13 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - $as_echo "## ---------------- ## + printf "%s\n" "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -2199,8 +2114,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -2224,7 +2139,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -2232,14 +2147,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + printf "%s\n" "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -2247,15 +2162,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - $as_echo "## ----------- ## + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -2263,8 +2178,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -2278,63 +2193,48 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -$as_echo "/* confdefs.h */" > confdefs.h +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" + +for ac_site_file in $ac_site_files do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -2344,19 +2244,653 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif + +#include <stddef.h> +#include <stdarg.h> +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) '\''x'\'' +int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), + int, int);' + +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' + +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +// Does the compiler advertise C99 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif + +#include <stdbool.h> +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + #error "your preprocessor is broken" +#endif +#if BIG_OK +#else + #error "your preprocessor is broken" +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case '\''s'\'': // string + str = va_arg (args_copy, const char *); + break; + case '\''d'\'': // int + number = va_arg (args_copy, int); + break; + case '\''f'\'': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +' + +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' + // Check bool. + _Bool success = false; + success |= (argc != 0); + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' + +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +// Does the compiler advertise C11 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif + +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' + +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" + +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +# Test code for whether the C++ compiler supports C++98 (global declarations) +ac_cxx_conftest_cxx98_globals=' +// Does the compiler advertise C++98 conformance? +#if !defined __cplusplus || __cplusplus < 199711L +# error "Compiler does not advertise C++98 conformance" +#endif + +// These inclusions are to reject old compilers that +// lack the unsuffixed header files. +#include <cstdlib> +#include <exception> + +// <cassert> and <cstring> are *not* freestanding headers in C++98. +extern void assert (int); +namespace std { + extern int strcmp (const char *, const char *); +} + +// Namespaces, exceptions, and templates were all added after "C++ 2.0". +using std::exception; +using std::strcmp; + +namespace { + +void test_exception_syntax() +{ + try { + throw "test"; + } catch (const char *s) { + // Extra parentheses suppress a warning when building autoconf itself, + // due to lint rules shared with more typical C programs. + assert (!(strcmp) (s, "test")); + } +} + +template <typename T> struct test_template +{ + T const val; + explicit test_template(T t) : val(t) {} + template <typename U> T add(U u) { return static_cast<T>(u) + val; } +}; + +} // anonymous namespace +' + +# Test code for whether the C++ compiler supports C++98 (body of main) +ac_cxx_conftest_cxx98_main=' + assert (argc); + assert (! argv[0]); +{ + test_exception_syntax (); + test_template<double> tt (2.0); + assert (tt.add (4) == 6.0); + assert (true && !false); +} +' + +# Test code for whether the C++ compiler supports C++11 (global declarations) +ac_cxx_conftest_cxx11_globals=' +// Does the compiler advertise C++ 2011 conformance? +#if !defined __cplusplus || __cplusplus < 201103L +# error "Compiler does not advertise C++11 conformance" +#endif + +namespace cxx11test +{ + constexpr int get_val() { return 20; } + + struct testinit + { + int i; + double d; + }; + + class delegate + { + public: + delegate(int n) : n(n) {} + delegate(): delegate(2354) {} + + virtual int getval() { return this->n; }; + protected: + int n; + }; + + class overridden : public delegate + { + public: + overridden(int n): delegate(n) {} + virtual int getval() override final { return this->n * 2; } + }; + + class nocopy + { + public: + nocopy(int i): i(i) {} + nocopy() = default; + nocopy(const nocopy&) = delete; + nocopy & operator=(const nocopy&) = delete; + private: + int i; + }; + + // for testing lambda expressions + template <typename Ret, typename Fn> Ret eval(Fn f, Ret v) + { + return f(v); + } + + // for testing variadic templates and trailing return types + template <typename V> auto sum(V first) -> V + { + return first; + } + template <typename V, typename... Args> auto sum(V first, Args... rest) -> V + { + return first + sum(rest...); + } +} +' + +# Test code for whether the C++ compiler supports C++11 (body of main) +ac_cxx_conftest_cxx11_main=' +{ + // Test auto and decltype + auto a1 = 6538; + auto a2 = 48573953.4; + auto a3 = "String literal"; + + int total = 0; + for (auto i = a3; *i; ++i) { total += *i; } + + decltype(a2) a4 = 34895.034; +} +{ + // Test constexpr + short sa[cxx11test::get_val()] = { 0 }; +} +{ + // Test initializer lists + cxx11test::testinit il = { 4323, 435234.23544 }; +} +{ + // Test range-based for + int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, + 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; + for (auto &x : array) { x += 23; } +} +{ + // Test lambda expressions + using cxx11test::eval; + assert (eval ([](int x) { return x*2; }, 21) == 42); + double d = 2.0; + assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0); + assert (d == 5.0); + assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0); + assert (d == 5.0); +} +{ + // Test use of variadic templates + using cxx11test::sum; + auto a = sum(1); + auto b = sum(1, 2); + auto c = sum(1.0, 2.0, 3.0); +} +{ + // Test constructor delegation + cxx11test::delegate d1; + cxx11test::delegate d2(); + cxx11test::delegate d3(45); +} +{ + // Test override and final + cxx11test::overridden o1(55464); +} +{ + // Test nullptr + char *c = nullptr; +} +{ + // Test template brackets + test_template<::test_template<int>> v(test_template<int>(12)); +} +{ + // Unicode literals + char const *utf8 = u8"UTF-8 string \u2500"; + char16_t const *utf16 = u"UTF-8 string \u2500"; + char32_t const *utf32 = U"UTF-32 string \u2500"; +} +' + +# Test code for whether the C compiler supports C++11 (complete). +ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals} +${ac_cxx_conftest_cxx11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_cxx_conftest_cxx98_main} + ${ac_cxx_conftest_cxx11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C++98 (complete). +ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals} +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_cxx_conftest_cxx98_main} + return ok; +} +" + +as_fn_append ac_header_cxx_list " vfork.h vfork_h HAVE_VFORK_H" +as_fn_append ac_func_cxx_list " fork HAVE_FORK" +as_fn_append ac_func_cxx_list " vfork HAVE_VFORK" + +# Auxiliary files required by this configure script. +ac_aux_files="install-sh config.guess config.sub" + +# Locations in which to look for auxiliary files. +ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." + +# Search for a directory containing all of the required auxiliary files, +# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. +# If we don't find one directory that contains all the files we need, +# we report the set of missing files from the *first* directory in +# $ac_aux_dir_candidates and give up. +ac_missing_aux_files="" +ac_first_candidate=: +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" + break + fi + ac_first_candidate=false + + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +fi + + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +if test -f "${ac_aux_dir}config.guess"; then + ac_config_guess="$SHELL ${ac_aux_dir}config.guess" +fi +if test -f "${ac_aux_dir}config.sub"; then + ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_configure="$SHELL ${ac_aux_dir}configure" +fi + # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2367,12 +2901,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2381,24 +2915,24 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -2408,11 +2942,12 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2513,10 +3048,11 @@ VERSION=$PACKAGE_VERSION #serial 18 -# This is what autoupdate's m4 run will expand. It fires -# the warning (with _au_warn_XXX), outputs it into the -# updated configure.ac (with AC_DIAGNOSE), and then outputs -# the replacement expansion. +# This is what autoupdate's m4 run will expand. It fires the warning +# (with _au_warn_XXX), outputs it into the updated configure.ac (with +# m4_warn), and then outputs the replacement expansion. We need extra +# quotation around the m4_warn and dnl so they will be written +# unexpanded into the updated configure.ac. # This is an auxiliary macro that is also run when @@ -2527,10 +3063,20 @@ VERSION=$PACKAGE_VERSION # Finally, this is the expansion that is picked up by -# autoconf. It tells the user to run autoupdate, and -# then outputs the replacement expansion. We do not care -# about autoupdate's warning because that contains -# information on what to do *after* running autoupdate. +# autoconf, causing NAME to expand to NEW-CODE, plus +# (if SILENT is not "silent") a m4_warning telling the +# maintainer to run autoupdate. We don't issue MESSAGE +# from autoconf, because that's instructions for what +# to do *after* running autoupdate. + + + + + + + + + @@ -2542,11 +3088,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2554,11 +3101,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2569,11 +3120,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2582,11 +3133,12 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -2594,11 +3146,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2609,11 +3165,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2621,8 +3177,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2635,11 +3191,12 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2647,11 +3204,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2662,11 +3223,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2675,11 +3236,12 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2688,15 +3250,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2712,18 +3278,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2734,11 +3300,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2746,11 +3313,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2761,11 +3332,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2778,11 +3349,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -2790,11 +3362,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2805,11 +3381,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2821,34 +3397,138 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC fi +else + CC="$ac_cv_prog_CC" fi fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2858,7 +3538,7 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -2866,7 +3546,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -2878,9 +3558,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -2901,11 +3581,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -2922,7 +3603,7 @@ do # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -2938,44 +3619,46 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else +else $as_nop ac_file='' fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -2989,15 +3672,15 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -3006,7 +3689,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> int -main () +main (void) { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -3018,8 +3701,8 @@ _ACEOF ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -3027,10 +3710,10 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -3038,39 +3721,40 @@ $as_echo "$ac_try_echo"; } >&5 *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details" "$LINENO" 5; } fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -3084,11 +3768,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3097,31 +3782,32 @@ $as_echo "$ac_try_echo"; } >&5 break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -3131,29 +3817,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -3162,57 +3852,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else +else $as_nop CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -3227,232 +3920,144 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <stdarg.h> -#include <stdio.h> -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +$ac_c_conftest_c11_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -std=gnu11 do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error +$ac_c_conftest_c99_program _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC fi -rm -f conftest.err conftest.i conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <ac_nonexistent.h> +$ac_c_conftest_c89_program _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c89=$ac_arg fi -rm -f conftest.err conftest.i conftest.$ac_ext - +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c89" != "xno" && break done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break +rm -f conftest.$ac_ext +CC=$ac_save_CC fi - done - ac_cv_prog_CPP=$CPP - +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ac_nonexistent.h> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -3462,270 +4067,41 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +ac_header= ac_cache= +for ac_item in $ac_header_c_list do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <float.h> - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <string.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : +done -else - ac_cv_header_stdc=no -fi -rm -f conftest* -fi -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ctype.h> -#include <stdlib.h> -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then -$as_echo "#define STDC_HEADERS 1" >>confdefs.h -fi +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h fi - -done - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -$as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if ${ac_cv_c_bigendian+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +printf %s "checking whether byte ordering is bigendian... " >&6; } +if test ${ac_cv_c_bigendian+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_c_bigendian=unknown # See if we're dealing with a universal compiler. cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3736,7 +4112,8 @@ else typedef int dummy; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : # Check for potential -arch flags. It is not universal unless # there are at least two -arch flags with different values. @@ -3760,7 +4137,7 @@ if ac_fn_c_try_compile "$LINENO"; then : fi done fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then # See if sys/param.h defines the BYTE_ORDER macro. cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3769,7 +4146,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext #include <sys/param.h> int -main () +main (void) { #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ @@ -3781,7 +4158,8 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : # It does; now see whether it defined to BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3789,7 +4167,7 @@ if ac_fn_c_try_compile "$LINENO"; then : #include <sys/param.h> int -main () +main (void) { #if BYTE_ORDER != BIG_ENDIAN not big endian @@ -3799,14 +4177,15 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_bigendian=yes -else +else $as_nop ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). @@ -3815,7 +4194,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext #include <limits.h> int -main () +main (void) { #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) bogus endian macros @@ -3825,14 +4204,15 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : # It does; now see whether it defined to _BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <limits.h> int -main () +main (void) { #ifndef _BIG_ENDIAN not big endian @@ -3842,31 +4222,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_bigendian=yes -else +else $as_nop ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # Compile a test program. - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : # Try to guess by grepping values from an object file. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -short int ascii_mm[] = +unsigned short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; - short int ascii_ii[] = + unsigned short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; int use_ascii (int i) { return ascii_mm[i] + ascii_ii[i]; } - short int ebcdic_ii[] = + unsigned short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; - short int ebcdic_mm[] = + unsigned short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; int use_ebcdic (int i) { return ebcdic_mm[i] + ebcdic_ii[i]; @@ -3874,14 +4256,15 @@ short int ascii_mm[] = extern int foo; int -main () +main (void) { return use_ascii (foo) == use_ebcdic (foo); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi @@ -3894,13 +4277,13 @@ if ac_fn_c_try_compile "$LINENO"; then : fi fi fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int -main () +main (void) { /* Are we little or big endian? From Harbison&Steele. */ @@ -3916,9 +4299,10 @@ main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : ac_cv_c_bigendian=no -else +else $as_nop ac_cv_c_bigendian=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -3927,17 +4311,17 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 -$as_echo "$ac_cv_c_bigendian" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +printf "%s\n" "$ac_cv_c_bigendian" >&6; } case $ac_cv_c_bigendian in #( yes) - $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h + printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h ;; #( no) ;; #( universal) -$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h +printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) @@ -3945,55 +4329,30 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + # Make sure we can run config.sub. +$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +printf %s "checking build system type... " >&6; } +if test ${ac_cv_build+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 +ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -4012,21 +4371,22 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +printf %s "checking host system type... " >&6; } +if test ${ac_cv_host+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -4053,7 +4413,8 @@ test "$Datadir" = '${prefix}/share' && Datadir=$prefix/share # Check whether --enable-lsp was given. -if test "${enable_lsp+set}" = set; then : +if test ${enable_lsp+y} +then : enableval=$enable_lsp; fi @@ -4061,8 +4422,8 @@ if test "x$enable_lsp" != "xno"; then cxxstd="c++14" else cxxstd="c++11" -{ $as_echo "$as_me:${as_lineno-$LINENO}: *** Language Server Protocol disabled by configure flag ***" >&5 -$as_echo "$as_me: *** Language Server Protocol disabled by configure flag ***" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Language Server Protocol disabled by configure flag ***" >&5 +printf "%s\n" "$as_me: *** Language Server Protocol disabled by configure flag ***" >&6;} fi test "$CXXFLAGS" || CXXFLAGS="-std=$cxxstd" @@ -4072,20 +4433,22 @@ test "$CFLAGS" || CFLAGS="-g -O3" # Check whether --with-latex was given. -if test "${with_latex+set}" = set; then : +if test ${with_latex+y} +then : withval=$with_latex; if test "x$withval" != "x" ; then latexdir=$withval fi -else +else $as_nop # Extract the first word of "kpsewhich", so it can be a program name with args. set dummy kpsewhich; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_kpsewhich+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_kpsewhich+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$kpsewhich"; then ac_cv_prog_kpsewhich="$kpsewhich" # Let the user override the test. else @@ -4093,11 +4456,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_kpsewhich="true" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4108,11 +4475,11 @@ fi fi kpsewhich=$ac_cv_prog_kpsewhich if test -n "$kpsewhich"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpsewhich" >&5 -$as_echo "$kpsewhich" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpsewhich" >&5 +printf "%s\n" "$kpsewhich" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4120,12 +4487,13 @@ if test "x$kpsewhich" = "xtrue"; then latexdir=`kpsewhich -expand-var='$TEXMFLOCAL'/tex/latex` else latexdir=$prefix/share/texmf/tex/latex - as_ac_File=`$as_echo "ac_cv_file_$latexdir/base/latex.ltx" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $latexdir/base/latex.ltx" >&5 -$as_echo_n "checking for $latexdir/base/latex.ltx... " >&6; } -if eval \${$as_ac_File+:} false; then : - $as_echo_n "(cached) " >&6 -else + as_ac_File=`printf "%s\n" "ac_cv_file_$latexdir/base/latex.ltx" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $latexdir/base/latex.ltx" >&5 +printf %s "checking for $latexdir/base/latex.ltx... " >&6; } +if eval test \${$as_ac_File+y} +then : + printf %s "(cached) " >&6 +else $as_nop test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "$latexdir/base/latex.ltx"; then @@ -4135,18 +4503,20 @@ else fi fi eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_File"\" = x"yes"; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_File"\" = x"yes" +then : -else +else $as_nop latexdir=/usr/share/texmf/tex/latex - as_ac_File=`$as_echo "ac_cv_file_$latexdir/base/latex.ltx" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $latexdir/base/latex.ltx" >&5 -$as_echo_n "checking for $latexdir/base/latex.ltx... " >&6; } -if eval \${$as_ac_File+:} false; then : - $as_echo_n "(cached) " >&6 -else + as_ac_File=`printf "%s\n" "ac_cv_file_$latexdir/base/latex.ltx" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $latexdir/base/latex.ltx" >&5 +printf %s "checking for $latexdir/base/latex.ltx... " >&6; } +if eval test \${$as_ac_File+y} +then : + printf %s "(cached) " >&6 +else $as_nop test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "$latexdir/base/latex.ltx"; then @@ -4156,9 +4526,10 @@ else fi fi eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_File"\" = x"yes"; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_File"\" = x"yes" +then : fi @@ -4171,20 +4542,22 @@ fi # Check whether --with-context was given. -if test "${with_context+set}" = set; then : +if test ${with_context+y} +then : withval=$with_context; if test "x$withval" != "x" ; then contextdir=$withval fi -else +else $as_nop # Extract the first word of "kpsewhich", so it can be a program name with args. set dummy kpsewhich; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_kpsewhich+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_kpsewhich+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$kpsewhich"; then ac_cv_prog_kpsewhich="$kpsewhich" # Let the user override the test. else @@ -4192,11 +4565,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_kpsewhich="true" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4207,11 +4584,11 @@ fi fi kpsewhich=$ac_cv_prog_kpsewhich if test -n "$kpsewhich"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpsewhich" >&5 -$as_echo "$kpsewhich" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpsewhich" >&5 +printf "%s\n" "$kpsewhich" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4228,11 +4605,12 @@ for ac_prog in texi2dvi do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_TEXI2DVI+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_TEXI2DVI+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$TEXI2DVI"; then ac_cv_prog_TEXI2DVI="$TEXI2DVI" # Let the user override the test. else @@ -4240,11 +4618,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_TEXI2DVI="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4255,11 +4637,11 @@ fi fi TEXI2DVI=$ac_cv_prog_TEXI2DVI if test -n "$TEXI2DVI"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEXI2DVI" >&5 -$as_echo "$TEXI2DVI" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TEXI2DVI" >&5 +printf "%s\n" "$TEXI2DVI" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4273,10 +4655,10 @@ test -n "$TEXI2DVI" || TEXI2DVI="@echo \*\*\*\*\*\*\*\*\*\* Please install texi2 latexdir=$latexdir/asymptote contextdir=$contextdir/asymptote -{ $as_echo "$as_me:${as_lineno-$LINENO}: Using $latexdir for LaTeX style file" >&5 -$as_echo "$as_me: Using $latexdir for LaTeX style file" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: Using $contextdir for ConTeXT style file" >&5 -$as_echo "$as_me: Using $contextdir for ConTeXT style file" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using $latexdir for LaTeX style file" >&5 +printf "%s\n" "$as_me: Using $latexdir for LaTeX style file" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using $contextdir for ConTeXT style file" >&5 +printf "%s\n" "$as_me: Using $contextdir for ConTeXT style file" >&6;} @@ -4285,7 +4667,8 @@ docdir=$Datadir/doc/asymptote # Check whether --with-docdir was given. -if test "${with_docdir+set}" = set; then : +if test ${with_docdir+y} +then : withval=$with_docdir; if test "x$withval" != "x" ; then docdir=$withval fi @@ -4297,7 +4680,8 @@ fi sysdir=$Datadir/asymptote # Check whether --enable-texlive-build was given. -if test "${enable_texlive_build+set}" = set; then : +if test ${enable_texlive_build+y} +then : enableval=$enable_texlive_build; if test "x$enableval" = "xyes" ; then sysdir="" fi @@ -4306,14 +4690,10 @@ fi -cat >>confdefs.h <<_ACEOF -#define ASYMPTOTE_SYSDIR "$sysdir" -_ACEOF +printf "%s\n" "#define ASYMPTOTE_SYSDIR \"$sysdir\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define ASYMPTOTE_DOCDIR "$docdir" -_ACEOF +printf "%s\n" "#define ASYMPTOTE_DOCDIR \"$docdir\"" >>confdefs.h @@ -4326,6 +4706,12 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # Checks for programs. + + + + + + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4336,15 +4722,16 @@ if test -z "$CXX"; then CXX=$CCC else if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else @@ -4352,11 +4739,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4367,11 +4758,11 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +printf "%s\n" "$CXX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4380,15 +4771,16 @@ fi fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. else @@ -4396,11 +4788,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4411,11 +4807,11 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +printf "%s\n" "$ac_ct_CXX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4427,8 +4823,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX @@ -4438,7 +4834,7 @@ fi fi fi # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -4448,7 +4844,7 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -4458,20 +4854,21 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if ${ac_cv_cxx_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 +printf %s "checking whether the compiler supports GNU C++... " >&6; } +if test ${ac_cv_cxx_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -4481,29 +4878,33 @@ main () return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + if test $ac_compiler_gnu = yes; then GXX=yes else GXX= fi -ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_test_CXXFLAGS=${CXXFLAGS+y} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if ${ac_cv_prog_cxx_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +printf %s "checking whether $CXX accepts -g... " >&6; } +if test ${ac_cv_prog_cxx_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes ac_cv_prog_cxx_g=no @@ -4512,57 +4913,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_cv_prog_cxx_g=yes -else +else $as_nop CXXFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : -else +else $as_nop ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_cv_prog_cxx_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } +if test $ac_test_CXXFLAGS; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then if test "$GXX" = yes; then @@ -4577,6 +4981,100 @@ else CXXFLAGS= fi fi +ac_prog_cxx_stdcxx=no +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 +printf %s "checking for $CXX option to enable C++11 features... " >&6; } +if test ${ac_cv_prog_cxx_cxx11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cxx_cxx11=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx11_program +_ACEOF +for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx11" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +fi + +if test "x$ac_cv_prog_cxx_cxx11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx11" +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 + ac_prog_cxx_stdcxx=cxx11 +fi +fi +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 +printf %s "checking for $CXX option to enable C++98 features... " >&6; } +if test ${ac_cv_prog_cxx_cxx98+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cxx_cxx98=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx98_program +_ACEOF +for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx98=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx98" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +fi + +if test "x$ac_cv_prog_cxx_cxx98" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx98" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx98" +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 + ac_prog_cxx_stdcxx=cxx98 +fi +fi + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4588,11 +5086,12 @@ for ac_prog in flex lex do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LEX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_LEX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$LEX"; then ac_cv_prog_LEX="$LEX" # Let the user override the test. else @@ -4600,11 +5099,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_LEX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4615,11 +5118,11 @@ fi fi LEX=$ac_cv_prog_LEX if test -n "$LEX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 -$as_echo "$LEX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 +printf "%s\n" "$LEX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4627,15 +5130,26 @@ fi done test -n "$LEX" || LEX=":" -if test "x$LEX" != "x:"; then - cat >conftest.l <<_ACEOF + if test "x$LEX" != "x:"; then + cat >conftest.l <<_ACEOF +%{ +#ifdef __cplusplus +extern "C" +#endif +int yywrap(void); +%} %% a { ECHO; } b { REJECT; } c { yymore (); } d { yyless (1); } e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */ - yyless ((input () != 0)); } +#ifdef __cplusplus + yyless ((yyinput () != 0)); +#else + yyless ((input () != 0)); +#endif + } f { unput (yytext[0]); } . { BEGIN INITIAL; } %% @@ -4643,101 +5157,144 @@ f { unput (yytext[0]); } extern char *yytext; #endif int +yywrap (void) +{ + return 1; +} +int main (void) { - return ! yylex () + ! yywrap (); + return ! yylex (); } _ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lex output file root" >&5 +printf %s "checking for lex output file root... " >&6; } +if test ${ac_cv_prog_lex_root+y} +then : + printf %s "(cached) " >&6 +else $as_nop + +ac_cv_prog_lex_root=unknown { { ac_try="$LEX conftest.l" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$LEX conftest.l") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5 -$as_echo_n "checking lex output file root... " >&6; } -if ${ac_cv_prog_lex_root+:} false; then : - $as_echo_n "(cached) " >&6 -else - + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && if test -f lex.yy.c; then ac_cv_prog_lex_root=lex.yy elif test -f lexyy.c; then ac_cv_prog_lex_root=lexyy -else - as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 -$as_echo "$ac_cv_prog_lex_root" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 +printf "%s\n" "$ac_cv_prog_lex_root" >&6; } +if test "$ac_cv_prog_lex_root" = unknown +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot find output from $LEX; giving up on $LEX" >&5 +printf "%s\n" "$as_me: WARNING: cannot find output from $LEX; giving up on $LEX" >&2;} + LEX=: LEXLIB= +fi LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root -if test -z "${LEXLIB+set}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5 -$as_echo_n "checking lex library... " >&6; } -if ${ac_cv_lib_lex+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${LEXLIB+y} +then : + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lex library" >&5 +printf %s "checking for lex library... " >&6; } +if test ${ac_cv_lib_lex+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + ac_save_LIBS="$LIBS" + ac_found=false + for ac_cv_lib_lex in 'none needed' -lfl -ll 'not found'; do + case $ac_cv_lib_lex in #( + 'none needed') : + ;; #( + 'not found') : + break ;; #( + *) : + LIBS="$ac_cv_lib_lex $ac_save_LIBS" ;; #( + *) : + ;; +esac - ac_save_LIBS=$LIBS - ac_cv_lib_lex='none needed' - for ac_lib in '' -lfl -ll; do - LIBS="$ac_lib $ac_save_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ `cat $LEX_OUTPUT_ROOT.c` _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_lex=$ac_lib +if ac_fn_cxx_try_link "$LINENO" +then : + ac_found=: fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - test "$ac_cv_lib_lex" != 'none needed' && break + if $ac_found; then + break + fi done - LIBS=$ac_save_LIBS + LIBS="$ac_save_LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5 -$as_echo "$ac_cv_lib_lex" >&6; } - test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5 +printf "%s\n" "$ac_cv_lib_lex" >&6; } + if test "$ac_cv_lib_lex" = 'not found' +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: required lex library not found; giving up on $LEX" >&5 +printf "%s\n" "$as_me: WARNING: required lex library not found; giving up on $LEX" >&2;} + LEX=: LEXLIB= +elif test "$ac_cv_lib_lex" = 'none needed' +then : + LEXLIB='' +else $as_nop + LEXLIB=$ac_cv_lib_lex fi +fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 -$as_echo_n "checking whether yytext is a pointer... " >&6; } -if ${ac_cv_prog_lex_yytext_pointer+:} false; then : - $as_echo_n "(cached) " >&6 -else + +if test "$LEX" != : +then : + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 +printf %s "checking whether yytext is a pointer... " >&6; } +if test ${ac_cv_prog_lex_yytext_pointer+y} +then : + printf %s "(cached) " >&6 +else $as_nop # POSIX says lex can declare yytext either as a pointer or an array; the # default is implementation-dependent. Figure out which it is, since # not all implementations provide the %pointer and %array declarations. ac_cv_prog_lex_yytext_pointer=no -ac_save_LIBS=$LIBS -LIBS="$LEXLIB $ac_save_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define YYTEXT_POINTER 1 `cat $LEX_OUTPUT_ROOT.c` _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_cv_prog_lex_yytext_pointer=yes fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_save_LIBS +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5 -$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5 +printf "%s\n" "$ac_cv_prog_lex_yytext_pointer" >&6; } if test $ac_cv_prog_lex_yytext_pointer = yes; then -$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h +printf "%s\n" "#define YYTEXT_POINTER 1" >>confdefs.h + +fi fi rm -f conftest.l $LEX_OUTPUT_ROOT.c @@ -4753,15 +5310,16 @@ if test -z "$CXX"; then CXX=$CCC else if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else @@ -4769,11 +5327,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4784,11 +5346,11 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +printf "%s\n" "$CXX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4797,15 +5359,16 @@ fi fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. else @@ -4813,11 +5376,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4828,11 +5395,11 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +printf "%s\n" "$ac_ct_CXX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4844,8 +5411,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX @@ -4855,7 +5422,7 @@ fi fi fi # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -4865,7 +5432,7 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -4875,20 +5442,21 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if ${ac_cv_cxx_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 +printf %s "checking whether the compiler supports GNU C++... " >&6; } +if test ${ac_cv_cxx_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -4898,29 +5466,33 @@ main () return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + if test $ac_compiler_gnu = yes; then GXX=yes else GXX= fi -ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_test_CXXFLAGS=${CXXFLAGS+y} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if ${ac_cv_prog_cxx_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +printf %s "checking whether $CXX accepts -g... " >&6; } +if test ${ac_cv_prog_cxx_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes ac_cv_prog_cxx_g=no @@ -4929,57 +5501,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_cv_prog_cxx_g=yes -else +else $as_nop CXXFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : -else +else $as_nop ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_cv_prog_cxx_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } +if test $ac_test_CXXFLAGS; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then if test "$GXX" = yes; then @@ -4994,13 +5569,108 @@ else CXXFLAGS= fi fi +ac_prog_cxx_stdcxx=no +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 +printf %s "checking for $CXX option to enable C++11 features... " >&6; } +if test ${ac_cv_prog_cxx_cxx11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cxx_cxx11=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx11_program +_ACEOF +for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx11" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +fi + +if test "x$ac_cv_prog_cxx_cxx11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx11" +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 + ac_prog_cxx_stdcxx=cxx11 +fi +fi +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 +printf %s "checking for $CXX option to enable C++98 features... " >&6; } +if test ${ac_cv_prog_cxx_cxx98+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cxx_cxx98=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx98_program +_ACEOF +for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx98=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx98" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +fi + +if test "x$ac_cv_prog_cxx_cxx98" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx98" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx98" +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 + ac_prog_cxx_stdcxx=cxx98 +fi +fi + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -# Find a good install program. We prefer a C program (faster), + + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: # SysV /etc/install, /usr/sbin/install @@ -5014,20 +5684,25 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +printf %s "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${ac_cv_path_install+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + # Account for fact that we put trailing slashes in our PATH walk. +case $as_dir in #(( + ./ | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; @@ -5037,13 +5712,13 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # program-specific install script used by HP pwplus--don't use. : else @@ -5051,12 +5726,12 @@ case $as_dir/ in #(( echo one > conftest.one echo two > conftest.two mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && test -s conftest.one && test -s conftest.two && test -s conftest.dir/conftest.one && test -s conftest.dir/conftest.two then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" break 3 fi fi @@ -5072,7 +5747,7 @@ IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir fi - if test "${ac_cv_path_install+set}" = set; then + if test ${ac_cv_path_install+y}; then INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. Don't cache a @@ -5082,8 +5757,8 @@ fi INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +printf "%s\n" "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -5101,11 +5776,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -5113,11 +5789,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5128,11 +5808,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5141,11 +5821,12 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -5153,11 +5834,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5168,11 +5853,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -5180,8 +5865,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -5194,11 +5879,12 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -5206,11 +5892,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5221,11 +5911,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5234,11 +5924,12 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -5247,15 +5938,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5271,18 +5966,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5293,11 +5988,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -5305,11 +6001,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5320,11 +6020,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5337,11 +6037,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -5349,11 +6050,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5364,11 +6069,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5380,8 +6085,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -5389,25 +6094,129 @@ esac fi fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +fi + + +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -5417,20 +6226,21 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -5440,29 +6250,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -5471,57 +6285,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else +else $as_nop CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -5536,94 +6353,144 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <stdarg.h> -#include <stdio.h> -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi fi ac_ext=cpp @@ -5632,13 +6499,14 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else +ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval test \${ac_cv_prog_make_${ac_make}_set+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @@ -5654,253 +6522,175 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi -for ac_prog in 'bison -y' byacc -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_YACC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$YACC"; then - ac_cv_prog_YACC="$YACC" # Let the user override the test. + + +# Extract the first word of "bison -y", so it can be a program name with args. +set dummy bison -y; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_BISON+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$BISON"; then + ac_cv_prog_BISON="$BISON" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_YACC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_BISON="yes" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS + test -z "$ac_cv_prog_BISON" && ac_cv_prog_BISON="no" fi fi -YACC=$ac_cv_prog_YACC -if test -n "$YACC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 -$as_echo "$YACC" >&6; } +BISON=$ac_cv_prog_BISON +if test -n "$BISON"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5 +printf "%s\n" "$BISON" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - test -n "$YACC" && break -done -test -n "$YACC" || YACC="yacc" - - -if test "$GXX" = yes ; then - ac_gcc_version=`echo __GNUC__ | $CC -E - | grep -v ^\#` - ac_clang=`echo __clang__ | $CC -E - | grep -v ^\#` - if test "$ac_gcc_version" -lt 4; then - CFLAGS=$CFLAGS" -finline-limit=400" - else - if test "$ac_clang" != 1; then - CFLAGS=$CFLAGS" -fno-var-tracking" - fi - fi +if test "x$BISON" = "xno" +then : + as_fn_error $? "bison not found" "$LINENO" 5 fi - - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -if test -z "$CXXCPP"; then - if ${ac_cv_prog_CXXCPP+:} false; then : - $as_echo_n "(cached) " >&6 +# Extract the first word of "flex -y", so it can be a program name with args. +set dummy flex -y; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_FLEX+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$FLEX"; then + ac_cv_prog_FLEX="$FLEX" # Let the user override the test. else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ac_nonexistent.h> -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_FLEX="yes" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP + done +IFS=$as_save_IFS + test -z "$ac_cv_prog_FLEX" && ac_cv_prog_FLEX="no" fi - CXXCPP=$ac_cv_prog_CXXCPP +fi +FLEX=$ac_cv_prog_FLEX +if test -n "$FLEX"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5 +printf "%s\n" "$FLEX" >&6; } else - ac_cv_prog_CXXCPP=$CXXCPP + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : -else - # Broken: fails on valid input. -continue + +if test "x$FLEX" = "xno" +then : + as_fn_error $? "flex not found" "$LINENO" 5 fi -rm -f conftest.err conftest.i conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ac_nonexistent.h> -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break +if test "$GXX" = yes ; then + ac_gcc_version=`echo __GNUC__ | $CC -E - | grep -v ^\#` + ac_clang=`echo __clang__ | $CC -E - | grep -v ^\#` + if test "$ac_gcc_version" -lt 4; then + CFLAGS=$CFLAGS" -finline-limit=400" + else + if test "$ac_clang" != 1; then + CFLAGS=$CFLAGS" -fno-var-tracking" + fi + fi fi -rm -f conftest.err conftest.i conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_fn_cxx_check_header_mongrel "$LINENO" "tr1/unordered_map" "ac_cv_header_tr1_unordered_map" "$ac_includes_default" -if test "x$ac_cv_header_tr1_unordered_map" = xyes; then : +ac_fn_cxx_check_header_compile "$LINENO" "tr1/unordered_map" "ac_cv_header_tr1_unordered_map" "$ac_includes_default" +if test "x$ac_cv_header_tr1_unordered_map" = xyes +then : fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <tr1/unordered_map> std::tr1::unordered_map<int,int> map; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : -$as_echo "#define HAVE_TR1_UNORDERED_MAP 1" >>confdefs.h +printf "%s\n" "#define HAVE_TR1_UNORDERED_MAP 1" >>confdefs.h -else +else $as_nop - ac_fn_cxx_check_header_mongrel "$LINENO" "unordered_map" "ac_cv_header_unordered_map" "$ac_includes_default" -if test "x$ac_cv_header_unordered_map" = xyes; then : + ac_fn_cxx_check_header_compile "$LINENO" "unordered_map" "ac_cv_header_unordered_map" "$ac_includes_default" +if test "x$ac_cv_header_unordered_map" = xyes +then : -$as_echo "#define HAVE_UNORDERED_MAP 1" >>confdefs.h +printf "%s\n" "#define HAVE_UNORDERED_MAP 1" >>confdefs.h -else - ac_fn_cxx_check_header_mongrel "$LINENO" "ext/hash_map" "ac_cv_header_ext_hash_map" "$ac_includes_default" -if test "x$ac_cv_header_ext_hash_map" = xyes; then : +else $as_nop + ac_fn_cxx_check_header_compile "$LINENO" "ext/hash_map" "ac_cv_header_ext_hash_map" "$ac_includes_default" +if test "x$ac_cv_header_ext_hash_map" = xyes +then : -else +else $as_nop OPTIONS=$OPTIONS"-DNOHASH " fi - fi - fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ASYGLVERSION=1.02 @@ -5910,12 +6700,13 @@ ATOMICVERSION=7.6.12 GCFILE=gc-$GCVERSION ac_cv_use_gc="system" -as_ac_File=`$as_echo "ac_cv_file_$GCFILE.tar.gz" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $GCFILE.tar.gz" >&5 -$as_echo_n "checking for $GCFILE.tar.gz... " >&6; } -if eval \${$as_ac_File+:} false; then : - $as_echo_n "(cached) " >&6 -else +as_ac_File=`printf "%s\n" "ac_cv_file_$GCFILE.tar.gz" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $GCFILE.tar.gz" >&5 +printf %s "checking for $GCFILE.tar.gz... " >&6; } +if eval test \${$as_ac_File+y} +then : + printf %s "(cached) " >&6 +else $as_nop test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "$GCFILE.tar.gz"; then @@ -5925,14 +6716,16 @@ else fi fi eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_File"\" = x"yes"; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_File"\" = x"yes" +then : ac_cv_use_gc=$GCVERSION fi # Check whether --enable-gc was given. -if test "${enable_gc+set}" = set; then : +if test ${enable_gc+y} +then : enableval=$enable_gc; if test "x$enableval" != "xyes" ; then ac_cv_use_gc=$enableval @@ -5941,7 +6734,7 @@ if test "${enable_gc+set}" = set; then : fi -OPTIONS="-D_FILE_OFFSET_BITS=64 " +OPTIONS="-D_FILE_OFFSET_BIS=64 " GCLIB= GCPPLIB= INCL="-I." @@ -5959,93 +6752,93 @@ if test "x$ac_cv_use_gc" != "xno" ; then fi CPPFLAGS_SAVE=$CPPFLAGS CPPFLAGS=$CPPFLAGS" $INCL" - ac_fn_cxx_check_header_mongrel "$LINENO" "gc.h" "ac_cv_header_gc_h" "$ac_includes_default" -if test "x$ac_cv_header_gc_h" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_malloc in -lgc" >&5 -$as_echo_n "checking for GC_malloc in -lgc... " >&6; } -if ${ac_cv_lib_gc_GC_malloc+:} false; then : - $as_echo_n "(cached) " >&6 -else + ac_fn_cxx_check_header_compile "$LINENO" "gc.h" "ac_cv_header_gc_h" "$ac_includes_default" +if test "x$ac_cv_header_gc_h" = xyes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GC_malloc in -lgc" >&5 +printf %s "checking for GC_malloc in -lgc... " >&6; } +if test ${ac_cv_lib_gc_GC_malloc+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lgc $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char GC_malloc (); +namespace conftest { + extern "C" int GC_malloc (); +} int -main () +main (void) { -return GC_malloc (); +return conftest::GC_malloc (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_gc_GC_malloc=yes -else +else $as_nop ac_cv_lib_gc_GC_malloc=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_malloc" >&5 -$as_echo "$ac_cv_lib_gc_GC_malloc" >&6; } -if test "x$ac_cv_lib_gc_GC_malloc" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_malloc" >&5 +printf "%s\n" "$ac_cv_lib_gc_GC_malloc" >&6; } +if test "x$ac_cv_lib_gc_GC_malloc" = xyes +then : LIBS=$LIBS"-lgc " - { $as_echo "$as_me:${as_lineno-$LINENO}: enabling system $GCNAME" >&5 -$as_echo "$as_me: enabling system $GCNAME" >&6;} -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: enabling system $GCNAME" >&5 +printf "%s\n" "$as_me: enabling system $GCNAME" >&6;} +else $as_nop GCDIR=$GCFILE INCL="-I. -I\$(GC)/include" GCLIB="\$(GC)/.libs/libgc.a" - { $as_echo "$as_me:${as_lineno-$LINENO}: $GCNAME library not found" >&5 -$as_echo "$as_me: $GCNAME library not found" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $GCNAME library not found" >&5 +printf "%s\n" "$as_me: $GCNAME library not found" >&6;} fi -else +else $as_nop GCDIR=$GCFILE GCLIB="\$(GC)/.libs/libgc.a" INCL="-I. -I\$(GC)/include" - { $as_echo "$as_me:${as_lineno-$LINENO}: $GCNAME header file not found" >&5 -$as_echo "$as_me: $GCNAME header file not found" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $GCNAME header file not found" >&5 +printf "%s\n" "$as_me: $GCNAME header file not found" >&6;} fi - CPPFLAGS=$CPPFLAGS_SAVE ;; *) GCVERSION=$ac_cv_use_gc GCFILE=gc-$GCVERSION GCDIR=$GCFILE - { $as_echo "$as_me:${as_lineno-$LINENO}: enabling local $GCNAME $GCDIR" >&5 -$as_echo "$as_me: enabling local $GCNAME $GCDIR" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: enabling local $GCNAME $GCDIR" >&5 +printf "%s\n" "$as_me: enabling local $GCNAME $GCDIR" >&6;} GCLIB="\$(GC)/.libs/libgc.a" INCL="-I. -I\$(GC)/include" ;; esac else - { $as_echo "$as_me:${as_lineno-$LINENO}: disabling the $GCNAME" >&5 -$as_echo "$as_me: disabling the $GCNAME" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: disabling the $GCNAME" >&5 +printf "%s\n" "$as_me: disabling the $GCNAME" >&6;} fi # Check whether --enable-gc-debug was given. -if test "${enable_gc_debug+set}" = set; then : +if test ${enable_gc_debug+y} +then : enableval=$enable_gc_debug; if test "x$ac_cv_use_gc" != "xno" ; then if test "x$enableval" = "xyes" ; then OPTIONS=$OPTIONS"-DGC_DEBUG " - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Enabling GC debugging: remember to make clean ***" >&5 -$as_echo "$as_me: *** Enabling GC debugging: remember to make clean ***" >&6;} - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Set the environment variable GC_FIND_LEAK at runtime ***" >&5 -$as_echo "$as_me: *** Set the environment variable GC_FIND_LEAK at runtime ***" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Enabling GC debugging: remember to make clean ***" >&5 +printf "%s\n" "$as_me: *** Enabling GC debugging: remember to make clean ***" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Set the environment variable GC_FIND_LEAK at runtime ***" >&5 +printf "%s\n" "$as_me: *** Set the environment variable GC_FIND_LEAK at runtime ***" >&6;} fi fi @@ -6053,13 +6846,14 @@ fi # Check whether --enable-gc-full-debug was given. -if test "${enable_gc_full_debug+set}" = set; then : +if test ${enable_gc_full_debug+y} +then : enableval=$enable_gc_full_debug; if test "x$ac_cv_use_gc" != "xno" ; then if test "x$enableval" = "xyes" ; then OPTIONS=$OPTIONS"-DGC_DEBUG -DGC_BACKTRACE " GCOPTIONS=$GCOPTIONS"--enable-gc-debug " - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Enabling GC backtrace debugging; remember to make gc-clean ***" >&5 -$as_echo "$as_me: *** Enabling GC backtrace debugging; remember to make gc-clean ***" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Enabling GC backtrace debugging; remember to make gc-clean ***" >&5 +printf "%s\n" "$as_me: *** Enabling GC backtrace debugging; remember to make gc-clean ***" >&6;} fi fi @@ -6073,11 +6867,12 @@ CPPFLAGS=$CPPFLAGS" $INCL" fi ac_fn_cxx_check_func "$LINENO" "getopt_long_only" "ac_cv_func_getopt_long_only" -if test "x$ac_cv_func_getopt_long_only" = xyes; then : +if test "x$ac_cv_func_getopt_long_only" = xyes +then : -$as_echo "#define HAVE_GNU_GETOPT_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_GNU_GETOPT_H 1" >>confdefs.h -else +else $as_nop getopt="getopt getopt1" fi @@ -6095,115 +6890,57 @@ fi # Checks for libraries. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing lgamma" >&5 -$as_echo_n "checking for library containing lgamma... " >&6; } -if ${ac_cv_search_lgamma+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char lgamma (); -int -main () -{ -return lgamma (); - ; - return 0; -} -_ACEOF -for ac_lib in '' m c; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_search_lgamma=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_lgamma+:} false; then : - break -fi -done -if ${ac_cv_search_lgamma+:} false; then : - -else - ac_cv_search_lgamma=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_lgamma" >&5 -$as_echo "$ac_cv_search_lgamma" >&6; } -ac_res=$ac_cv_search_lgamma -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -else - as_fn_error $? "*** Please install libm on your system ***" "$LINENO" 5 -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 -$as_echo_n "checking for deflate in -lz... " >&6; } -if ${ac_cv_lib_z_deflate+:} false; then : - $as_echo_n "(cached) " >&6 -else +#AC_SEARCH_LIBS([lgamma],[m c],, +#AC_MSG_ERROR([*** Please install libm on your system ***])) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 +printf %s "checking for deflate in -lz... " >&6; } +if test ${ac_cv_lib_z_deflate+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char deflate (); +namespace conftest { + extern "C" int deflate (); +} int -main () +main (void) { -return deflate (); +return conftest::deflate (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_z_deflate=yes -else +else $as_nop ac_cv_lib_z_deflate=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5 -$as_echo "$ac_cv_lib_z_deflate" >&6; } -if test "x$ac_cv_lib_z_deflate" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBZ 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5 +printf "%s\n" "$ac_cv_lib_z_deflate" >&6; } +if test "x$ac_cv_lib_z_deflate" = xyes +then : + printf "%s\n" "#define HAVE_LIBZ 1" >>confdefs.h LIBS="-lz $LIBS" -else +else $as_nop as_fn_error $? "*** Please install libz or zlib-devel on your system ***" "$LINENO" 5 fi GCOPTIONS="--disable-shared " # Check whether --enable-threads was given. -if test "${enable_threads+set}" = set; then : +if test ${enable_threads+y} +then : enableval=$enable_threads; fi @@ -6231,33 +6968,31 @@ if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then CFLAGS="$CFLAGS $PTHREAD_CFLAGS" save_LIBS="$LIBS" LIBS="$PTHREAD_LIBS $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 -$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 +printf %s "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char pthread_join (); int -main () +main (void) { return pthread_join (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ax_pthread_ok=yes fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 -$as_echo "$ax_pthread_ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 +printf "%s\n" "$ax_pthread_ok" >&6; } if test x"$ax_pthread_ok" = xno; then PTHREAD_LIBS="" PTHREAD_CFLAGS="" @@ -6322,24 +7057,25 @@ for flag in $ax_pthread_flags; do case $flag in none) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 -$as_echo_n "checking whether pthreads work without any flags... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 +printf %s "checking whether pthreads work without any flags... " >&6; } ;; -*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 -$as_echo_n "checking whether pthreads work with $flag... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 +printf %s "checking whether pthreads work with $flag... " >&6; } PTHREAD_CFLAGS="$flag" ;; pthread-config) # Extract the first word of "pthread-config", so it can be a program name with args. set dummy pthread-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ax_pthread_config+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ax_pthread_config+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ax_pthread_config"; then ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test. else @@ -6347,11 +7083,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ax_pthread_config="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6363,11 +7103,11 @@ fi fi ax_pthread_config=$ac_cv_prog_ax_pthread_config if test -n "$ax_pthread_config"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5 -$as_echo "$ax_pthread_config" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5 +printf "%s\n" "$ax_pthread_config" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6377,8 +7117,8 @@ fi ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 -$as_echo_n "checking for the pthreads library -l$flag... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 +printf %s "checking for the pthreads library -l$flag... " >&6; } PTHREAD_LIBS="-l$flag" ;; esac @@ -6403,7 +7143,7 @@ $as_echo_n "checking for the pthreads library -l$flag... " >&6; } static void routine(void *a) { a = 0; } static void *start_routine(void *a) { return a; } int -main () +main (void) { pthread_t th; pthread_attr_t attr; pthread_create(&th, 0, start_routine, 0); @@ -6415,17 +7155,18 @@ pthread_t th; pthread_attr_t attr; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ax_pthread_ok=yes fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 -$as_echo "$ax_pthread_ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 +printf "%s\n" "$ax_pthread_ok" >&6; } if test "x$ax_pthread_ok" = xyes; then break; fi @@ -6443,39 +7184,38 @@ if test "x$ax_pthread_ok" = xyes; then CFLAGS="$CFLAGS $PTHREAD_CFLAGS" # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 -$as_echo_n "checking for joinable pthread attribute... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 +printf %s "checking for joinable pthread attribute... " >&6; } attr_name=unknown for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> int -main () +main (void) { int attr = $attr; return attr /* ; */ ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : attr_name=$attr; break fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 -$as_echo "$attr_name" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 +printf "%s\n" "$attr_name" >&6; } if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then -cat >>confdefs.h <<_ACEOF -#define PTHREAD_CREATE_JOINABLE $attr_name -_ACEOF +printf "%s\n" "#define PTHREAD_CREATE_JOINABLE $attr_name" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 -$as_echo_n "checking if more special flags are required for pthreads... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 +printf %s "checking if more special flags are required for pthreads... " >&6; } flag=no case ${host_os} in aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; @@ -6488,44 +7228,47 @@ $as_echo_n "checking if more special flags are required for pthreads... " >&6; } fi ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 -$as_echo "${flag}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 +printf "%s\n" "${flag}" >&6; } if test "x$flag" != xno; then PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5 -$as_echo_n "checking for PTHREAD_PRIO_INHERIT... " >&6; } -if ${ax_cv_PTHREAD_PRIO_INHERIT+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5 +printf %s "checking for PTHREAD_PRIO_INHERIT... " >&6; } +if test ${ax_cv_PTHREAD_PRIO_INHERIT+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> int -main () +main (void) { int i = PTHREAD_PRIO_INHERIT; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ax_cv_PTHREAD_PRIO_INHERIT=yes -else +else $as_nop ax_cv_PTHREAD_PRIO_INHERIT=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5 -$as_echo "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; } - if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5 +printf "%s\n" "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; } + if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" +then : -$as_echo "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h +printf "%s\n" "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h fi @@ -6538,11 +7281,12 @@ fi do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_PTHREAD_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_PTHREAD_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$PTHREAD_CC"; then ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. else @@ -6550,11 +7294,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_PTHREAD_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6565,11 +7313,11 @@ fi fi PTHREAD_CC=$ac_cv_prog_PTHREAD_CC if test -n "$PTHREAD_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 -$as_echo "$PTHREAD_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 +printf "%s\n" "$PTHREAD_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6591,7 +7339,7 @@ fi # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: if test x"$ax_pthread_ok" = xyes; then -$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h +printf "%s\n" "#define HAVE_PTHREAD 1" >>confdefs.h : else @@ -6610,52 +7358,50 @@ else fi # Check whether --enable-sigsegv was given. -if test "${enable_sigsegv+set}" = set; then : +if test ${enable_sigsegv+y} +then : enableval=$enable_sigsegv; fi if test "x$enable_sigsegv" != "xno"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stackoverflow_install_handler in -lsigsegv" >&5 -$as_echo_n "checking for stackoverflow_install_handler in -lsigsegv... " >&6; } -if ${ac_cv_lib_sigsegv_stackoverflow_install_handler+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stackoverflow_install_handler in -lsigsegv" >&5 +printf %s "checking for stackoverflow_install_handler in -lsigsegv... " >&6; } +if test ${ac_cv_lib_sigsegv_stackoverflow_install_handler+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lsigsegv $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char stackoverflow_install_handler (); +namespace conftest { + extern "C" int stackoverflow_install_handler (); +} int -main () +main (void) { -return stackoverflow_install_handler (); +return conftest::stackoverflow_install_handler (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_sigsegv_stackoverflow_install_handler=yes -else +else $as_nop ac_cv_lib_sigsegv_stackoverflow_install_handler=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sigsegv_stackoverflow_install_handler" >&5 -$as_echo "$ac_cv_lib_sigsegv_stackoverflow_install_handler" >&6; } -if test "x$ac_cv_lib_sigsegv_stackoverflow_install_handler" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSIGSEGV 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sigsegv_stackoverflow_install_handler" >&5 +printf "%s\n" "$ac_cv_lib_sigsegv_stackoverflow_install_handler" >&6; } +if test "x$ac_cv_lib_sigsegv_stackoverflow_install_handler" = xyes +then : + printf "%s\n" "#define HAVE_LIBSIGSEGV 1" >>confdefs.h LIBS="-lsigsegv $LIBS" @@ -6663,46 +7409,43 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 -$as_echo_n "checking for sched_yield in -lrt... " >&6; } -if ${ac_cv_lib_rt_sched_yield+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 +printf %s "checking for sched_yield in -lrt... " >&6; } +if test ${ac_cv_lib_rt_sched_yield+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lrt $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sched_yield (); +namespace conftest { + extern "C" int sched_yield (); +} int -main () +main (void) { -return sched_yield (); +return conftest::sched_yield (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_rt_sched_yield=yes -else +else $as_nop ac_cv_lib_rt_sched_yield=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 -$as_echo "$ac_cv_lib_rt_sched_yield" >&6; } -if test "x$ac_cv_lib_rt_sched_yield" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBRT 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 +printf "%s\n" "$ac_cv_lib_rt_sched_yield" >&6; } +if test "x$ac_cv_lib_rt_sched_yield" = xyes +then : + printf "%s\n" "#define HAVE_LIBRT 1" >>confdefs.h LIBS="-lrt $LIBS" @@ -6710,166 +7453,164 @@ fi # Check whether --enable-curl was given. -if test "${enable_curl+set}" = set; then : +if test ${enable_curl+y} +then : enableval=$enable_curl; fi if test "x$enable_curl" != "xno"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_init in -lcurl" >&5 -$as_echo_n "checking for curl_easy_init in -lcurl... " >&6; } -if ${ac_cv_lib_curl_curl_easy_init+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curl_easy_init in -lcurl" >&5 +printf %s "checking for curl_easy_init in -lcurl... " >&6; } +if test ${ac_cv_lib_curl_curl_easy_init+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lcurl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char curl_easy_init (); +namespace conftest { + extern "C" int curl_easy_init (); +} int -main () +main (void) { -return curl_easy_init (); +return conftest::curl_easy_init (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_curl_curl_easy_init=yes -else +else $as_nop ac_cv_lib_curl_curl_easy_init=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_init" >&5 -$as_echo "$ac_cv_lib_curl_curl_easy_init" >&6; } -if test "x$ac_cv_lib_curl_curl_easy_init" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBCURL 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_init" >&5 +printf "%s\n" "$ac_cv_lib_curl_curl_easy_init" >&6; } +if test "x$ac_cv_lib_curl_curl_easy_init" = xyes +then : + printf "%s\n" "#define HAVE_LIBCURL 1" >>confdefs.h LIBS="-lcurl $LIBS" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libcurl: will compile without optional URL support. ***" >&5 -$as_echo "$as_me: *** Could not find libcurl: will compile without optional URL support. ***" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libcurl: will compile without optional URL support. ***" >&5 +printf "%s\n" "$as_me: *** Could not find libcurl: will compile without optional URL support. ***" >&6;} fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** libcurl support disabled by configure flag: will compile without optional URL support. ***" >&5 -$as_echo "$as_me: *** libcurl support disabled by configure flag: will compile without optional URL support. ***" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** libcurl support disabled by configure flag: will compile without optional URL support. ***" >&5 +printf "%s\n" "$as_me: *** libcurl support disabled by configure flag: will compile without optional URL support. ***" >&6;} fi LSPLIBS= LSPLIB= if test "x$enable_lsp" != "xno" -a "x$enable_threads" != "xno"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opendir in -lboost_filesystem" >&5 -$as_echo_n "checking for opendir in -lboost_filesystem... " >&6; } -if ${ac_cv_lib_boost_filesystem_opendir+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for opendir in -lboost_filesystem" >&5 +printf %s "checking for opendir in -lboost_filesystem... " >&6; } +if test ${ac_cv_lib_boost_filesystem_opendir+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lboost_filesystem $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char opendir (); +namespace conftest { + extern "C" int opendir (); +} int -main () +main (void) { -return opendir (); +return conftest::opendir (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_boost_filesystem_opendir=yes -else +else $as_nop ac_cv_lib_boost_filesystem_opendir=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_boost_filesystem_opendir" >&5 -$as_echo "$ac_cv_lib_boost_filesystem_opendir" >&6; } -if test "x$ac_cv_lib_boost_filesystem_opendir" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_getdetachstate in -lboost_thread" >&5 -$as_echo_n "checking for pthread_attr_getdetachstate in -lboost_thread... " >&6; } -if ${ac_cv_lib_boost_thread_pthread_attr_getdetachstate+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_boost_filesystem_opendir" >&5 +printf "%s\n" "$ac_cv_lib_boost_filesystem_opendir" >&6; } +if test "x$ac_cv_lib_boost_filesystem_opendir" = xyes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_getdetachstate in -lboost_thread" >&5 +printf %s "checking for pthread_attr_getdetachstate in -lboost_thread... " >&6; } +if test ${ac_cv_lib_boost_thread_pthread_attr_getdetachstate+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lboost_thread $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pthread_attr_getdetachstate (); +namespace conftest { + extern "C" int pthread_attr_getdetachstate (); +} int -main () +main (void) { -return pthread_attr_getdetachstate (); +return conftest::pthread_attr_getdetachstate (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_boost_thread_pthread_attr_getdetachstate=yes -else +else $as_nop ac_cv_lib_boost_thread_pthread_attr_getdetachstate=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_boost_thread_pthread_attr_getdetachstate" >&5 -$as_echo "$ac_cv_lib_boost_thread_pthread_attr_getdetachstate" >&6; } -if test "x$ac_cv_lib_boost_thread_pthread_attr_getdetachstate" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_boost_thread_pthread_attr_getdetachstate" >&5 +printf "%s\n" "$ac_cv_lib_boost_thread_pthread_attr_getdetachstate" >&6; } +if test "x$ac_cv_lib_boost_thread_pthread_attr_getdetachstate" = xyes +then : -$as_echo "#define HAVE_LSP 1" >>confdefs.h +printf "%s\n" "#define HAVE_LSP 1" >>confdefs.h LSPLIBS="-llspcpp -lnetwork-uri -lboost_filesystem -lboost_thread " LSPLIB=liblspcpp.a -else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libboost_thread: will compile without optional Language Server Protocol. ***" >&5 -$as_echo "$as_me: *** Could not find libboost_thread: will compile without optional Language Server Protocol. ***" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libboost_thread: will compile without optional Language Server Protocol. ***" >&5 +printf "%s\n" "$as_me: *** Could not find libboost_thread: will compile without optional Language Server Protocol. ***" >&6;} fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libboost_filesystem: will compile without optional Language Server Protocol. ***" >&5 -$as_echo "$as_me: *** Could not find libboost_filesystem: will compile without optional Language Server Protocol. ***" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libboost_filesystem: will compile without optional Language Server Protocol. ***" >&5 +printf "%s\n" "$as_me: *** Could not find libboost_filesystem: will compile without optional Language Server Protocol. ***" >&6;} fi fi # Check whether --enable-readline was given. -if test "${enable_readline+set}" = set; then : +if test ${enable_readline+y} +then : enableval=$enable_readline; fi # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : +if test ${enable_static+y} +then : enableval=$enable_static; fi @@ -6901,7 +7642,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #include <readline/readline.h> int -main () +main (void) { #ifndef RL_READLINE_VERSION @@ -6912,226 +7653,207 @@ abort return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : LDFLAGS0=$LDFLAGS LDFLAGS=$LDFLAGS$LDSTATIC -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for history_list in -lreadline" >&5 -$as_echo_n "checking for history_list in -lreadline... " >&6; } -if ${ac_cv_lib_readline_history_list+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for history_list in -lreadline" >&5 +printf %s "checking for history_list in -lreadline... " >&6; } +if test ${ac_cv_lib_readline_history_list+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lreadline $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char history_list (); +namespace conftest { + extern "C" int history_list (); +} int -main () +main (void) { -return history_list (); +return conftest::history_list (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_readline_history_list=yes -else +else $as_nop ac_cv_lib_readline_history_list=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_history_list" >&5 -$as_echo "$ac_cv_lib_readline_history_list" >&6; } -if test "x$ac_cv_lib_readline_history_list" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_history_list" >&5 +printf "%s\n" "$ac_cv_lib_readline_history_list" >&6; } +if test "x$ac_cv_lib_readline_history_list" = xyes +then : -$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBREADLINE 1" >>confdefs.h LIBS=$LIBS$STATIC"-lreadline "$DYNAMIC -else +else $as_nop if test "x$enable_static" = "xyes"; then { ac_cv_lib_readline_history_list=; unset ac_cv_lib_readline_history_list;} LDFLAGS=$LDFLAGS0 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for history_list in -lreadline" >&5 -$as_echo_n "checking for history_list in -lreadline... " >&6; } -if ${ac_cv_lib_readline_history_list+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for history_list in -lreadline" >&5 +printf %s "checking for history_list in -lreadline... " >&6; } +if test ${ac_cv_lib_readline_history_list+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lreadline $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char history_list (); +namespace conftest { + extern "C" int history_list (); +} int -main () +main (void) { -return history_list (); +return conftest::history_list (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_readline_history_list=yes -else +else $as_nop ac_cv_lib_readline_history_list=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_history_list" >&5 -$as_echo "$ac_cv_lib_readline_history_list" >&6; } -if test "x$ac_cv_lib_readline_history_list" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBREADLINE 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_history_list" >&5 +printf "%s\n" "$ac_cv_lib_readline_history_list" >&6; } +if test "x$ac_cv_lib_readline_history_list" = xyes +then : + printf "%s\n" "#define HAVE_LIBREADLINE 1" >>confdefs.h LIBS="-lreadline $LIBS" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find GNU readline 4.3 or later: will compile without readline support ***" >&5 -$as_echo "$as_me: *** Could not find GNU readline 4.3 or later: will compile without readline support ***" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5 -$as_echo_n "checking for readline in -ledit... " >&6; } -if ${ac_cv_lib_edit_readline+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find GNU readline 4.3 or later: will compile without readline support ***" >&5 +printf "%s\n" "$as_me: *** Could not find GNU readline 4.3 or later: will compile without readline support ***" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5 +printf %s "checking for readline in -ledit... " >&6; } +if test ${ac_cv_lib_edit_readline+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ledit $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char readline (); +namespace conftest { + extern "C" int readline (); +} int -main () +main (void) { -return readline (); +return conftest::readline (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_edit_readline=yes -else +else $as_nop ac_cv_lib_edit_readline=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5 -$as_echo "$ac_cv_lib_edit_readline" >&6; } -if test "x$ac_cv_lib_edit_readline" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBEDIT 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5 +printf "%s\n" "$ac_cv_lib_edit_readline" >&6; } +if test "x$ac_cv_lib_edit_readline" = xyes +then : + printf "%s\n" "#define HAVE_LIBEDIT 1" >>confdefs.h LIBS="-ledit $LIBS" fi -for ac_header in editline/readline.h -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default" -if test "x$ac_cv_header_editline_readline_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_EDITLINE_READLINE_H 1 -_ACEOF +ac_fn_cxx_check_header_compile "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default" +if test "x$ac_cv_header_editline_readline_h" = xyes +then : + printf "%s\n" "#define HAVE_EDITLINE_READLINE_H 1" >>confdefs.h fi -done - fi else -{ $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find GNU readline 4.3 or later: will compile without readline support ***" >&5 -$as_echo "$as_me: *** Could not find GNU readline 4.3 or later: will compile without readline support ***" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5 -$as_echo_n "checking for readline in -ledit... " >&6; } -if ${ac_cv_lib_edit_readline+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find GNU readline 4.3 or later: will compile without readline support ***" >&5 +printf "%s\n" "$as_me: *** Could not find GNU readline 4.3 or later: will compile without readline support ***" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5 +printf %s "checking for readline in -ledit... " >&6; } +if test ${ac_cv_lib_edit_readline+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ledit $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char readline (); +namespace conftest { + extern "C" int readline (); +} int -main () +main (void) { -return readline (); +return conftest::readline (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_edit_readline=yes -else +else $as_nop ac_cv_lib_edit_readline=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5 -$as_echo "$ac_cv_lib_edit_readline" >&6; } -if test "x$ac_cv_lib_edit_readline" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBEDIT 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5 +printf "%s\n" "$ac_cv_lib_edit_readline" >&6; } +if test "x$ac_cv_lib_edit_readline" = xyes +then : + printf "%s\n" "#define HAVE_LIBEDIT 1" >>confdefs.h LIBS="-ledit $LIBS" fi -for ac_header in editline/readline.h -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default" -if test "x$ac_cv_header_editline_readline_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_EDITLINE_READLINE_H 1 -_ACEOF +ac_fn_cxx_check_header_compile "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default" +if test "x$ac_cv_header_editline_readline_h" = xyes +then : + printf "%s\n" "#define HAVE_EDITLINE_READLINE_H 1" >>confdefs.h fi -done - fi @@ -7139,174 +7861,162 @@ fi LDFLAGS=$LDFLAGS0 -else +else $as_nop -{ $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find GNU readline 4.3 or later: will compile without readline support ***" >&5 -$as_echo "$as_me: *** Could not find GNU readline 4.3 or later: will compile without readline support ***" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5 -$as_echo_n "checking for readline in -ledit... " >&6; } -if ${ac_cv_lib_edit_readline+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find GNU readline 4.3 or later: will compile without readline support ***" >&5 +printf "%s\n" "$as_me: *** Could not find GNU readline 4.3 or later: will compile without readline support ***" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5 +printf %s "checking for readline in -ledit... " >&6; } +if test ${ac_cv_lib_edit_readline+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ledit $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char readline (); +namespace conftest { + extern "C" int readline (); +} int -main () +main (void) { -return readline (); +return conftest::readline (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_edit_readline=yes -else +else $as_nop ac_cv_lib_edit_readline=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5 -$as_echo "$ac_cv_lib_edit_readline" >&6; } -if test "x$ac_cv_lib_edit_readline" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBEDIT 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5 +printf "%s\n" "$ac_cv_lib_edit_readline" >&6; } +if test "x$ac_cv_lib_edit_readline" = xyes +then : + printf "%s\n" "#define HAVE_LIBEDIT 1" >>confdefs.h LIBS="-ledit $LIBS" fi -for ac_header in editline/readline.h -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default" -if test "x$ac_cv_header_editline_readline_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_EDITLINE_READLINE_H 1 -_ACEOF +ac_fn_cxx_check_header_compile "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default" +if test "x$ac_cv_header_editline_readline_h" = xyes +then : + printf "%s\n" "#define HAVE_EDITLINE_READLINE_H 1" >>confdefs.h fi -done - fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext LDFLAGS0=$LDFLAGS LDFLAGS=$LDFLAGS$LDSTATIC -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5 -$as_echo_n "checking for tgetent in -ltinfo... " >&6; } -if ${ac_cv_lib_tinfo_tgetent+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5 +printf %s "checking for tgetent in -ltinfo... " >&6; } +if test ${ac_cv_lib_tinfo_tgetent+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ltinfo $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char tgetent (); +namespace conftest { + extern "C" int tgetent (); +} int -main () +main (void) { -return tgetent (); +return conftest::tgetent (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_tinfo_tgetent=yes -else +else $as_nop ac_cv_lib_tinfo_tgetent=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_tgetent" >&5 -$as_echo "$ac_cv_lib_tinfo_tgetent" >&6; } -if test "x$ac_cv_lib_tinfo_tgetent" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_tgetent" >&5 +printf "%s\n" "$ac_cv_lib_tinfo_tgetent" >&6; } +if test "x$ac_cv_lib_tinfo_tgetent" = xyes +then : -$as_echo "#define HAVE_LIBTINFO 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBTINFO 1" >>confdefs.h LIBS=$LIBS$STATIC"-ltinfo "$DYNAMIC -else +else $as_nop if test "x$enable_static" = "xyes"; then { ac_cv_lib_tinfo_tgetent=; unset ac_cv_lib_tinfo_tgetent;} LDFLAGS=$LDFLAGS0 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5 -$as_echo_n "checking for tgetent in -ltinfo... " >&6; } -if ${ac_cv_lib_tinfo_tgetent+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5 +printf %s "checking for tgetent in -ltinfo... " >&6; } +if test ${ac_cv_lib_tinfo_tgetent+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ltinfo $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char tgetent (); +namespace conftest { + extern "C" int tgetent (); +} int -main () +main (void) { -return tgetent (); +return conftest::tgetent (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_tinfo_tgetent=yes -else +else $as_nop ac_cv_lib_tinfo_tgetent=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_tgetent" >&5 -$as_echo "$ac_cv_lib_tinfo_tgetent" >&6; } -if test "x$ac_cv_lib_tinfo_tgetent" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBTINFO 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_tgetent" >&5 +printf "%s\n" "$ac_cv_lib_tinfo_tgetent" >&6; } +if test "x$ac_cv_lib_tinfo_tgetent" = xyes +then : + printf "%s\n" "#define HAVE_LIBTINFO 1" >>confdefs.h LIBS="-ltinfo $LIBS" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: perhaps tgetent is in -lncurses" >&5 -$as_echo "$as_me: perhaps tgetent is in -lncurses" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: perhaps tgetent is in -lncurses" >&5 +printf "%s\n" "$as_me: perhaps tgetent is in -lncurses" >&6;} fi else -{ $as_echo "$as_me:${as_lineno-$LINENO}: perhaps tgetent is in -lncurses" >&5 -$as_echo "$as_me: perhaps tgetent is in -lncurses" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: perhaps tgetent is in -lncurses" >&5 +printf "%s\n" "$as_me: perhaps tgetent is in -lncurses" >&6;} fi fi @@ -7314,154 +8024,147 @@ fi LDFLAGS=$LDFLAGS0 -for ac_header in ncurses/curses.h ncurses.h curses.h + for ac_header in ncurses/curses.h ncurses.h curses.h do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes" +then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF break fi done - LDFLAGS0=$LDFLAGS LDFLAGS=$LDFLAGS$LDSTATIC -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setupterm in -lncurses" >&5 -$as_echo_n "checking for setupterm in -lncurses... " >&6; } -if ${ac_cv_lib_ncurses_setupterm+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setupterm in -lncurses" >&5 +printf %s "checking for setupterm in -lncurses... " >&6; } +if test ${ac_cv_lib_ncurses_setupterm+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lncurses $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char setupterm (); +namespace conftest { + extern "C" int setupterm (); +} int -main () +main (void) { -return setupterm (); +return conftest::setupterm (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_ncurses_setupterm=yes -else +else $as_nop ac_cv_lib_ncurses_setupterm=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_setupterm" >&5 -$as_echo "$ac_cv_lib_ncurses_setupterm" >&6; } -if test "x$ac_cv_lib_ncurses_setupterm" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_setupterm" >&5 +printf "%s\n" "$ac_cv_lib_ncurses_setupterm" >&6; } +if test "x$ac_cv_lib_ncurses_setupterm" = xyes +then : -$as_echo "#define HAVE_LIBCURSES 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBCURSES 1" >>confdefs.h LIBS=$LIBS$STATIC"-lncurses "$DYNAMIC -else +else $as_nop if test "x$enable_static" = "xyes"; then { ac_cv_lib_ncurses_setupterm=; unset ac_cv_lib_ncurses_setupterm;} LDFLAGS=$LDFLAGS0 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setupterm in -lncurses" >&5 -$as_echo_n "checking for setupterm in -lncurses... " >&6; } -if ${ac_cv_lib_ncurses_setupterm+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setupterm in -lncurses" >&5 +printf %s "checking for setupterm in -lncurses... " >&6; } +if test ${ac_cv_lib_ncurses_setupterm+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lncurses $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char setupterm (); +namespace conftest { + extern "C" int setupterm (); +} int -main () +main (void) { -return setupterm (); +return conftest::setupterm (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_ncurses_setupterm=yes -else +else $as_nop ac_cv_lib_ncurses_setupterm=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_setupterm" >&5 -$as_echo "$ac_cv_lib_ncurses_setupterm" >&6; } -if test "x$ac_cv_lib_ncurses_setupterm" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBNCURSES 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_setupterm" >&5 +printf "%s\n" "$ac_cv_lib_ncurses_setupterm" >&6; } +if test "x$ac_cv_lib_ncurses_setupterm" = xyes +then : + printf "%s\n" "#define HAVE_LIBNCURSES 1" >>confdefs.h LIBS="-lncurses $LIBS" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setupterm in -lcurses" >&5 -$as_echo_n "checking for setupterm in -lcurses... " >&6; } -if ${ac_cv_lib_curses_setupterm+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setupterm in -lcurses" >&5 +printf %s "checking for setupterm in -lcurses... " >&6; } +if test ${ac_cv_lib_curses_setupterm+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char setupterm (); +namespace conftest { + extern "C" int setupterm (); +} int -main () +main (void) { -return setupterm (); +return conftest::setupterm (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_curses_setupterm=yes -else +else $as_nop ac_cv_lib_curses_setupterm=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_setupterm" >&5 -$as_echo "$ac_cv_lib_curses_setupterm" >&6; } -if test "x$ac_cv_lib_curses_setupterm" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBCURSES 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_setupterm" >&5 +printf "%s\n" "$ac_cv_lib_curses_setupterm" >&6; } +if test "x$ac_cv_lib_curses_setupterm" = xyes +then : + printf "%s\n" "#define HAVE_LIBCURSES 1" >>confdefs.h LIBS="-lcurses $LIBS" @@ -7471,46 +8174,43 @@ fi else -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setupterm in -lcurses" >&5 -$as_echo_n "checking for setupterm in -lcurses... " >&6; } -if ${ac_cv_lib_curses_setupterm+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setupterm in -lcurses" >&5 +printf %s "checking for setupterm in -lcurses... " >&6; } +if test ${ac_cv_lib_curses_setupterm+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char setupterm (); +namespace conftest { + extern "C" int setupterm (); +} int -main () +main (void) { -return setupterm (); +return conftest::setupterm (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_curses_setupterm=yes -else +else $as_nop ac_cv_lib_curses_setupterm=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_setupterm" >&5 -$as_echo "$ac_cv_lib_curses_setupterm" >&6; } -if test "x$ac_cv_lib_curses_setupterm" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBCURSES 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_setupterm" >&5 +printf "%s\n" "$ac_cv_lib_curses_setupterm" >&6; } +if test "x$ac_cv_lib_curses_setupterm" = xyes +then : + printf "%s\n" "#define HAVE_LIBCURSES 1" >>confdefs.h LIBS="-lcurses $LIBS" @@ -7525,7 +8225,8 @@ LDFLAGS=$LDFLAGS0 fi # Check whether --enable-fftw was given. -if test "${enable_fftw+set}" = set; then : +if test ${enable_fftw+y} +then : enableval=$enable_fftw; fi @@ -7533,153 +8234,146 @@ fi if test "x$enable_fftw" != "xno"; then CPPFLAGS="$CPPFLAGS "`pkg-config --cflags fftw3` LDFLAGS="$LDFLAGS "`pkg-config --libs fftw3` -ac_fn_cxx_check_header_mongrel "$LINENO" "fftw3.h" "ac_cv_header_fftw3_h" "$ac_includes_default" -if test "x$ac_cv_header_fftw3_h" = xyes; then : +ac_fn_cxx_check_header_compile "$LINENO" "fftw3.h" "ac_cv_header_fftw3_h" "$ac_includes_default" +if test "x$ac_cv_header_fftw3_h" = xyes +then : LDFLAGS0=$LDFLAGS LDFLAGS=$LDFLAGS$LDSTATIC -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_execute in -lfftw3" >&5 -$as_echo_n "checking for fftw_execute in -lfftw3... " >&6; } -if ${ac_cv_lib_fftw3_fftw_execute+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fftw_execute in -lfftw3" >&5 +printf %s "checking for fftw_execute in -lfftw3... " >&6; } +if test ${ac_cv_lib_fftw3_fftw_execute+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lfftw3 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char fftw_execute (); +namespace conftest { + extern "C" int fftw_execute (); +} int -main () +main (void) { -return fftw_execute (); +return conftest::fftw_execute (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_fftw3_fftw_execute=yes -else +else $as_nop ac_cv_lib_fftw3_fftw_execute=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_execute" >&5 -$as_echo "$ac_cv_lib_fftw3_fftw_execute" >&6; } -if test "x$ac_cv_lib_fftw3_fftw_execute" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_execute" >&5 +printf "%s\n" "$ac_cv_lib_fftw3_fftw_execute" >&6; } +if test "x$ac_cv_lib_fftw3_fftw_execute" = xyes +then : -$as_echo "#define HAVE_LIBFFTW3 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBFFTW3 1" >>confdefs.h LIBS=$LIBS$STATIC"-lfftw3 "$DYNAMIC -else +else $as_nop if test "x$enable_static" = "xyes"; then { ac_cv_lib_fftw3_fftw_execute=; unset ac_cv_lib_fftw3_fftw_execute;} LDFLAGS=$LDFLAGS0 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_execute in -lfftw3" >&5 -$as_echo_n "checking for fftw_execute in -lfftw3... " >&6; } -if ${ac_cv_lib_fftw3_fftw_execute+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fftw_execute in -lfftw3" >&5 +printf %s "checking for fftw_execute in -lfftw3... " >&6; } +if test ${ac_cv_lib_fftw3_fftw_execute+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lfftw3 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char fftw_execute (); +namespace conftest { + extern "C" int fftw_execute (); +} int -main () +main (void) { -return fftw_execute (); +return conftest::fftw_execute (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_fftw3_fftw_execute=yes -else +else $as_nop ac_cv_lib_fftw3_fftw_execute=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_execute" >&5 -$as_echo "$ac_cv_lib_fftw3_fftw_execute" >&6; } -if test "x$ac_cv_lib_fftw3_fftw_execute" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBFFTW3 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_execute" >&5 +printf "%s\n" "$ac_cv_lib_fftw3_fftw_execute" >&6; } +if test "x$ac_cv_lib_fftw3_fftw_execute" = xyes +then : + printf "%s\n" "#define HAVE_LIBFFTW3 1" >>confdefs.h LIBS="-lfftw3 $LIBS" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libfftw3: will compile without optional fast Fourier transforms. ***" >&5 -$as_echo "$as_me: *** Could not find libfftw3: will compile without optional fast Fourier transforms. ***" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libfftw3: will compile without optional fast Fourier transforms. ***" >&5 +printf "%s\n" "$as_me: *** Could not find libfftw3: will compile without optional fast Fourier transforms. ***" >&6;} fi else -{ $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libfftw3: will compile without optional fast Fourier transforms. ***" >&5 -$as_echo "$as_me: *** Could not find libfftw3: will compile without optional fast Fourier transforms. ***" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libfftw3: will compile without optional fast Fourier transforms. ***" >&5 +printf "%s\n" "$as_me: *** Could not find libfftw3: will compile without optional fast Fourier transforms. ***" >&6;} fi fi LDFLAGS=$LDFLAGS0 -else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Header file fftw3.h not found: will compile without optional fast Fourier transforms. ***" >&5 -$as_echo "$as_me: *** Header file fftw3.h not found: will compile without optional fast Fourier transforms. ***" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Header file fftw3.h not found: will compile without optional fast Fourier transforms. ***" >&5 +printf "%s\n" "$as_me: *** Header file fftw3.h not found: will compile without optional fast Fourier transforms. ***" >&6;} fi - fi # Check whether --enable-eigen was given. -if test "${enable_eigen+set}" = set; then : +if test ${enable_eigen+y} +then : enableval=$enable_eigen; fi if test "x$enable_eigen" != "xno"; then CPPFLAGS="$CPPFLAGS "`pkg-config --cflags eigen3` -for ac_header in Eigen/Dense -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "Eigen/Dense" "ac_cv_header_Eigen_Dense" "$ac_includes_default" -if test "x$ac_cv_header_Eigen_Dense" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_EIGEN_DENSE 1 -_ACEOF +ac_fn_cxx_check_header_compile "$LINENO" "Eigen/Dense" "ac_cv_header_Eigen_Dense" "$ac_includes_default" +if test "x$ac_cv_header_Eigen_Dense" = xyes +then : + printf "%s\n" "#define HAVE_EIGEN_DENSE 1" >>confdefs.h fi -done - fi # Checks for header files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 -$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } -if ${ac_cv_header_sys_wait_h+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 +printf %s "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } +if test ${ac_cv_header_sys_wait_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> @@ -7692,7 +8386,7 @@ else #endif int -main () +main (void) { int s; wait (&s); @@ -7701,56 +8395,54 @@ main () return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_cv_header_sys_wait_h=yes -else +else $as_nop ac_cv_header_sys_wait_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 -$as_echo "$ac_cv_header_sys_wait_h" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 +printf "%s\n" "$ac_cv_header_sys_wait_h" >&6; } if test $ac_cv_header_sys_wait_h = yes; then -$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h fi -for ac_header in fenv.h stddef.h libintl.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +ac_fn_cxx_check_header_compile "$LINENO" "fenv.h" "ac_cv_header_fenv_h" "$ac_includes_default" +if test "x$ac_cv_header_fenv_h" = xyes +then : + printf "%s\n" "#define HAVE_FENV_H 1" >>confdefs.h fi +ac_fn_cxx_check_header_compile "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default" +if test "x$ac_cv_header_stddef_h" = xyes +then : + printf "%s\n" "#define HAVE_STDDEF_H 1" >>confdefs.h -done - -for ac_header in fpu_control.h -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "fpu_control.h" "ac_cv_header_fpu_control_h" "$ac_includes_default" -if test "x$ac_cv_header_fpu_control_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_FPU_CONTROL_H 1 -_ACEOF +fi +ac_fn_cxx_check_header_compile "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" +if test "x$ac_cv_header_libintl_h" = xyes +then : + printf "%s\n" "#define HAVE_LIBINTL_H 1" >>confdefs.h fi -done +ac_fn_cxx_check_header_compile "$LINENO" "fpu_control.h" "ac_cv_header_fpu_control_h" "$ac_includes_default" +if test "x$ac_cv_header_fpu_control_h" = xyes +then : + printf "%s\n" "#define HAVE_FPU_CONTROL_H 1" >>confdefs.h -for ac_func in feenableexcept -do : - ac_fn_cxx_check_func "$LINENO" "feenableexcept" "ac_cv_func_feenableexcept" -if test "x$ac_cv_func_feenableexcept" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_FEENABLEEXCEPT 1 -_ACEOF +fi + +ac_fn_cxx_check_func "$LINENO" "feenableexcept" "ac_cv_func_feenableexcept" +if test "x$ac_cv_func_feenableexcept" = xyes +then : + printf "%s\n" "#define HAVE_FEENABLEEXCEPT 1" >>confdefs.h fi -done case "$OSTYPE" in @@ -7766,81 +8458,85 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "xstream.h" int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing xdrstdio_create" >&5 -$as_echo_n "checking for library containing xdrstdio_create... " >&6; } -if ${ac_cv_search_xdrstdio_create+:} false; then : - $as_echo_n "(cached) " >&6 -else +if ac_fn_cxx_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing xdrstdio_create" >&5 +printf %s "checking for library containing xdrstdio_create... " >&6; } +if test ${ac_cv_search_xdrstdio_create+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char xdrstdio_create (); +namespace conftest { + extern "C" int xdrstdio_create (); +} int -main () +main (void) { -return xdrstdio_create (); +return conftest::xdrstdio_create (); ; return 0; } _ACEOF -for ac_lib in '' nsl tirpc; do +for ac_lib in '' nsl tirpc +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_cxx_try_link "$LINENO"; then : + if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_search_xdrstdio_create=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_xdrstdio_create+:} false; then : + if test ${ac_cv_search_xdrstdio_create+y} +then : break fi done -if ${ac_cv_search_xdrstdio_create+:} false; then : +if test ${ac_cv_search_xdrstdio_create+y} +then : -else +else $as_nop ac_cv_search_xdrstdio_create=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_xdrstdio_create" >&5 -$as_echo "$ac_cv_search_xdrstdio_create" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_xdrstdio_create" >&5 +printf "%s\n" "$ac_cv_search_xdrstdio_create" >&6; } ac_res=$ac_cv_search_xdrstdio_create -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -$as_echo "#define HAVE_RPC_RPC_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_RPC_RPC_H 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Broken rpc headers; XDR/V3D support disabled ***" >&5 -$as_echo "$as_me: WARNING: *** Broken rpc headers; XDR/V3D support disabled ***" >&2;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** Broken rpc headers; XDR/V3D support disabled ***" >&5 +printf "%s\n" "$as_me: WARNING: *** Broken rpc headers; XDR/V3D support disabled ***" >&2;} fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext # Check whether --enable-gsl was given. -if test "${enable_gsl+set}" = set; then : +if test ${enable_gsl+y} +then : enableval=$enable_gsl; fi @@ -7848,63 +8544,63 @@ fi if test "x$enable_gsl" != "xno"; then CPPFLAGS="$CPPFLAGS "`pkg-config --cflags gsl` LDFLAGS="$LDFLAGS "`pkg-config --libs gsl` - ac_fn_cxx_check_header_mongrel "$LINENO" "gsl/gsl_sf.h" "ac_cv_header_gsl_gsl_sf_h" "$ac_includes_default" -if test "x$ac_cv_header_gsl_gsl_sf_h" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gsl_sf_debye_6 in -lgsl" >&5 -$as_echo_n "checking for gsl_sf_debye_6 in -lgsl... " >&6; } -if ${ac_cv_lib_gsl_gsl_sf_debye_6+:} false; then : - $as_echo_n "(cached) " >&6 -else + ac_fn_cxx_check_header_compile "$LINENO" "gsl/gsl_sf.h" "ac_cv_header_gsl_gsl_sf_h" "$ac_includes_default" +if test "x$ac_cv_header_gsl_gsl_sf_h" = xyes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gsl_sf_debye_6 in -lgsl" >&5 +printf %s "checking for gsl_sf_debye_6 in -lgsl... " >&6; } +if test ${ac_cv_lib_gsl_gsl_sf_debye_6+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lgsl -lgslcblas $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gsl_sf_debye_6 (); +namespace conftest { + extern "C" int gsl_sf_debye_6 (); +} int -main () +main (void) { -return gsl_sf_debye_6 (); +return conftest::gsl_sf_debye_6 (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_gsl_gsl_sf_debye_6=yes -else +else $as_nop ac_cv_lib_gsl_gsl_sf_debye_6=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gsl_gsl_sf_debye_6" >&5 -$as_echo "$ac_cv_lib_gsl_gsl_sf_debye_6" >&6; } -if test "x$ac_cv_lib_gsl_gsl_sf_debye_6" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gsl_gsl_sf_debye_6" >&5 +printf "%s\n" "$ac_cv_lib_gsl_gsl_sf_debye_6" >&6; } +if test "x$ac_cv_lib_gsl_gsl_sf_debye_6" = xyes +then : -$as_echo "#define HAVE_LIBGSL 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBGSL 1" >>confdefs.h LIBS=$LIBS"-lgsl -lgslcblas " -else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libgsl: will compile without optional special functions. ***" >&5 -$as_echo "$as_me: *** Could not find libgsl: will compile without optional special functions. ***" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libgsl: will compile without optional special functions. ***" >&5 +printf "%s\n" "$as_me: *** Could not find libgsl: will compile without optional special functions. ***" >&6;} fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Header file gsl_sf.h not found: will compile without optional special functions. ***" >&5 -$as_echo "$as_me: *** Header file gsl_sf.h not found: will compile without optional special functions. ***" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Header file gsl_sf.h not found: will compile without optional special functions. ***" >&5 +printf "%s\n" "$as_me: *** Header file gsl_sf.h not found: will compile without optional special functions. ***" >&6;} fi - fi # Check whether --enable-gl was given. -if test "${enable_gl+set}" = set; then : +if test ${enable_gl+y} +then : enableval=$enable_gl; fi @@ -7917,19 +8613,20 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : -$as_echo "#define HAVE_SSBO 1" >>confdefs.h +printf "%s\n" "#define HAVE_SSBO 1" >>confdefs.h fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7939,103 +8636,105 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : -$as_echo "#define HAVE_COMPUTE_SHADER 1" >>confdefs.h +printf "%s\n" "#define HAVE_COMPUTE_SHADER 1" >>confdefs.h fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext # Check whether --enable-offscreen was given. -if test "${enable_offscreen+set}" = set; then : +if test ${enable_offscreen+y} +then : enableval=$enable_offscreen; fi # Check whether --enable-OpenImageIO was given. -if test "${enable_OpenImageIO+set}" = set; then : +if test ${enable_OpenImageIO+y} +then : enableval=$enable_OpenImageIO; fi - ac_fn_cxx_check_header_mongrel "$LINENO" "glm/glm.hpp" "ac_cv_header_glm_glm_hpp" "$ac_includes_default" -if test "x$ac_cv_header_glm_glm_hpp" = xyes; then : + ac_fn_cxx_check_header_compile "$LINENO" "glm/glm.hpp" "ac_cv_header_glm_glm_hpp" "$ac_includes_default" +if test "x$ac_cv_header_glm_glm_hpp" = xyes +then : -$as_echo "#define HAVE_LIBGLM 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBGLM 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find glm header files: will compile without WebGL or OpenGL support ***" >&5 -$as_echo "$as_me: *** Could not find glm header files: will compile without WebGL or OpenGL support ***" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find glm header files: will compile without WebGL or OpenGL support ***" >&5 +printf "%s\n" "$as_me: *** Could not find glm header files: will compile without WebGL or OpenGL support ***" >&6;} fi - if test "x$enable_gl" != "xno"; then - for ac_header in ncurses/curses.h ncurses.h curses.h + for ac_header in ncurses/curses.h ncurses.h curses.h do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes" +then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF break fi done - if test "x$enable_openimageio" = "xyes"; then - ac_fn_cxx_check_header_mongrel "$LINENO" "OpenEXR/ImathVec.h" "ac_cv_header_OpenEXR_ImathVec_h" "$ac_includes_default" -if test "x$ac_cv_header_OpenEXR_ImathVec_h" = xyes; then : - ac_fn_cxx_check_header_mongrel "$LINENO" "OpenImageIO/imageio.h" "ac_cv_header_OpenImageIO_imageio_h" "$ac_includes_default" -if test "x$ac_cv_header_OpenImageIO_imageio_h" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for open in -lOpenImageIO" >&5 -$as_echo_n "checking for open in -lOpenImageIO... " >&6; } -if ${ac_cv_lib_OpenImageIO_open+:} false; then : - $as_echo_n "(cached) " >&6 -else + ac_fn_cxx_check_header_compile "$LINENO" "OpenEXR/ImathVec.h" "ac_cv_header_OpenEXR_ImathVec_h" "$ac_includes_default" +if test "x$ac_cv_header_OpenEXR_ImathVec_h" = xyes +then : + ac_fn_cxx_check_header_compile "$LINENO" "OpenImageIO/imageio.h" "ac_cv_header_OpenImageIO_imageio_h" "$ac_includes_default" +if test "x$ac_cv_header_OpenImageIO_imageio_h" = xyes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for open in -lOpenImageIO" >&5 +printf %s "checking for open in -lOpenImageIO... " >&6; } +if test ${ac_cv_lib_OpenImageIO_open+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lOpenImageIO $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char open (); +namespace conftest { + extern "C" int open (); +} int -main () +main (void) { -return open (); +return conftest::open (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_OpenImageIO_open=yes -else +else $as_nop ac_cv_lib_OpenImageIO_open=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_OpenImageIO_open" >&5 -$as_echo "$ac_cv_lib_OpenImageIO_open" >&6; } -if test "x$ac_cv_lib_OpenImageIO_open" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBOPENIMAGEIO 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_OpenImageIO_open" >&5 +printf "%s\n" "$ac_cv_lib_OpenImageIO_open" >&6; } +if test "x$ac_cv_lib_OpenImageIO_open" = xyes +then : + printf "%s\n" "#define HAVE_LIBOPENIMAGEIO 1" >>confdefs.h LIBS="-lOpenImageIO $LIBS" @@ -8043,450 +8742,454 @@ fi fi - fi - fi case "$OSTYPE" in msdos) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_throw_bad_alloc in -lgccpp" >&5 -$as_echo_n "checking for GC_throw_bad_alloc in -lgccpp... " >&6; } -if ${ac_cv_lib_gccpp_GC_throw_bad_alloc+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GC_throw_bad_alloc in -lgccpp" >&5 +printf %s "checking for GC_throw_bad_alloc in -lgccpp... " >&6; } +if test ${ac_cv_lib_gccpp_GC_throw_bad_alloc+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lgccpp $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char GC_throw_bad_alloc (); +namespace conftest { + extern "C" int GC_throw_bad_alloc (); +} int -main () +main (void) { -return GC_throw_bad_alloc (); +return conftest::GC_throw_bad_alloc (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_gccpp_GC_throw_bad_alloc=yes -else +else $as_nop ac_cv_lib_gccpp_GC_throw_bad_alloc=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gccpp_GC_throw_bad_alloc" >&5 -$as_echo "$ac_cv_lib_gccpp_GC_throw_bad_alloc" >&6; } -if test "x$ac_cv_lib_gccpp_GC_throw_bad_alloc" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGCCPP 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gccpp_GC_throw_bad_alloc" >&5 +printf "%s\n" "$ac_cv_lib_gccpp_GC_throw_bad_alloc" >&6; } +if test "x$ac_cv_lib_gccpp_GC_throw_bad_alloc" = xyes +then : + printf "%s\n" "#define HAVE_LIBGCCPP 1" >>confdefs.h LIBS="-lgccpp $LIBS" fi - ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default" -if test "x$ac_cv_header_GL_glut_h" = xyes; then : + ac_fn_cxx_check_header_compile "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default" +if test "x$ac_cv_header_GL_glut_h" = xyes +then : -$as_echo "#define HAVE_LIBGLUT 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBGLUT 1" >>confdefs.h LIBS=$LIBS"-lfreeglut " -else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libfreeglut: will compile without OpenGL support ***" >&5 -$as_echo "$as_me: *** Could not find libfreeglut: will compile without OpenGL support ***" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libfreeglut: will compile without OpenGL support ***" >&5 +printf "%s\n" "$as_me: *** Could not find libfreeglut: will compile without OpenGL support ***" >&6;} fi + ac_fn_cxx_check_header_compile "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" +if test "x$ac_cv_header_GL_gl_h" = xyes +then : - ac_fn_cxx_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" -if test "x$ac_cv_header_GL_gl_h" = xyes; then : - -$as_echo "#define HAVE_LIBGL 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBGL 1" >>confdefs.h LIBS=$LIBS"-lopengl32 " GLEW="glew.o " -else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libopengl32: will compile without OpenGL support ***" >&5 -$as_echo "$as_me: *** Could not find libopengl32: will compile without OpenGL support ***" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libopengl32: will compile without OpenGL support ***" >&5 +printf "%s\n" "$as_me: *** Could not find libopengl32: will compile without OpenGL support ***" >&6;} fi - ;; darwin*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_throw_bad_alloc in -lgccpp" >&5 -$as_echo_n "checking for GC_throw_bad_alloc in -lgccpp... " >&6; } -if ${ac_cv_lib_gccpp_GC_throw_bad_alloc+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GC_throw_bad_alloc in -lgccpp" >&5 +printf %s "checking for GC_throw_bad_alloc in -lgccpp... " >&6; } +if test ${ac_cv_lib_gccpp_GC_throw_bad_alloc+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lgccpp $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char GC_throw_bad_alloc (); +namespace conftest { + extern "C" int GC_throw_bad_alloc (); +} int -main () +main (void) { -return GC_throw_bad_alloc (); +return conftest::GC_throw_bad_alloc (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_gccpp_GC_throw_bad_alloc=yes -else +else $as_nop ac_cv_lib_gccpp_GC_throw_bad_alloc=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gccpp_GC_throw_bad_alloc" >&5 -$as_echo "$ac_cv_lib_gccpp_GC_throw_bad_alloc" >&6; } -if test "x$ac_cv_lib_gccpp_GC_throw_bad_alloc" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGCCPP 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gccpp_GC_throw_bad_alloc" >&5 +printf "%s\n" "$ac_cv_lib_gccpp_GC_throw_bad_alloc" >&6; } +if test "x$ac_cv_lib_gccpp_GC_throw_bad_alloc" = xyes +then : + printf "%s\n" "#define HAVE_LIBGCCPP 1" >>confdefs.h LIBS="-lgccpp $LIBS" fi - ac_fn_cxx_check_header_mongrel "$LINENO" "OpenGL/gl.h" "ac_cv_header_OpenGL_gl_h" "$ac_includes_default" -if test "x$ac_cv_header_OpenGL_gl_h" = xyes; then : + ac_fn_cxx_check_header_compile "$LINENO" "OpenGL/gl.h" "ac_cv_header_OpenGL_gl_h" "$ac_includes_default" +if test "x$ac_cv_header_OpenGL_gl_h" = xyes +then : -$as_echo "#define HAVE_LIBGL 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBGL 1" >>confdefs.h fi + ac_fn_cxx_check_header_compile "$LINENO" "GLUT/glut.h" "ac_cv_header_GLUT_glut_h" "$ac_includes_default" +if test "x$ac_cv_header_GLUT_glut_h" = xyes +then : - ac_fn_cxx_check_header_mongrel "$LINENO" "GLUT/glut.h" "ac_cv_header_GLUT_glut_h" "$ac_includes_default" -if test "x$ac_cv_header_GLUT_glut_h" = xyes; then : - -$as_echo "#define HAVE_LIBGLUT 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBGLUT 1" >>confdefs.h LIBS=$LIBS"-framework GLUT -framework OpenGL -framework Cocoa " GLEW="glew.o " -else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find GLUT: will compile without OpenGLLUT support ***" >&5 -$as_echo "$as_me: *** Could not find GLUT: will compile without OpenGLLUT support ***" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find GLUT: will compile without OpenGLLUT support ***" >&5 +printf "%s\n" "$as_me: *** Could not find GLUT: will compile without OpenGLLUT support ***" >&6;} fi - ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_throw_bad_alloc in -lgccpp" >&5 -$as_echo_n "checking for GC_throw_bad_alloc in -lgccpp... " >&6; } -if ${ac_cv_lib_gccpp_GC_throw_bad_alloc+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GC_throw_bad_alloc in -lgccpp" >&5 +printf %s "checking for GC_throw_bad_alloc in -lgccpp... " >&6; } +if test ${ac_cv_lib_gccpp_GC_throw_bad_alloc+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lgccpp $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char GC_throw_bad_alloc (); +namespace conftest { + extern "C" int GC_throw_bad_alloc (); +} int -main () +main (void) { -return GC_throw_bad_alloc (); +return conftest::GC_throw_bad_alloc (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_gccpp_GC_throw_bad_alloc=yes -else +else $as_nop ac_cv_lib_gccpp_GC_throw_bad_alloc=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gccpp_GC_throw_bad_alloc" >&5 -$as_echo "$ac_cv_lib_gccpp_GC_throw_bad_alloc" >&6; } -if test "x$ac_cv_lib_gccpp_GC_throw_bad_alloc" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGCCPP 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gccpp_GC_throw_bad_alloc" >&5 +printf "%s\n" "$ac_cv_lib_gccpp_GC_throw_bad_alloc" >&6; } +if test "x$ac_cv_lib_gccpp_GC_throw_bad_alloc" = xyes +then : + printf "%s\n" "#define HAVE_LIBGCCPP 1" >>confdefs.h LIBS="-lgccpp $LIBS" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glutMainLoop in -lglut" >&5 -$as_echo_n "checking for glutMainLoop in -lglut... " >&6; } -if ${ac_cv_lib_glut_glutMainLoop+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glutMainLoop in -lglut" >&5 +printf %s "checking for glutMainLoop in -lglut... " >&6; } +if test ${ac_cv_lib_glut_glutMainLoop+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lglut $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char glutMainLoop (); +namespace conftest { + extern "C" int glutMainLoop (); +} int -main () +main (void) { -return glutMainLoop (); +return conftest::glutMainLoop (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_glut_glutMainLoop=yes -else +else $as_nop ac_cv_lib_glut_glutMainLoop=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_glut_glutMainLoop" >&5 -$as_echo "$ac_cv_lib_glut_glutMainLoop" >&6; } -if test "x$ac_cv_lib_glut_glutMainLoop" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLUT 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_glut_glutMainLoop" >&5 +printf "%s\n" "$ac_cv_lib_glut_glutMainLoop" >&6; } +if test "x$ac_cv_lib_glut_glutMainLoop" = xyes +then : + printf "%s\n" "#define HAVE_LIBGLUT 1" >>confdefs.h LIBS="-lglut $LIBS" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libglut: will compile without OpenGL support ***" >&5 -$as_echo "$as_me: *** Could not find libglut: will compile without OpenGL support ***" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libglut: will compile without OpenGL support ***" >&5 +printf "%s\n" "$as_me: *** Could not find libglut: will compile without OpenGL support ***" >&6;} fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glDepthMask in -lGL" >&5 -$as_echo_n "checking for glDepthMask in -lGL... " >&6; } -if ${ac_cv_lib_GL_glDepthMask+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glDepthMask in -lGL" >&5 +printf %s "checking for glDepthMask in -lGL... " >&6; } +if test ${ac_cv_lib_GL_glDepthMask+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lGL $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char glDepthMask (); +namespace conftest { + extern "C" int glDepthMask (); +} int -main () +main (void) { -return glDepthMask (); +return conftest::glDepthMask (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_GL_glDepthMask=yes -else +else $as_nop ac_cv_lib_GL_glDepthMask=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glDepthMask" >&5 -$as_echo "$ac_cv_lib_GL_glDepthMask" >&6; } -if test "x$ac_cv_lib_GL_glDepthMask" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glDepthMask" >&5 +printf "%s\n" "$ac_cv_lib_GL_glDepthMask" >&6; } +if test "x$ac_cv_lib_GL_glDepthMask" = xyes +then : -$as_echo "#define HAVE_LIBGL 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBGL 1" >>confdefs.h LIBS=$LIBS"-lGL " GLEW="glew.o " - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glXGetProcAddressARB in -lGLX" >&5 -$as_echo_n "checking for glXGetProcAddressARB in -lGLX... " >&6; } -if ${ac_cv_lib_GLX_glXGetProcAddressARB+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glXGetProcAddressARB in -lGLX" >&5 +printf %s "checking for glXGetProcAddressARB in -lGLX... " >&6; } +if test ${ac_cv_lib_GLX_glXGetProcAddressARB+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lGLX $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char glXGetProcAddressARB (); +namespace conftest { + extern "C" int glXGetProcAddressARB (); +} int -main () +main (void) { -return glXGetProcAddressARB (); +return conftest::glXGetProcAddressARB (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_GLX_glXGetProcAddressARB=yes -else +else $as_nop ac_cv_lib_GLX_glXGetProcAddressARB=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLX_glXGetProcAddressARB" >&5 -$as_echo "$ac_cv_lib_GLX_glXGetProcAddressARB" >&6; } -if test "x$ac_cv_lib_GLX_glXGetProcAddressARB" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLX_glXGetProcAddressARB" >&5 +printf "%s\n" "$ac_cv_lib_GLX_glXGetProcAddressARB" >&6; } +if test "x$ac_cv_lib_GLX_glXGetProcAddressARB" = xyes +then : GLEW=$GLEW"-lGLX " fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libGL: will compile without OpenGL support ***" >&5 -$as_echo "$as_me: *** Could not find libGL: will compile without OpenGL support ***" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libGL: will compile without OpenGL support ***" >&5 +printf "%s\n" "$as_me: *** Could not find libGL: will compile without OpenGL support ***" >&6;} fi esac if test "x$enable_offscreen" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSMesaCreateContext in -lOSMesa" >&5 -$as_echo_n "checking for OSMesaCreateContext in -lOSMesa... " >&6; } -if ${ac_cv_lib_OSMesa_OSMesaCreateContext+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OSMesaCreateContext in -lOSMesa" >&5 +printf %s "checking for OSMesaCreateContext in -lOSMesa... " >&6; } +if test ${ac_cv_lib_OSMesa_OSMesaCreateContext+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lOSMesa $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char OSMesaCreateContext (); +namespace conftest { + extern "C" int OSMesaCreateContext (); +} int -main () +main (void) { -return OSMesaCreateContext (); +return conftest::OSMesaCreateContext (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_OSMesa_OSMesaCreateContext=yes -else +else $as_nop ac_cv_lib_OSMesa_OSMesaCreateContext=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_OSMesa_OSMesaCreateContext" >&5 -$as_echo "$ac_cv_lib_OSMesa_OSMesaCreateContext" >&6; } -if test "x$ac_cv_lib_OSMesa_OSMesaCreateContext" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBOSMESA 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_OSMesa_OSMesaCreateContext" >&5 +printf "%s\n" "$ac_cv_lib_OSMesa_OSMesaCreateContext" >&6; } +if test "x$ac_cv_lib_OSMesa_OSMesaCreateContext" = xyes +then : + printf "%s\n" "#define HAVE_LIBOSMESA 1" >>confdefs.h LIBS="-lOSMesa $LIBS" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libOSMesa: will compile without offscreen rendering support ***" >&5 -$as_echo "$as_me: *** Could not find libOSMesa: will compile without offscreen rendering support ***" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libOSMesa: will compile without offscreen rendering support ***" >&5 +printf "%s\n" "$as_me: *** Could not find libOSMesa: will compile without offscreen rendering support ***" >&6;} fi fi fi # Checks for typedefs, structures, and compiler characteristics. -ac_fn_cxx_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" -if test "x$ac_cv_type_pid_t" = xyes; then : -else + ac_fn_cxx_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default +" +if test "x$ac_cv_type_pid_t" = xyes +then : + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #if defined _WIN64 && !defined __CYGWIN__ + LLP64 + #endif + +int +main (void) +{ + + ; + return 0; +} -cat >>confdefs.h <<_ACEOF -#define pid_t int _ACEOF +if ac_fn_cxx_try_compile "$LINENO" +then : + ac_pid_type='int' +else $as_nop + ac_pid_type='__int64' +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h + fi + ac_fn_cxx_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = xyes; then : +if test "x$ac_cv_type_size_t" = xyes +then : -else +else $as_nop -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF +printf "%s\n" "#define size_t unsigned int" >>confdefs.h fi ac_fn_cxx_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default" -if test "x$ac_cv_type_ptrdiff_t" = xyes; then : +if test "x$ac_cv_type_ptrdiff_t" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_PTRDIFF_T 1 -_ACEOF +printf "%s\n" "#define HAVE_PTRDIFF_T 1" >>confdefs.h fi ac_fn_cxx_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default" -if test "x$ac_cv_type_long_long" = xyes; then : +if test "x$ac_cv_type_long_long" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_LONG_LONG 1 -_ACEOF +printf "%s\n" "#define HAVE_LONG_LONG 1" >>confdefs.h fi ac_fn_cxx_check_type "$LINENO" "long" "ac_cv_type_long" "$ac_includes_default" -if test "x$ac_cv_type_long" = xyes; then : +if test "x$ac_cv_type_long" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_LONG 1 -_ACEOF +printf "%s\n" "#define HAVE_LONG 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if ${ac_cv_c_const+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +printf %s "checking for an ANSI C-conforming const... " >&6; } +if test ${ac_cv_c_const+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __cplusplus @@ -8499,7 +9202,7 @@ main () /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. + /* IBM XL C 1.02.0.0 rejects this. It does not let you subtract one const X* pointer from another in an arm of an if-expression whose if-part is not a constant expression */ @@ -8527,7 +9230,7 @@ main () iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying + { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ struct s { int j; const int *ap[3]; } bx; struct s *b = &bx; b->j = 5; @@ -8543,47 +9246,50 @@ main () return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_cv_c_const=yes -else +else $as_nop ac_cv_c_const=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -$as_echo "$ac_cv_c_const" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +printf "%s\n" "$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then -$as_echo "#define const /**/" >>confdefs.h +printf "%s\n" "#define const /**/" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if ${ac_cv_c_inline+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +printf %s "checking for inline... " >&6; } +if test ${ac_cv_c_inline+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __cplusplus typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } +static $ac_kw foo_t static_foo (void) {return 0; } +$ac_kw foo_t foo (void) {return 0; } #endif _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_cv_c_inline=$ac_kw fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext test "$ac_cv_c_inline" != no && break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +printf "%s\n" "$ac_cv_c_inline" >&6; } case $ac_cv_c_inline in inline | yes) ;; @@ -8602,44 +9308,53 @@ esac # Checks for library functions. -for ac_header in vfork.h -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default" -if test "x$ac_cv_header_vfork_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_VFORK_H 1 -_ACEOF - -fi - +ac_header= ac_cache= +for ac_item in $ac_header_cxx_list +do + if test $ac_cache; then + ac_fn_cxx_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done +ac_func= +for ac_item in $ac_func_cxx_list +do + if test $ac_func; then + ac_fn_cxx_check_func "$LINENO" $ac_func ac_cv_func_$ac_func + if eval test \"x\$ac_cv_func_$ac_func\" = xyes; then + echo "#define $ac_item 1" >> confdefs.h + fi + ac_func= + else + ac_func=$ac_item + fi done -for ac_func in fork vfork -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi -done if test "x$ac_cv_func_fork" = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 -$as_echo_n "checking for working fork... " >&6; } -if ${ac_cv_func_fork_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 +printf %s "checking for working fork... " >&6; } +if test ${ac_cv_func_fork_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "$cross_compiling" = yes +then : ac_cv_func_fork_works=cross -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int -main () +main (void) { /* By Ruediger Kuhlmann. */ @@ -8649,9 +9364,10 @@ main () return 0; } _ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : +if ac_fn_cxx_try_run "$LINENO" +then : ac_cv_func_fork_works=yes -else +else $as_nop ac_cv_func_fork_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -8659,8 +9375,8 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5 -$as_echo "$ac_cv_func_fork_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5 +printf "%s\n" "$ac_cv_func_fork_works" >&6; } else ac_cv_func_fork_works=$ac_cv_func_fork @@ -8675,27 +9391,37 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 -$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 +printf "%s\n" "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} fi ac_cv_func_vfork_works=$ac_cv_func_vfork if test "x$ac_cv_func_vfork" = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5 -$as_echo_n "checking for working vfork... " >&6; } -if ${ac_cv_func_vfork_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5 +printf %s "checking for working vfork... " >&6; } +if test ${ac_cv_func_vfork_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "$cross_compiling" = yes +then : ac_cv_func_vfork_works=cross -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Thanks to Paul Eggert for this test. */ $ac_includes_default +#include <signal.h> #include <sys/wait.h> #ifdef HAVE_VFORK_H # include <vfork.h> #endif + +static void +do_nothing (int sig) +{ + (void) sig; +} + /* On some sparc systems, changes by the child to local and incoming argument registers are propagated back to the parent. The compiler is told about this with #include <vfork.h>, but some compilers @@ -8703,11 +9429,7 @@ $ac_includes_default static variable whose address is put into a register that is clobbered by the vfork. */ static void -#ifdef __cplusplus sparc_address_test (int arg) -# else -sparc_address_test (arg) int arg; -#endif { static pid_t child; if (!child) { @@ -8725,13 +9447,18 @@ sparc_address_test (arg) int arg; } int -main () +main (void) { pid_t parent = getpid (); pid_t child; sparc_address_test (0); + /* On Solaris 2.4, changes by the child to the signal handler + also munge signal handlers in the parent. To detect this, + start by putting the parent's handler in a known state. */ + signal (SIGTERM, SIG_DFL); + child = vfork (); if (child == 0) { @@ -8753,6 +9480,10 @@ main () || p != p5 || p != p6 || p != p7) _exit(1); + /* Alter the child's signal handler. */ + if (signal (SIGTERM, do_nothing) != SIG_DFL) + _exit(1); + /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent from child file descriptors. If the child closes a descriptor before it execs or exits, this munges the parent's descriptor @@ -8768,6 +9499,9 @@ main () /* Was there some problem with vforking? */ child < 0 + /* Did the child munge the parent's signal handler? */ + || signal (SIGTERM, SIG_DFL) != SIG_DFL + /* Did the child fail? (This shouldn't happen.) */ || status @@ -8780,9 +9514,10 @@ main () } } _ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : +if ac_fn_cxx_try_run "$LINENO" +then : ac_cv_func_vfork_works=yes -else +else $as_nop ac_cv_func_vfork_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -8790,124 +9525,162 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5 -$as_echo "$ac_cv_func_vfork_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5 +printf "%s\n" "$ac_cv_func_vfork_works" >&6; } fi; if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_vfork_works=$ac_cv_func_vfork - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 -$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 +printf "%s\n" "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} fi if test "x$ac_cv_func_vfork_works" = xyes; then -$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h +printf "%s\n" "#define HAVE_WORKING_VFORK 1" >>confdefs.h else -$as_echo "#define vfork fork" >>confdefs.h +printf "%s\n" "#define vfork fork" >>confdefs.h fi if test "x$ac_cv_func_fork_works" = xyes; then -$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h +printf "%s\n" "#define HAVE_WORKING_FORK 1" >>confdefs.h fi -for ac_func in dup2 floor memset strchr tgamma lgamma memrchr popcount -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +ac_fn_cxx_check_func "$LINENO" "dup2" "ac_cv_func_dup2" +if test "x$ac_cv_func_dup2" = xyes +then : + printf "%s\n" "#define HAVE_DUP2 1" >>confdefs.h fi -done +ac_fn_cxx_check_func "$LINENO" "floor" "ac_cv_func_floor" +if test "x$ac_cv_func_floor" = xyes +then : + printf "%s\n" "#define HAVE_FLOOR 1" >>confdefs.h + +fi +ac_fn_cxx_check_func "$LINENO" "memset" "ac_cv_func_memset" +if test "x$ac_cv_func_memset" = xyes +then : + printf "%s\n" "#define HAVE_MEMSET 1" >>confdefs.h + +fi +ac_fn_cxx_check_func "$LINENO" "strchr" "ac_cv_func_strchr" +if test "x$ac_cv_func_strchr" = xyes +then : + printf "%s\n" "#define HAVE_STRCHR 1" >>confdefs.h + +fi +ac_fn_cxx_check_func "$LINENO" "tgamma" "ac_cv_func_tgamma" +if test "x$ac_cv_func_tgamma" = xyes +then : + printf "%s\n" "#define HAVE_TGAMMA 1" >>confdefs.h + +fi +ac_fn_cxx_check_func "$LINENO" "lgamma" "ac_cv_func_lgamma" +if test "x$ac_cv_func_lgamma" = xyes +then : + printf "%s\n" "#define HAVE_LGAMMA 1" >>confdefs.h -for ac_func in strftime +fi +ac_fn_cxx_check_func "$LINENO" "memrchr" "ac_cv_func_memrchr" +if test "x$ac_cv_func_memrchr" = xyes +then : + printf "%s\n" "#define HAVE_MEMRCHR 1" >>confdefs.h + +fi +ac_fn_cxx_check_func "$LINENO" "popcount" "ac_cv_func_popcount" +if test "x$ac_cv_func_popcount" = xyes +then : + printf "%s\n" "#define HAVE_POPCOUNT 1" >>confdefs.h + +fi + + + for ac_func in strftime do : ac_fn_cxx_check_func "$LINENO" "strftime" "ac_cv_func_strftime" -if test "x$ac_cv_func_strftime" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRFTIME 1 -_ACEOF +if test "x$ac_cv_func_strftime" = xyes +then : + printf "%s\n" "#define HAVE_STRFTIME 1" >>confdefs.h -else +else $as_nop # strftime is in -lintl on SCO UNIX. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5 -$as_echo_n "checking for strftime in -lintl... " >&6; } -if ${ac_cv_lib_intl_strftime+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5 +printf %s "checking for strftime in -lintl... " >&6; } +if test ${ac_cv_lib_intl_strftime+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char strftime (); +namespace conftest { + extern "C" int strftime (); +} int -main () +main (void) { -return strftime (); +return conftest::strftime (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_intl_strftime=yes -else +else $as_nop ac_cv_lib_intl_strftime=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5 -$as_echo "$ac_cv_lib_intl_strftime" >&6; } -if test "x$ac_cv_lib_intl_strftime" = xyes; then : - $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5 +printf "%s\n" "$ac_cv_lib_intl_strftime" >&6; } +if test "x$ac_cv_lib_intl_strftime" = xyes +then : + printf "%s\n" "#define HAVE_STRFTIME 1" >>confdefs.h LIBS="-lintl $LIBS" fi fi -done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 -$as_echo_n "checking for error_at_line... " >&6; } -if ${ac_cv_lib_error_at_line+:} false; then : - $as_echo_n "(cached) " >&6 -else +done +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 +printf %s "checking for error_at_line... " >&6; } +if test ${ac_cv_lib_error_at_line+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <error.h> int -main () +main (void) { error_at_line (0, 0, "", 0, "an error occurred"); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_lib_error_at_line=yes -else +else $as_nop ac_cv_lib_error_at_line=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 -$as_echo "$ac_cv_lib_error_at_line" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 +printf "%s\n" "$ac_cv_lib_error_at_line" >&6; } if test $ac_cv_lib_error_at_line = no; then case " $LIBOBJS " in *" error.$ac_objext "* ) ;; @@ -8917,18 +9690,19 @@ esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } -if ${ac_cv_sys_largefile_source+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 +printf %s "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } +if test ${ac_cv_sys_largefile_source+y} +then : + printf %s "(cached) " >&6 +else $as_nop while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> /* for off_t */ #include <stdio.h> int -main () +main (void) { int (*fp) (FILE *, off_t, int) = fseeko; return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); @@ -8936,10 +9710,11 @@ int (*fp) (FILE *, off_t, int) = fseeko; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_sys_largefile_source=no; break fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8947,7 +9722,7 @@ rm -f core conftest.err conftest.$ac_objext \ #include <sys/types.h> /* for off_t */ #include <stdio.h> int -main () +main (void) { int (*fp) (FILE *, off_t, int) = fseeko; return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); @@ -8955,23 +9730,22 @@ int (*fp) (FILE *, off_t, int) = fseeko; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : ac_cv_sys_largefile_source=1; break fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext ac_cv_sys_largefile_source=unknown break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 -$as_echo "$ac_cv_sys_largefile_source" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 +printf "%s\n" "$ac_cv_sys_largefile_source" >&6; } case $ac_cv_sys_largefile_source in #( no | unknown) ;; *) -cat >>confdefs.h <<_ACEOF -#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source -_ACEOF +printf "%s\n" "#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source" >>confdefs.h ;; esac rm -rf conftest* @@ -8981,32 +9755,24 @@ rm -rf conftest* # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. if test $ac_cv_sys_largefile_source != unknown; then -$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h +printf "%s\n" "#define HAVE_FSEEKO 1" >>confdefs.h fi -for ac_func in strptime -do : - ac_fn_cxx_check_func "$LINENO" "strptime" "ac_cv_func_strptime" -if test "x$ac_cv_func_strptime" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRPTIME 1 -_ACEOF +ac_fn_cxx_check_func "$LINENO" "strptime" "ac_cv_func_strptime" +if test "x$ac_cv_func_strptime" = xyes +then : + printf "%s\n" "#define HAVE_STRPTIME 1" >>confdefs.h fi -done -for ac_func in strnlen -do : - ac_fn_cxx_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen" -if test "x$ac_cv_func_strnlen" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRNLEN 1 -_ACEOF +ac_fn_cxx_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen" +if test "x$ac_cv_func_strnlen" = xyes +then : + printf "%s\n" "#define HAVE_STRNLEN 1" >>confdefs.h fi -done ac_config_headers="$ac_config_headers config.h" @@ -9041,8 +9807,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -9072,15 +9838,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -9094,8 +9860,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;} fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -9112,7 +9878,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -9129,8 +9895,8 @@ LTLIBOBJS=$ac_ltlibobjs ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -9153,14 +9919,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -9170,46 +9938,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi +if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -9218,13 +9986,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -9233,8 +9994,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -9246,30 +10011,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -9282,13 +10027,14 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -9315,18 +10061,20 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset + # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -9338,12 +10086,13 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -9374,7 +10123,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -9396,6 +10145,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -9409,6 +10162,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -9450,7 +10209,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -9459,7 +10218,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -9521,8 +10280,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Asymptote $as_me 2.83, which was -generated by GNU Autoconf 2.69. Invocation command line was +This file was extended by Asymptote $as_me 2.84, which was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -9580,14 +10339,16 @@ $config_headers Report bugs to <https://github.com/vectorgraphics/asymptote/issues>." _ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -Asymptote config.status 2.83 -configured by $0, generated by GNU Autoconf 2.69, +Asymptote config.status 2.84 +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -9625,15 +10386,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -9641,7 +10402,7 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -9650,7 +10411,7 @@ do as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -9678,7 +10439,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -9692,7 +10453,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF @@ -9720,8 +10481,8 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files + test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers fi # Have a temporary directory for convenience. Make it in the build tree @@ -10057,7 +10818,7 @@ do esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -10065,17 +10826,17 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -10092,7 +10853,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -10116,9 +10877,9 @@ $as_echo X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -10175,8 +10936,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -10219,9 +10980,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -10237,20 +10998,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} # if test x"$ac_file" != x-; then { - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi @@ -10291,18 +11052,19 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi if test "x$GCDIR" != "x" ; then - as_ac_File=`$as_echo "ac_cv_file_$GCDIR.tar.gz" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $GCDIR.tar.gz" >&5 -$as_echo_n "checking for $GCDIR.tar.gz... " >&6; } -if eval \${$as_ac_File+:} false; then : - $as_echo_n "(cached) " >&6 -else + as_ac_File=`printf "%s\n" "ac_cv_file_$GCDIR.tar.gz" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $GCDIR.tar.gz" >&5 +printf %s "checking for $GCDIR.tar.gz... " >&6; } +if eval test \${$as_ac_File+y} +then : + printf %s "(cached) " >&6 +else $as_nop test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "$GCDIR.tar.gz"; then @@ -10312,11 +11074,12 @@ else fi fi eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_File"\" = x"yes"; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_File"\" = x"yes" +then : -else +else $as_nop echo echo Please put the Boehm garbage collector tar.gz files in the asymptote directory. @@ -10331,3 +11094,4 @@ else fi fi + diff --git a/graphics/asymptote/configure.ac b/graphics/asymptote/configure.ac index 6b8ef2f27a..cdd5e26b48 100644 --- a/graphics/asymptote/configure.ac +++ b/graphics/asymptote/configure.ac @@ -3,7 +3,7 @@ # this file. AC_PREREQ(2) -AC_INIT([Asymptote],[2.83],[https://github.com/vectorgraphics/asymptote/issues]) +AC_INIT([Asymptote],[2.84],[https://github.com/vectorgraphics/asymptote/issues]) VERSION=$PACKAGE_VERSION AC_SUBST(VERSION) m4_include([ax_pthread.m4]) @@ -114,7 +114,14 @@ AC_PROG_CXX AC_PROG_INSTALL AC_PROG_CC AC_PROG_MAKE_SET -AC_PROG_YACC + +AC_ARG_VAR([BISON], [bison command]) +AC_CHECK_PROG([BISON], [bison -y], [yes], [no]) +AS_IF([test "x$BISON" = "xno"], [AC_MSG_ERROR([bison not found])]) + +AC_ARG_VAR([FLEX], [flex command]) +AC_CHECK_PROG([FLEX], [flex -y], [yes], [no]) +AS_IF([test "x$FLEX" = "xno"], [AC_MSG_ERROR([flex not found])]) if test "$GXX" = yes ; then ac_gcc_version=`echo __GNUC__ | $CC -E - | grep -v ^\#` @@ -169,7 +176,7 @@ enable system Boehm garbage collector)] fi ]) -OPTIONS="-D_FILE_OFFSET_BITS=64 " +OPTIONS="-D_FILE_OFFSET_BIS=64 " GCLIB= GCPPLIB= INCL="-I." @@ -259,8 +266,8 @@ AC_SUBST(OPTIONS) AC_SUBST(GLEW) # Checks for libraries. -AC_SEARCH_LIBS([lgamma],[m c],, -AC_MSG_ERROR([*** Please install libm on your system ***])) +#AC_SEARCH_LIBS([lgamma],[m c],, +#AC_MSG_ERROR([*** Please install libm on your system ***])) AC_CHECK_LIB([z], [deflate],, AC_MSG_ERROR([*** Please install libz or zlib-devel on your system ***])) diff --git a/graphics/asymptote/doc/CAD.pdf b/graphics/asymptote/doc/CAD.pdf Binary files differindex 013b4f9da3..32bb40c75e 100644 --- a/graphics/asymptote/doc/CAD.pdf +++ b/graphics/asymptote/doc/CAD.pdf diff --git a/graphics/asymptote/doc/FAQ/asy-faq.info b/graphics/asymptote/doc/FAQ/asy-faq.info index 66de54d920..3c9bc3f3a0 100644 --- a/graphics/asymptote/doc/FAQ/asy-faq.info +++ b/graphics/asymptote/doc/FAQ/asy-faq.info @@ -10,7 +10,7 @@ END-INFO-DIR-ENTRY File: asy-faq.info, Node: Top, Next: Question 1.1, Up: (dir) ASYMPTOTE FREQUENTLY ASKED QUESTIONS - 2022-09-17 + 2023-01-23 This is the list of Frequently Asked Questions about Asymptote (asy). diff --git a/graphics/asymptote/doc/Makefile.in b/graphics/asymptote/doc/Makefile.in index f819f7dfbb..1fd546778d 100644 --- a/graphics/asymptote/doc/Makefile.in +++ b/graphics/asymptote/doc/Makefile.in @@ -78,7 +78,7 @@ asyRefCard.pdf: asyRefCard.tex pdftex asyRefCard clean: FORCE - -rm -f asy-latex.{aux,idx,ins,log,toc} + -rm -f asy-latex.{aux,idx,ins,log,toc,out,hd,ins} -rm -f $(ASYFILES:.asy=.pdf) -rm -f *.eps latexusage.{dvi,eps,pdf,log,aux,out,*.eps} latexusage-* \ latexusage.pre diff --git a/graphics/asymptote/doc/TeXShopAndAsymptote.pdf b/graphics/asymptote/doc/TeXShopAndAsymptote.pdf Binary files differindex 29526021d0..5f05570de9 100644 --- a/graphics/asymptote/doc/TeXShopAndAsymptote.pdf +++ b/graphics/asymptote/doc/TeXShopAndAsymptote.pdf diff --git a/graphics/asymptote/doc/asy-latex.pdf b/graphics/asymptote/doc/asy-latex.pdf Binary files differindex 388db9c80e..95a58022c3 100644 --- a/graphics/asymptote/doc/asy-latex.pdf +++ b/graphics/asymptote/doc/asy-latex.pdf diff --git a/graphics/asymptote/doc/asy.1 b/graphics/asymptote/doc/asy.1 index 04580bd473..95ee563b6b 100644 --- a/graphics/asymptote/doc/asy.1 +++ b/graphics/asymptote/doc/asy.1 @@ -57,6 +57,7 @@ Center, Bottom, Top, or Zero page alignment [C]. .TP .B \-aligndir pair Directional page alignment (overrides align) [(0,0)]. +-animating [false] .TP .B \-antialias n Antialiasing width for rasterized output [2]. @@ -67,7 +68,7 @@ Automatically activate 3D scene [true]. .B \-autobillboard 3D labels always face viewer by default [true]. .TP -.B \-autoimport string +.B \-autoimport str Module to automatically import. .TP .B \-autoplain @@ -89,22 +90,23 @@ Mask fpu exceptions in batch mode [false]. View output in batch mode [false]. .TP .B \-bw -Convert all colors to black and white [false]. +Convert all colors to black and white false. .TP .B \-cd directory Set current directory; command-line only. .TP .B \-cmyk -Convert rgb colors to cmyk [false]. +Convert rgb colors to cmyk false. .TP -.B \-c,\-command string +.B \-c,\-command str Command to autoexecute. .TP .B \-compact -Conserve memory at the expense of speed [false]. +Conserve memory at the expense of speed false. .TP .B \-compress Compress images in PDF output [true]. +-convertOptions str [] .TP .B \-d,\-debug Enable debugging messages [false]. @@ -117,13 +119,18 @@ Default output file precision [7]. .TP .B \-divisor n Garbage collect using purge(divisor=n) [2]. +-dvipsOptions str [] .TP .B \-dvisvgmMultipleFiles dvisvgm supports multiple files [true]. +-dvisvgmOptions str [] .TP .B \-embed Embed rendered preview image [true]. .TP +.B \-e,\-environment +Show summary of environment settings; command-line only. +.TP .B \-exitonEOF Exit interactive mode on EOF [true]. .TP @@ -135,21 +142,25 @@ Additional frame delay [0]. .TP .B \-framerate frames/s Animation speed [30]. +-glOptions str [] .TP .B \-globalread -Allow read from other directory [true]. +Allow read from other directory true. .TP .B \-globalwrite -Allow write to other directory [false]. +Allow write to other directory false. .TP .B \-gray -Convert all colors to grayscale [false]. +Convert all colors to grayscale false. +-gsOptions str [] .TP .B \-h,\-help Show summary of options; command-line only. .TP .B \-historylines n Retain n lines of history [1000]. +-htmlviewerOptions str +-hyperrefOptions str [setpagesize=false,unicode,pdfborder=0 0 0] .TP .B \-ibl Enable environment map image-based lighting [false]. @@ -157,10 +168,10 @@ Enable environment map image-based lighting [false]. .B \-iconify Iconify rendering window [false]. .TP -.B \-image string +.B \-image str Environment image name [snowyField]. .TP -.B \-imageDir string +.B \-imageDir str Environment image library directory [ibl]. .TP .B \-inlineimage @@ -169,6 +180,9 @@ Generate inline embedded image [false]. .B \-inlinetex Generate inline TeX code [false]. .TP +.B \-inpipe n +Input pipe [-1]. +.TP .B \-interactiveMask Mask fpu exceptions in interactive mode [true]. .TP @@ -177,6 +191,7 @@ View output in interactive mode [true]. .TP .B \-interactiveWrite Write expressions entered at the prompt to stdout [true]. +-interrupt [false] .TP .B \-k,\-keep Keep intermediate files [false]. @@ -232,14 +247,25 @@ Convert each output file to specified format. .B \-o,\-outname name Alternative output directory/filename. .TP +.B \-outpipe n +Output pipe [-1]. +.TP +.B \-paperheight bp +Default page height [0]. +.TP +.B \-paperwidth bp +Default page width [0]. +.TP .B \-p,\-parseonly Parse file [false]. .TP .B \-pdfreload Automatically reload document in pdfviewer [false]. +-pdfreloadOptions str [] .TP .B \-pdfreloaddelay usec Delay before attempting initial pdf reload [750000]. +-pdfviewerOptions str [] .TP .B \-position pair Initial 3D rendering screen position [(0,0)]. @@ -250,11 +276,12 @@ Embed 3D PRC graphics in PDF output [false]. .B \-prerender resolution Prerender V3D objects (0 implies vector output) [0]. .TP -.B \-prompt string +.B \-prompt str Prompt [> ]. .TP -.B \-prompt2 string +.B \-prompt2 str Continuation prompt for multiline input [..]. +-psviewerOptions str [] .TP .B \-q,\-quiet Suppress welcome text and noninteractive stdout [false]. @@ -269,10 +296,10 @@ Resize step [1.2]. reverse 3D animations [false]. .TP .B \-rgb -Convert cmyk colors to rgb [false]. +Convert cmyk colors to rgb false. .TP .B \-safe -Disable system call [true]. +Disable system call true. .TP .B \-scroll n Scroll standard output n lines at a time [0]. @@ -316,11 +343,11 @@ Run LaTeX twice (to resolve references) [false]. .B \-twosided Use two-sided 3D lighting model for rendering [true]. .TP -.B \-u,\-user string +.B \-u,\-user str General purpose user string. .TP .B \-v,\-verbose -Increase verbosity level (can specify multiple times) [0]. +Increase verbosity level (can specify multiple times) 0. .TP .B \-version Show version; command-line only. @@ -334,7 +361,7 @@ Horizontal and vertical 3D viewport margin [(0.5,0.5)]. .B \-wait Wait for child processes to finish before exiting [false]. .TP -.B \-warn string +.B \-warn str Enable warning; command-line only. .TP .B \-webgl2 diff --git a/graphics/asymptote/doc/asyRefCard.pdf b/graphics/asymptote/doc/asyRefCard.pdf Binary files differindex a18baed931..133ebf7f05 100644 --- a/graphics/asymptote/doc/asyRefCard.pdf +++ b/graphics/asymptote/doc/asyRefCard.pdf diff --git a/graphics/asymptote/doc/asymptote.pdf b/graphics/asymptote/doc/asymptote.pdf Binary files differindex 2b1fddf801..ab45608c86 100644 --- a/graphics/asymptote/doc/asymptote.pdf +++ b/graphics/asymptote/doc/asymptote.pdf diff --git a/graphics/asymptote/doc/asymptote.sty b/graphics/asymptote/doc/asymptote.sty new file mode 100644 index 0000000000..2deb265a80 --- /dev/null +++ b/graphics/asymptote/doc/asymptote.sty @@ -0,0 +1,404 @@ +%% +%% This is file `asymptote.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% asy-latex.dtx (with options: `pkg') +%% ____________________________ +%% The ASYMPTOTE package +%% +%% (C) 2003 Tom Prince +%% (C) 2003-2021 John Bowman +%% (C) 2010 Will Robertson +%% +%% Adapted from comment.sty +%% +%% Licence: GPL2+ +%% +\ProvidesPackage{asymptote} + [2021/12/29 v1.37 Asymptote style file for LaTeX] +\def\Asymptote{{\tt Asymptote}} +\InputIfFileExists{\jobname.pre}{}{} +\newbox\ASYbox +\newdimen\ASYdimen +\newcounter{asy} +\newwrite\AsyStream +\newwrite\AsyPreStream +\newif\ifASYinline +\newif\ifASYattach +\newif\ifASYkeepAspect +\ASYkeepAspecttrue +\RequirePackage{keyval} +\RequirePackage{ifthen} +\RequirePackage{graphicx} +\IfFileExists{ifpdf.sty}{ + \RequirePackage{ifpdf} +}{ + \expandafter\newif\csname ifpdf\endcsname + \ifx\pdfoutput\@undefined\else + \ifcase\pdfoutput\else + \pdftrue + \fi + \fi +} +\IfFileExists{ifxetex.sty}{ + \RequirePackage{ifxetex} +}{ + \expandafter\newif\csname ifxetex\endcsname + \ifx\XeTeXversion\@undefined\else + \xetextrue + \fi +} +\IfFileExists{catchfile.sty}{ + \RequirePackage{catchfile} +}{ + \newcommand\CatchFileDef[3]{% + \begingroup + \everyeof{% + \ENDCATCHFILEMARKER + \noexpand + }% + \long\def\@tempa####1\ENDCATCHFILEMARKER{% + \endgroup + \def##1{####1}% + }% + ##3% + \expandafter\@tempa\@@input ##2\relax + } +} +\newif\if@asy@attachfile@loaded +\AtBeginDocument{% + \@ifpackageloaded{attachfile2}{\@asy@attachfile@loadedtrue}{}% + \let\asy@check@attachfile\asy@check@attachfile@loaded +} +\newcommand\asy@check@attachfile@loaded{% + \if@asy@attachfile@loaded\else + \PackageError{asymptote}{You must load the attachfile2 package}{^^J% + You have requested the [attach] option for some or all of your^^J% + Asymptote graphics, which requires the attachfile2 package.^^J% + Please load it in the document preamble.^^J% + }% + \fi +} +\newcommand\asy@check@attachfile{% + \AtBeginDocument{\asy@check@attachfile@loaded}% + \let\asy@check@attachfile\@empty +} +\def\csarg#1#2{\expandafter#1\csname#2\endcsname} +\DeclareOption{inline}{% + \ASYinlinetrue +} +\DeclareOption{attach}{% + \asy@check@attachfile + \ASYattachtrue +} +\ProcessOptions* +\def\asylatexdir{} +\def\asydir{} +\def\ASYasydir{} +\def\ASYprefix{} +\newif\ifASYPDF +\ifxetex + \ASYPDFtrue +\else + \ifpdf + \ASYPDFtrue + \fi +\fi +\ifASYPDF + \def\AsyExtension{pdf} +\else + \def\AsyExtension{eps} +\fi +\def\unquoteJobname#1"#2"#3\relax{% + \def\rawJobname{#1}% + \ifx\rawJobname\empty + \def\rawJobname{#2}% + \fi +} +\expandafter\unquoteJobname\jobname""\relax +\def\fixstar#1*#2\relax{% + \def\argtwo{#2}% + \ifx\argtwo\empty + \gdef\Jobname{#1}% + \else + \fixstar#1-#2\relax + \fi +} +\expandafter\fixstar\rawJobname*\relax +\def\Ginclude@eps#1{% + \message{<#1>}% + \bgroup + \def\@tempa{!}% + \dimen@\Gin@req@width + \dimen@ii.1bp\relax + \divide\dimen@\dimen@ii + \@tempdima\Gin@req@height + \divide\@tempdima\dimen@ii + \special{PSfile=#1\space + llx=\Gin@llx\space + lly=\Gin@lly\space + urx=\Gin@urx\space + ury=\Gin@ury\space + \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\space\fi + \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\space\fi + \ifGin@clip clip\fi}% + \egroup +} +\immediate\openout\AsyPreStream=\jobname.pre\relax +\AtEndDocument{\immediate\closeout\AsyPreStream} +\def\WriteAsyLine#1{% + \immediate\write\AsyStream{\detokenize{#1}}% +} +\def\globalASYdefs{} +\def\WriteGlobalAsyLine#1{% + \expandafter\g@addto@macro + \expandafter\globalASYdefs + \expandafter{\detokenize{#1^^J}}% +} +\def\ProcessAsymptote#1{% + \begingroup + \def\CurrentAsymptote{#1}% + \let\do\@makeother \dospecials + \@makeother\^^L% and whatever other special cases + \catcode`\ =10 + \endlinechar`\^^M \catcode`\^^M=12 \xAsymptote +} +\begingroup + \catcode`\^^M=12 \endlinechar=-1\relax% + \gdef\xAsymptote{% + \expandafter\ProcessAsymptoteLine% + } + \gdef\ProcessAsymptoteLine#1^^M{% + \def\@tempa{#1}% + {% + \escapechar=-1\relax% + \xdef\@tempb{\string\\end\string\{\CurrentAsymptote\string\}}% + }% + \ifx\@tempa\@tempb% + \edef\next{\endgroup\noexpand\end{\CurrentAsymptote}}% + \else% + \ThisAsymptote{#1}% + \let\next\ProcessAsymptoteLine% + \fi% + \next% + } +\endgroup +\def\asy@init{% + \def\ASYlatexdir{}% + \ifx\asylatexdir\empty\else + \def\ASYlatexdir{\asylatexdir/}% + \fi + \ifx\asydir\empty\else + \def\ASYasydir{\asydir/}% + \fi + \def\ASYprefix{\ASYlatexdir\ASYasydir}% +} +\newcommand\asy[1][]{% + \stepcounter{asy}% + \setkeys{ASYkeys}{#1}% + \ifASYattach + \ASYinlinefalse + \fi + \asy@init + \immediate\write\AsyPreStream{% + \noexpand\InputIfFileExists{% + \ASYprefix\noexpand\jobname-\the\c@asy.pre}{}{}% + }% + \asy@write@graphic@header + \let\ThisAsymptote\WriteAsyLine + \ProcessAsymptote{asy}% +} +\def\endasy{% + \asy@finalise@stream + \asy@input@graphic +} +\def\asy@write@graphic@header{% + \immediate\openout\AsyStream=\ASYasydir\jobname-\the\c@asy.asy\relax + \gdef\AsyFile{\ASYprefix\Jobname-\the\c@asy}% + \immediate\write\AsyStream{% + if(!settings.multipleView) settings.batchView=false;^^J% + \ifxetex + settings.tex="xelatex";^^J% + \else\ifASYPDF + settings.tex="pdflatex";^^J% + \fi\fi + \ifASYinline + settings.inlinetex=true;^^J% + deletepreamble();^^J% + \fi + defaultfilename="\Jobname-\the\c@asy";^^J% + if(settings.render < 0) settings.render=4;^^J% + settings.outformat="";^^J% + \ifASYattach + settings.inlineimage=false;^^J% + settings.embed=false;^^J% + settings.toolbar=true;^^J% + \else + settings.inlineimage=true;^^J% + settings.embed=true;^^J% + settings.toolbar=false;^^J% + viewportmargin=(2,2);^^J% + \fi + \globalASYdefs + }% +} +\def\asy@expand@keepAspect{% + \ifASYkeepAspect keepAspect=true% + \else keepAspect=false% + \fi% +} +\def\asy@finalise@stream{% + \ifx\ASYwidth\@empty + \ifx\ASYheight\@empty + % write nothing! + \else + \immediate\write\AsyStream{size(0,\ASYheight,\asy@expand@keepAspect);}% + \fi + \else + \ifx\ASYheight\@empty + \immediate\write\AsyStream{size(\ASYwidth,0,\asy@expand@keepAspect);}% + \else + \immediate\write\AsyStream{size(\ASYwidth,\ASYheight,\asy@expand@keepAspect);}% + \fi + \fi + \ifx\ASYviewportwidth\@empty + \ifx\ASYviewportheight\@empty + % write nothing! + \else + \immediate\write\AsyStream{viewportsize=(0,\ASYviewportheight);}% + \fi + \else + \ifx\ASYviewportheight\@empty + \immediate\write\AsyStream{viewportsize=(\ASYviewportwidth,0);}% + \else + \immediate\write\AsyStream{% + viewportsize=(\ASYviewportwidth,\ASYviewportheight);}% + \fi + \fi + \immediate\closeout\AsyStream +} +\def\asy@input@graphic{% + \ifASYinline + \IfFileExists{"\AsyFile.tex"}{% + \catcode`:=12\relax + \@@input"\AsyFile.tex"\relax + }{% + \PackageWarning{asymptote}{file `\AsyFile.tex' not found}% + }% + \else + \IfFileExists{"\AsyFile.\AsyExtension"}{% + \ifASYattach + \ifASYPDF + \IfFileExists{"\AsyFile+0.pdf"}{% + \setbox\ASYbox=\hbox{\includegraphics[hiresbb]{\AsyFile+0.pdf}}% + }{% + \setbox\ASYbox=\hbox{\includegraphics[hiresbb]{\AsyFile.pdf}}% + }% + \else + \setbox\ASYbox=\hbox{\includegraphics[hiresbb]{\AsyFile.eps}}% + \fi + \textattachfile{\AsyFile.\AsyExtension}{\phantom{\copy\ASYbox}}% + \vskip-\ht\ASYbox + \indent + \box\ASYbox + \else + \ifASYPDF + \includegraphics[hiresbb]{\AsyFile.pdf}% + \else + \includegraphics[hiresbb]{\AsyFile.eps}% + \fi + \fi + }{% + \IfFileExists{"\AsyFile.tex"}{% + \catcode`:=12 + \@@input"\AsyFile.tex"\relax + }{% + \PackageWarning{asymptote}{% + file `\AsyFile.\AsyExtension' not found% + }% + }% + }% + \fi +} +\def\asydef{% + \let\ThisAsymptote\WriteGlobalAsyLine + \ProcessAsymptote{asydef}% +} +\newcommand\asyinclude[2][]{% + \begingroup + \stepcounter{asy}% + \setkeys{ASYkeys}{#1}% + \ifASYattach + \ASYinlinefalse + \fi + \asy@init + \immediate\write\AsyPreStream{% + \noexpand\InputIfFileExists{% + \ASYprefix\noexpand\jobname-\the\c@asy.pre}{}{}% + }% + \asy@write@graphic@header + \IfFileExists{#2.asy}{% + \CatchFileDef\@tempa{#2.asy}{% + \let\do\@makeother + \dospecials + \endlinechar=10\relax + }% + }{% + \IfFileExists{#2}{% + \CatchFileDef\@tempa{#2}{% + \let\do\@makeother + \dospecials + \endlinechar=10\relax + }% + }{% + \PackageWarning{asymptote}{file #2 not found}% + \def\@tempa{}% + }% + }% + \immediate\write\AsyStream{\unexpanded\expandafter{\@tempa}}% + \asy@finalise@stream + \asy@input@graphic + \endgroup +} +\newcommand{\ASYanimategraphics}[5][]{% + \IfFileExists{_#3.pdf}{% + \animategraphics[{#1}]{#2}{_#3}{#4}{#5}% + }{}% +} +\newcommand\asysetup[1]{\setkeys{ASYkeys}{#1}} +\define@key{ASYkeys}{dir}{% + \def\asydir{#1}% +} +\def\ASYwidth{} +\define@key{ASYkeys}{width}{% + \edef\ASYwidth{\the\dimexpr#1\relax}% +} +\def\ASYheight{} +\define@key{ASYkeys}{height}{% + \edef\ASYheight{\the\dimexpr#1\relax}% +} +\define@key{ASYkeys}{keepAspect}[true]{% + \ifthenelse{\equal{#1}{true}} + {\ASYkeepAspecttrue} + {\ASYkeepAspectfalse}% +} +\def\ASYviewportwidth{} +\define@key{ASYkeys}{viewportwidth}{% + \edef\ASYviewportwidth{\the\dimexpr#1\relax}% +} +\def\ASYviewportheight{} +\define@key{ASYkeys}{viewportheight}{% + \edef\ASYviewportheight{\the\dimexpr#1\relax}% +} +\define@key{ASYkeys}{inline}[true]{% + \ifthenelse{\equal{#1}{true}} + {\ASYinlinetrue} + {\ASYinlinefalse}% +} +\define@key{ASYkeys}{attach}[true]{% + \ifthenelse{\equal{#1}{true}} + {\ASYattachtrue} + {\ASYattachfalse}% +} diff --git a/graphics/asymptote/doc/asymptote.texi b/graphics/asymptote/doc/asymptote.texi index 3b47d1f57d..4bcff22cd6 100644 --- a/graphics/asymptote/doc/asymptote.texi +++ b/graphics/asymptote/doc/asymptote.texi @@ -415,21 +415,13 @@ subdirectory of the installation directory (by default, @cindex @code{-V} In interactive mode, or when given the @code{-V} option (the default when running @code{Asymptote} on a single file under @code{MSDOS}), -@code{Asymptote} will automatically invoke the @code{PostScript} -viewer @code{gv} (under @code{UNIX}) or @code{gsview} (under -@code{MSDOS}) to display graphical output. +@code{Asymptote} will automatically invoke your @code{PostScript} +viewer (@code{evince} under @code{UNIX}) to display graphical output. The @code{PostScript} viewer should be capable of automatically -redrawing whenever the output file is updated. The default @code{UNIX} +redrawing whenever the output file is updated. The @code{UNIX} @code{PostScript} viewer @code{gv} supports this (via a @code{SIGHUP} -signal). Version @code{gv-3.6.3} or later (from -@url{https://ftp.gnu.org/gnu/gv/}) is required for interactive mode to -work properly. -Users of @code{ggv} will need to enable @code{Watch file} under +signal). Users of @code{ggv} will need to enable @code{Watch file} under @code{Edit/PostScript Viewer Preferences}. -Users of @code{gsview} will need to enable @code{Options/Auto Redisplay} -(however, under @code{MSDOS} it is still necessary to click on the -@code{gsview} window; under @code{UNIX} one must manually redisplay by -pressing the @code{r} key). @cindex @code{psviewer} @cindex @code{pdfviewer} @@ -451,7 +443,7 @@ important configuration variables under @code{UNIX}: import settings; pdfviewer="acroread"; htmlviewer="google-chrome"; -psviewer="gv"; +psviewer="evince"; display="display"; animate="animate"; gs="gs"; @@ -549,7 +541,7 @@ all disabled warnings. Configuration variables may also be set or overwritten with a command-line option: @verbatim -asy -psviewer=gsview -V venn +asy -psviewer=evince -V venn @end verbatim @cindex environment variables @@ -559,7 +551,7 @@ environment variable name is obtained by converting the configuration variable name to upper case and prepending @code{ASYMPTOTE_}: for example, to set the environment variable @verbatim -ASYMPTOTE_PSVIEWER="C:\Program Files\Ghostgum\gsview\gsview32.exe"; +ASYMPTOTE_PAPERTYPE="a4"; @end verbatim @noindent under @code{Microsoft Windows XP}: @@ -9517,6 +9509,7 @@ interactiveMask=true; Command-line options override these defaults. Most configuration variables may also be changed at runtime. @cindex @code{dvipsOptions} +@cindex @code{dvisvgmOptions} @cindex @code{hyperrefOptions} @cindex @code{convertOptions} @cindex @code{gsOptions} @@ -9525,7 +9518,6 @@ variables may also be changed at runtime. @cindex @code{pdfviewerOptions} @cindex @code{pdfreloadOptions} @cindex @code{glOptions} -@cindex @code{dvisvgmOptions} The advanced configuration variables @code{dvipsOptions}, @code{hyperrefOptions}, @code{convertOptions}, @code{gsOptions}, @code{htmlviewerOptions}, @code{psviewerOptions}, @@ -10189,7 +10181,7 @@ developed the @code{Asymptote Web Application} hosted at @c LocalWords: lineargraph datagraph vertices parametricgraph uncomment ggv @c LocalWords: loggraph generalaxis texhash arrowsize arrowangle arrowlength @c LocalWords: SuppressQuiet MoveQuiet LIBREADLINE config MacOS prebuilt -@c LocalWords: ghostview gsview SIGHUP PDF acroread xpdf cutbefore strptime +@c LocalWords: ghostview SIGHUP PDF acroread xpdf cutbefore strptime @c LocalWords: libsigsegv intersectionpoint dotfactor vv firstcut pq logticks @c LocalWords: Unisys dvips vvv vvvv vvvvv traceback lastcut cutafter infodir @c LocalWords: zxvf xargs cond polargraph xmin xmax plabel YZero labelling ln @@ -10315,7 +10307,7 @@ developed the @code{Asymptote Web Application} hosted at @c LocalWords: differentiable vectorization vectorized asydir normals quartic @c LocalWords: wavepacket kerned parametrized specular hyperboloid Bourke's @c LocalWords: Michail 0pt 1filll 's 3D labelpath3 2D graph3 0pt 3D -@c LocalWords: grid3 contour3 x86_64 psv a4 gsview32 freeglut 'load ' +@c LocalWords: grid3 contour3 x86_64 psv a4 freeglut 'load ' @c LocalWords: 'asy 'lasy 'auto 5bp 1cm sqrtx01 4g extenda extendb @c LocalWords: bb llx 2S 100pt 3t bezier2 bool3 x0 angle1 angle2 z1 @c LocalWords: z2 before' struct X11 x11colors type1cm 12pt OT1 5mm diff --git a/graphics/asymptote/doc/histogram.asy b/graphics/asymptote/doc/histogram.asy index ec00d6638d..f41af60123 100644 --- a/graphics/asymptote/doc/histogram.asy +++ b/graphics/asymptote/doc/histogram.asy @@ -12,8 +12,7 @@ draw(graph(Gaussian,min(a),max(a)),blue); // Optionally calculate "optimal" number of bins a la Shimazaki and Shinomoto. int N=bins(a); -histogram(a,min(a),max(a),N,normalize=true,low=0,lightred,black,bars=false); +histogram(a,min(a),max(a),N,normalize=true,low=0,lightred,black,bars=true); xaxis("$x$",BottomTop,LeftTicks); yaxis("$dP/dx$",LeftRight,RightTicks(trailingzero)); - diff --git a/graphics/asymptote/doc/png/asymptote.info b/graphics/asymptote/doc/png/asymptote.info index 7751122789..5c0a6ae178 100644 --- a/graphics/asymptote/doc/png/asymptote.info +++ b/graphics/asymptote/doc/png/asymptote.info @@ -1,7 +1,7 @@ This is asymptote.info, produced by makeinfo version 6.8 from asymptote.texi. -This file documents 'Asymptote', version 2.83. +This file documents 'Asymptote', version 2.84. <https://asymptote.sourceforge.io> @@ -22,7 +22,7 @@ File: asymptote.info, Node: Top, Next: Description, Prev: (dir), Up: (dir) Asymptote ********* -This file documents 'Asymptote', version 2.83. +This file documents 'Asymptote', version 2.84. <https://asymptote.sourceforge.io> @@ -371,17 +371,12 @@ File: asymptote.info, Node: Configuring, Next: Search paths, Prev: Microsoft In interactive mode, or when given the '-V' option (the default when running 'Asymptote' on a single file under 'MSDOS'), 'Asymptote' will -automatically invoke the 'PostScript' viewer 'gv' (under 'UNIX') or -'gsview' (under 'MSDOS') to display graphical output. The 'PostScript' -viewer should be capable of automatically redrawing whenever the output -file is updated. The default 'UNIX' 'PostScript' viewer 'gv' supports -this (via a 'SIGHUP' signal). Version 'gv-3.6.3' or later (from -<https://ftp.gnu.org/gnu/gv/>) is required for interactive mode to work -properly. Users of 'ggv' will need to enable 'Watch file' under -'Edit/PostScript Viewer Preferences'. Users of 'gsview' will need to -enable 'Options/Auto Redisplay' (however, under 'MSDOS' it is still -necessary to click on the 'gsview' window; under 'UNIX' one must -manually redisplay by pressing the 'r' key). +automatically invoke your 'PostScript' viewer ('evince' under 'UNIX') to +display graphical output. The 'PostScript' viewer should be capable of +automatically redrawing whenever the output file is updated. The 'UNIX' +'PostScript' viewer 'gv' supports this (via a 'SIGHUP' signal). Users +of 'ggv' will need to enable 'Watch file' under 'Edit/PostScript Viewer +Preferences'. Configuration variables are most easily set as 'Asymptote' variables in an optional configuration file 'config.asy' (*note configuration @@ -392,7 +387,7 @@ configuration variables under 'UNIX': import settings; pdfviewer="acroread"; htmlviewer="google-chrome"; -psviewer="gv"; +psviewer="evince"; display="display"; animate="animate"; gs="gs"; @@ -456,14 +451,14 @@ lists all disabled warnings. Configuration variables may also be set or overwritten with a command-line option: -asy -psviewer=gsview -V venn +asy -psviewer=evince -V venn Alternatively, system environment versions of the above configuration variables may be set in the conventional way. The corresponding environment variable name is obtained by converting the configuration variable name to upper case and prepending 'ASYMPTOTE_': for example, to set the environment variable -ASYMPTOTE_PSVIEWER="C:\Program Files\Ghostgum\gsview\gsview32.exe"; +ASYMPTOTE_PAPERTYPE="a4"; under 'Microsoft Windows XP': 1. Click on the 'Start' button; 2. Right-click on 'My Computer'; @@ -6470,11 +6465,10 @@ following routines: // Optionally calculate "optimal" number of bins a la Shimazaki and Shinomoto. int N=bins(a); - histogram(a,min(a),max(a),N,normalize=true,low=0,lightred,black,bars=false); + histogram(a,min(a),max(a),N,normalize=true,low=0,lightred,black,bars=true); xaxis("$x$",BottomTop,LeftTicks); yaxis("$dP/dx$",LeftRight,RightTicks(trailingzero)); - [./histogram] @@ -8280,7 +8274,7 @@ Type 'asy -h' to see the full list of command-line options supported by 'Asymptote': Usage: ../asy [options] [file ...] -Options (negate by replacing - with -no): +Options (negate boolean options by replacing - with -no): -GPUblockSize n Compute shader block size [8] -GPUcompress Compress GPU transparent fragment counts [false] @@ -8291,46 +8285,58 @@ Options (negate by replacing - with -no): -absolute Use absolute WebGL dimensions [false] -a,-align C|B|T|Z Center, Bottom, Top, or Zero page alignment [C] -aligndir pair Directional page alignment (overrides align) [(0,0)] +-animating [false] -antialias n Antialiasing width for rasterized output [2] -auto3D Automatically activate 3D scene [true] -autobillboard 3D labels always face viewer by default [true] --autoimport string Module to automatically import +-autoimport str Module to automatically import -autoplain Enable automatic importing of plain [true] -autoplay Autoplay 3D animations [false] -autorotate Enable automatic PDF page rotation [false] -axes3 Show 3D axes in PDF output [true] -batchMask Mask fpu exceptions in batch mode [false] -batchView View output in batch mode [false] --bw Convert all colors to black and white [false] +-bw Convert all colors to black and white false -cd directory Set current directory; command-line only --cmyk Convert rgb colors to cmyk [false] --c,-command string Command to autoexecute --compact Conserve memory at the expense of speed [false] +-cmyk Convert rgb colors to cmyk false +-c,-command str Command to autoexecute +-compact Conserve memory at the expense of speed false -compress Compress images in PDF output [true] +-convertOptions str [] -d,-debug Enable debugging messages [false] -devicepixelratio n Ratio of physical to logical pixels [1] -digits n Default output file precision [7] -divisor n Garbage collect using purge(divisor=n) [2] +-dvipsOptions str [] -dvisvgmMultipleFiles dvisvgm supports multiple files [true] +-dvisvgmOptions str [] -embed Embed rendered preview image [true] +-e,-environment Show summary of environment settings; command-line only -exitonEOF Exit interactive mode on EOF [true] -fitscreen Fit rendered image to screen [true] -framedelay ms Additional frame delay [0] -framerate frames/s Animation speed [30] --globalread Allow read from other directory [true] --globalwrite Allow write to other directory [false] --gray Convert all colors to grayscale [false] +-glOptions str [] +-globalread Allow read from other directory true +-globalwrite Allow write to other directory false +-gray Convert all colors to grayscale false +-gsOptions str [] -h,-help Show summary of options; command-line only -historylines n Retain n lines of history [1000] +-htmlviewerOptions str + [] +-hyperrefOptions str [setpagesize=false,unicode,pdfborder=0 0 0] -ibl Enable environment map image-based lighting [false] -iconify Iconify rendering window [false] --image string Environment image name [snowyField] --imageDir string Environment image library directory [ibl] +-image str Environment image name [snowyField] +-imageDir str Environment image library directory [ibl] -inlineimage Generate inline embedded image [false] -inlinetex Generate inline TeX code [false] +-inpipe n Input pipe [-1] -interactiveMask Mask fpu exceptions in interactive mode [true] -interactiveView View output in interactive mode [true] -interactiveWrite Write expressions entered at the prompt to stdout [true] +-interrupt [false] -k,-keep Keep intermediate files [false] -keepaux Keep intermediate LaTeX .aux files [false] -level n Postscript level [3] @@ -8349,20 +8355,26 @@ Options (negate by replacing - with -no): -O,-offset pair PostScript offset [(0,0)] -f,-outformat format Convert each output file to specified format -o,-outname name Alternative output directory/filename +-outpipe n Output pipe [-1] +-paperheight bp Default page height [0] +-paperwidth bp Default page width [0] -p,-parseonly Parse file [false] -pdfreload Automatically reload document in pdfviewer [false] +-pdfreloadOptions str [] -pdfreloaddelay usec Delay before attempting initial pdf reload [750000] +-pdfviewerOptions str [] -position pair Initial 3D rendering screen position [(0,0)] -prc Embed 3D PRC graphics in PDF output [false] -prerender resolution Prerender V3D objects (0 implies vector output) [0] --prompt string Prompt [> ] --prompt2 string Continuation prompt for multiline input [..] +-prompt str Prompt [> ] +-prompt2 str Continuation prompt for multiline input [..] +-psviewerOptions str [] -q,-quiet Suppress welcome text and noninteractive stdout [false] -render n Render 3D graphics using n pixels per bp (-1=auto) [-1] -resizestep step Resize step [1.2] -reverse reverse 3D animations [false] --rgb Convert cmyk colors to rgb [false] --safe Disable system call [true] +-rgb Convert cmyk colors to rgb false +-safe Disable system call true -scroll n Scroll standard output n lines at a time [0] -shiftHoldDistance n WebGL touch screen distance limit for shift mode [20] -shiftWaitTime ms WebGL touch screen shift mode delay [200] @@ -8377,13 +8389,13 @@ Options (negate by replacing - with -no): -s,-translate Show translated virtual machine code [false] -twice Run LaTeX twice (to resolve references) [false] -twosided Use two-sided 3D lighting model for rendering [true] --u,-user string General purpose user string --v,-verbose Increase verbosity level (can specify multiple times) [0] +-u,-user str General purpose user string +-v,-verbose Increase verbosity level (can specify multiple times) 0 -version Show version; command-line only -vibrateTime ms WebGL shift mode vibrate duration [25] -viewportmargin pair Horizontal and vertical 3D viewport margin [(0.5,0.5)] -wait Wait for child processes to finish before exiting [false] --warn string Enable warning; command-line only +-warn str Enable warning; command-line only -webgl2 Use webgl2 if available [false] -where Show where listed variables are declared [false] -wsl Run asy under the Windows Subsystem for Linux. [false] @@ -8949,9 +8961,9 @@ Index * ---: Bezier curves. (line 84) * -=: Self & prefix operators. (line 6) -* -c: Options. (line 209) -* -l: Options. (line 228) -* -u: Options. (line 219) +* -c: Options. (line 227) +* -l: Options. (line 246) +* -u: Options. (line 237) * -V: Configuring. (line 6) * -V <1>: Drawing in batch mode. (line 16) @@ -8992,7 +9004,7 @@ Index (line 53) * ||: Arithmetic & logical. (line 51) -* a4: Configuring. (line 68) +* a4: Configuring. (line 63) * abort: Data types. (line 364) * abs: Data types. (line 65) * abs <1>: Data types. (line 144) @@ -9000,7 +9012,7 @@ Index (line 35) * abs2: Data types. (line 65) * abs2 <1>: Data types. (line 144) -* absolute: Configuring. (line 43) +* absolute: Configuring. (line 38) * absolute <1>: three. (line 241) * accel: Paths and guides. (line 126) * accel <1>: Paths and guides. (line 132) @@ -9030,21 +9042,21 @@ Index * alias: Structures. (line 62) * alias <1>: Arrays. (line 183) * Align: label. (line 12) -* aligndir: Options. (line 201) +* aligndir: Options. (line 219) * all: Arrays. (line 350) * Allow: Pens. (line 363) * and: Bezier curves. (line 56) * AND: Arithmetic & logical. (line 68) * angle: Data types. (line 73) -* animate: Configuring. (line 20) +* animate: Configuring. (line 15) * animate <1>: Files. (line 159) * animate <2>: animation. (line 12) * animation: animation. (line 6) * animation <1>: animation. (line 6) * annotate: annotate. (line 6) * antialias: three. (line 261) -* antialias <1>: Options. (line 170) +* antialias <1>: Options. (line 188) * append: Files. (line 38) * append <1>: Arrays. (line 39) * arc: Paths and guides. (line 24) @@ -9093,12 +9105,12 @@ Index * asy <1>: Import. (line 106) * asy-mode: Editing modes. (line 6) * asy.vim: Editing modes. (line 32) -* asygl: Configuring. (line 74) +* asygl: Configuring. (line 69) * asyinclude: LaTeX usage. (line 45) * Asymptote Web Application: Description. (line 6) * asymptote.sty: LaTeX usage. (line 6) * asymptote.xml: Editing modes. (line 48) -* ASYMPTOTE_CONFIG: Options. (line 141) +* ASYMPTOTE_CONFIG: Options. (line 159) * atan: Mathematical functions. (line 6) * aTan: Mathematical functions. @@ -9113,12 +9125,12 @@ Index * attach <1>: LaTeX usage. (line 50) * attach <2>: graph. (line 406) * autoadjust: three. (line 418) -* autoimport: Options. (line 137) +* autoimport: Options. (line 155) * automatic scaling: graph. (line 710) * automatic scaling <1>: graph. (line 710) * axialshade: fill. (line 43) * axis: graph. (line 924) -* axis <1>: graph. (line 1007) +* axis <1>: graph. (line 1006) * axis <2>: graph3. (line 66) * axis <3>: graph3. (line 82) * azimuth: Data types. (line 154) @@ -9248,7 +9260,7 @@ Index * CLZ: Arithmetic & logical. (line 68) * cm: Figure size. (line 18) -* cmd: Configuring. (line 35) +* cmd: Configuring. (line 30) * cmyk: Pens. (line 38) * colatitude: Data types. (line 159) * color: Pens. (line 23) @@ -9262,7 +9274,7 @@ Index * comma-separated-value mode: Arrays. (line 382) * command-line interface: Command-Line Interface. (line 6) -* command-line options: Configuring. (line 91) +* command-line options: Configuring. (line 86) * command-line options <1>: Options. (line 6) * comment character: Files. (line 16) * compass directions: Labels. (line 18) @@ -9273,14 +9285,14 @@ Index * conditional: Programming. (line 26) * conditional <1>: Arithmetic & logical. (line 61) -* config: Configuring. (line 74) -* config <1>: Options. (line 141) -* configuration file: Configuring. (line 20) -* configuration file <1>: Options. (line 141) +* config: Configuring. (line 69) +* config <1>: Options. (line 159) +* configuration file: Configuring. (line 15) +* configuration file <1>: Options. (line 159) * configuring: Configuring. (line 6) * conj: Data types. (line 62) * constructors: Structures. (line 91) -* context: Options. (line 170) +* context: Options. (line 188) * continue: Programming. (line 48) * continue <1>: Debugger. (line 31) * contour: contour. (line 6) @@ -9288,11 +9300,11 @@ Index * controls: Bezier curves. (line 45) * controls <1>: three. (line 6) * controlSpecifier: Paths and guides. (line 396) -* convert: Configuring. (line 74) +* convert: Configuring. (line 69) * convert <1>: Files. (line 159) * convert <2>: animation. (line 6) -* convert <3>: Options. (line 170) -* convertOptions: Options. (line 156) +* convert <3>: Options. (line 188) +* convertOptions: Options. (line 174) * Coons shading: fill. (line 78) * copy: Arrays. (line 176) * cos: Mathematical functions. @@ -9377,7 +9389,7 @@ Index * directory: Files. (line 26) * dirSpecifier: Paths and guides. (line 390) * dirtime: Paths and guides. (line 166) -* display: Configuring. (line 20) +* display: Configuring. (line 15) * do: Programming. (line 48) * DOSendl: Files. (line 65) * DOSnewl: Files. (line 65) @@ -9403,12 +9415,12 @@ Index * drawing commands: Drawing commands. (line 6) * drawline: math. (line 9) * drawtree: drawtree. (line 6) -* dvips: Configuring. (line 74) -* dvipsOptions: Options. (line 156) -* dvisvgm: Configuring. (line 74) -* dvisvgm <1>: Options. (line 175) +* dvips: Configuring. (line 69) +* dvipsOptions: Options. (line 174) +* dvisvgm: Configuring. (line 69) +* dvisvgm <1>: Options. (line 193) * dvisvgmMultipleFiles: GUI installation. (line 20) -* dvisvgmOptions: Options. (line 156) +* dvisvgmOptions: Options. (line 174) * E: Labels. (line 18) * E <1>: Mathematical functions. (line 48) @@ -9444,13 +9456,13 @@ Index * EndPoint: label. (line 55) * envelope: Frames and pictures. (line 25) -* environment variables: Configuring. (line 95) +* environment variables: Configuring. (line 90) * eof: Files. (line 97) * eof <1>: Arrays. (line 364) * eol: Files. (line 97) * eol <1>: Arrays. (line 364) * EPS: label. (line 78) -* EPS <1>: Options. (line 170) +* EPS <1>: Options. (line 188) * erase: Drawing in interactive mode. (line 11) * erase <1>: Data types. (line 257) @@ -9541,7 +9553,7 @@ Index * fontsize: Pens. (line 192) * for: Programming. (line 26) * format: Data types. (line 290) -* format <1>: Options. (line 170) +* format <1>: Options. (line 188) * forum: Help. (line 6) * frame: Frames and pictures. (line 7) @@ -9570,7 +9582,7 @@ Index * globalwrite: Files. (line 40) * globalwrite <1>: Files. (line 154) * glOptions: three. (line 261) -* glOptions <1>: Options. (line 156) +* glOptions <1>: Options. (line 174) * GNU Scientific Library: Mathematical functions. (line 48) * gouraudshade: fill. (line 63) @@ -9579,7 +9591,7 @@ Index * graph: graph. (line 6) * graph3: graph3. (line 6) * graphic: label. (line 78) -* graphic <1>: Options. (line 175) +* graphic <1>: Options. (line 193) * graphical user interface: GUI. (line 6) * graphwithderiv: graph. (line 670) * gray: Pens. (line 25) @@ -9588,12 +9600,12 @@ Index * grid: Pens. (line 285) * grid <1>: graph. (line 766) * grid3: grid3. (line 6) -* gs: Configuring. (line 20) +* gs: Configuring. (line 15) * GSL: Compiling from UNIX source. (line 62) * gsl: Mathematical functions. (line 48) -* gsOptions: Options. (line 156) +* gsOptions: Options. (line 174) * GUI: GUI. (line 6) * GUI installation: GUI installation. (line 6) * GUI usage: GUI usage. (line 6) @@ -9621,10 +9633,10 @@ Index * HookHead3: three. (line 622) * Horizontal: flowchart. (line 77) * HTML5: three. (line 233) -* htmlviewer: Configuring. (line 20) -* htmlviewer <1>: Configuring. (line 43) -* htmlviewerOptions: Options. (line 156) -* hyperrefOptions: Options. (line 156) +* htmlviewer: Configuring. (line 15) +* htmlviewer <1>: Configuring. (line 38) +* htmlviewerOptions: Options. (line 174) +* hyperrefOptions: Options. (line 174) * hypot: Mathematical functions. (line 6) * I: Mathematical functions. @@ -9642,9 +9654,9 @@ Index * image: palette. (line 33) * image <1>: palette. (line 61) * image-based lighting: three. (line 104) -* ImageMagick: Configuring. (line 74) +* ImageMagick: Configuring. (line 69) * ImageMagick <1>: animation. (line 6) -* ImageMagick <2>: Options. (line 170) +* ImageMagick <2>: Options. (line 188) * images: palette. (line 6) * implicit casts: Casts. (line 6) * implicit linear solver: MetaPost. (line 10) @@ -9753,7 +9765,7 @@ Index (line 6) * lastcut: Paths and guides. (line 266) * lasy-mode: Editing modes. (line 6) -* latex: Options. (line 170) +* latex: Options. (line 188) * LaTeX NFSS fonts: Pens. (line 206) * LaTeX usage: LaTeX usage. (line 6) * latexmk: LaTeX usage. (line 30) @@ -9761,7 +9773,7 @@ Index * latticeshade: fill. (line 32) * layer: Drawing commands. (line 16) * leastsquares: stats. (line 6) -* leastsquares <1>: graph. (line 948) +* leastsquares <1>: graph. (line 947) * Left: graph. (line 269) * LeftRight: graph. (line 275) * LeftSide: label. (line 60) @@ -9780,11 +9792,11 @@ Index * length <4>: Paths and guides. (line 373) * length <5>: Arrays. (line 39) * length <6>: three. (line 556) -* letter: Configuring. (line 68) +* letter: Configuring. (line 63) * lexorder: math. (line 63) * lexorder <1>: math. (line 66) * libcurl: Import. (line 94) -* libgs: Options. (line 175) +* libgs: Options. (line 193) * libm routines: Mathematical functions. (line 6) * libsigsegv: Functions. (line 100) @@ -9819,8 +9831,8 @@ Index * loop: Programming. (line 26) * LSP: Language server protocol. (line 6) -* lualatex: Options. (line 170) -* luatex: Options. (line 170) +* lualatex: Options. (line 188) +* luatex: Options. (line 188) * MacOS X binary distributions: MacOS X binary distributions. (line 6) * MacOS X configuration: Compiling from UNIX source. @@ -9926,7 +9938,7 @@ Index * None <1>: draw. (line 26) * none: Files. (line 65) * normal: three. (line 542) -* nosafe: Options. (line 196) +* nosafe: Options. (line 214) * NOT: Arithmetic & logical. (line 68) * notaknot: graph. (line 36) @@ -9947,7 +9959,7 @@ Index * obliqueZ: three. (line 378) * ode: ode. (line 6) * offset: Pens. (line 123) -* offset <1>: Options. (line 201) +* offset <1>: Options. (line 219) * OmitTick: graph. (line 223) * OmitTickInterval: graph. (line 223) * OmitTickIntervals: graph. (line 223) @@ -9979,7 +9991,7 @@ Index * outprefix: Frames and pictures. (line 91) * output: Files. (line 38) -* output <1>: Options. (line 170) +* output <1>: Options. (line 188) * OutTicks: graph3. (line 35) * overloading functions: Functions. (line 55) * overwrite: Pens. (line 360) @@ -9992,9 +10004,9 @@ Index * pair: Figure size. (line 6) * pair <1>: Data types. (line 46) * pairs: Arrays. (line 245) -* paperheight: Configuring. (line 68) -* papertype: Configuring. (line 68) -* paperwidth: Configuring. (line 68) +* paperheight: Configuring. (line 63) +* papertype: Configuring. (line 63) +* paperwidth: Configuring. (line 63) * parallelogram: flowchart. (line 47) * parametric surface: graph3. (line 99) * parametrized curve: graph. (line 639) @@ -10012,11 +10024,11 @@ Index * patterns: Pens. (line 271) * patterns <1>: patterns. (line 6) * PBR: three. (line 74) -* PDF: Options. (line 170) -* pdflatex: Options. (line 170) -* pdfreloadOptions: Options. (line 156) -* pdfviewer: Configuring. (line 20) -* pdfviewerOptions: Options. (line 156) +* PDF: Options. (line 188) +* pdflatex: Options. (line 188) +* pdfreloadOptions: Options. (line 174) +* pdfviewer: Configuring. (line 15) +* pdfviewerOptions: Options. (line 174) * pen: Pens. (line 6) * PenMargin: draw. (line 42) * PenMargin2: three. (line 638) @@ -10072,8 +10084,8 @@ Index * programming: Programming. (line 6) * pstoedit: PostScript to Asymptote. (line 6) -* psviewer: Configuring. (line 20) -* psviewerOptions: Options. (line 156) +* psviewer: Configuring. (line 15) +* psviewerOptions: Options. (line 174) * pt: Figure size. (line 18) * public: Structures. (line 6) * push: Arrays. (line 39) @@ -10127,7 +10139,7 @@ Index * rename: Files. (line 156) * render: three. (line 46) * render <1>: three. (line 184) -* render <2>: Options. (line 170) +* render <2>: Options. (line 188) * replace: Data types. (line 270) * resetdefaultpen: Pens. (line 387) * rest arguments: Rest arguments. (line 6) @@ -10166,7 +10178,7 @@ Index * runtime imports: Import. (line 102) * Russian: Pens. (line 238) * S: Labels. (line 18) -* safe: Options. (line 196) +* safe: Options. (line 214) * save: Frames and pictures. (line 288) * saveline: Files. (line 139) @@ -10199,8 +10211,8 @@ Index * self operators: Self & prefix operators. (line 6) * sequence: Arrays. (line 118) -* settings: Configuring. (line 20) -* settings <1>: Options. (line 141) +* settings: Configuring. (line 15) +* settings <1>: Options. (line 159) * sgn: Mathematical functions. (line 26) * shading: fill. (line 32) @@ -10244,7 +10256,7 @@ Index * size <4>: Frames and pictures. (line 74) * size <5>: three. (line 556) -* size <6>: Options. (line 170) +* size <6>: Options. (line 188) * size3: three. (line 320) * Slant: label. (line 42) * slant: Transforms. (line 38) @@ -10315,9 +10327,9 @@ Index * surface <3>: three. (line 142) * surface <4>: graph3. (line 99) * surface <5>: graph3. (line 128) -* SVG: Options. (line 175) +* SVG: Options. (line 193) * system: Data types. (line 354) -* system <1>: Options. (line 196) +* system <1>: Options. (line 214) * syzygy: syzygy. (line 6) * tab: Files. (line 65) * tab completion: Drawing in interactive mode. @@ -10338,13 +10350,13 @@ Index * tessellation: three. (line 154) * tex: Frames and pictures. (line 305) -* tex <1>: Options. (line 170) +* tex <1>: Options. (line 188) * TeX fonts: Pens. (line 213) * TeX string: Data types. (line 208) -* texcommand: Configuring. (line 74) +* texcommand: Configuring. (line 69) * TeXHead: draw. (line 26) * TeXHead3: three. (line 622) -* texpath: Configuring. (line 74) +* texpath: Configuring. (line 69) * texpath <1>: label. (line 113) * texpreamble: Frames and pictures. (line 314) @@ -10448,8 +10460,8 @@ Index (line 55) * variable initializers: Variable initializers. (line 6) -* vectorfield: graph. (line 1023) -* vectorfield <1>: graph. (line 1062) +* vectorfield: graph. (line 1022) +* vectorfield <1>: graph. (line 1061) * vectorfield3: graph3. (line 167) * vectorization: Arrays. (line 343) * verbatim: Frames and pictures. @@ -10482,7 +10494,7 @@ Index * xasy: GUI. (line 6) * xaxis3: graph3. (line 7) * xdr: Files. (line 80) -* xelatex: Options. (line 170) +* xelatex: Options. (line 188) * XEquals: graph. (line 265) * xequals: graph. (line 278) * xlimits: graph. (line 639) @@ -10551,146 +10563,146 @@ Node: UNIX binary distributions12610 Node: MacOS X binary distributions13733 Node: Microsoft Windows14321 Node: Configuring15529 -Node: Search paths20144 -Node: Compiling from UNIX source21152 -Node: Editing modes24303 -Node: Git26741 -Node: Uninstall27248 -Node: Tutorial27594 -Node: Drawing in batch mode28441 -Node: Drawing in interactive mode29317 -Node: Figure size30349 -Node: Labels31944 -Node: Paths32772 -Ref: unitcircle33388 -Node: Drawing commands35329 -Node: draw37137 -Ref: arrows38319 -Node: fill43834 -Ref: gradient shading44880 -Node: clip49494 -Node: label50243 -Ref: Label50843 -Node: Bezier curves56700 -Node: Programming60600 -Ref: array iteration62353 -Node: Data types62520 -Ref: format73288 -Node: Paths and guides77734 -Ref: circle77988 -Ref: extension87688 -Node: Pens94498 -Ref: fillrule102189 -Ref: basealign103093 -Ref: transparency106775 -Ref: makepen110369 -Ref: overwrite111253 -Node: Transforms112467 -Node: Frames and pictures114406 -Ref: envelope115564 -Ref: size116657 -Ref: unitsize117644 -Ref: shipout118717 -Ref: filltype121068 -Ref: add124481 -Ref: add about125423 -Ref: tex128453 -Node: Files129348 -Ref: cd130405 -Ref: scroll135307 -Node: Variable initializers138225 -Node: Structures140942 -Node: Operators148519 -Node: Arithmetic & logical148833 -Node: Self & prefix operators151203 -Node: User-defined operators151997 -Node: Implicit scaling152910 -Node: Functions153473 -Ref: stack overflow156590 -Node: Default arguments156872 -Node: Named arguments157628 -Node: Rest arguments160198 -Node: Mathematical functions163319 -Node: Arrays167976 -Ref: sort175415 -Ref: tridiagonal178653 -Ref: solve179884 -Node: Slices184024 -Node: Casts187932 -Node: Import190202 -Node: Static195772 -Node: LaTeX usage198658 -Node: Base modules205174 -Node: plain207651 -Node: simplex208325 -Node: math208598 -Node: interpolate211265 -Node: geometry211544 -Node: trembling212224 -Node: stats212493 -Node: patterns212752 -Node: markers212987 -Node: map214845 -Node: tree215269 -Node: binarytree215449 -Node: drawtree216116 -Node: syzygy216317 -Node: feynman216591 -Node: roundedpath216865 -Node: animation217147 -Ref: animate217568 -Node: embed218680 -Node: slide219634 -Node: MetaPost219965 -Node: babel220681 -Node: labelpath220913 -Node: labelpath3221733 -Node: annotate222044 -Node: CAD222514 -Node: graph222824 -Ref: ticks229983 -Ref: pathmarkers243705 -Ref: marker244175 -Ref: markuniform244529 -Ref: errorbars246388 -Ref: automatic scaling251517 -Node: palette263220 -Ref: images263338 -Ref: image267634 -Ref: logimage268155 -Ref: penimage269261 -Ref: penfunctionimage269524 -Node: three270296 -Ref: PostScript3D300571 -Node: obj302309 -Node: graph3302558 -Ref: GaussianSurface308301 -Node: grid3309451 -Node: solids310279 -Node: tube311271 -Node: flowchart313543 -Node: contour318186 -Node: contour3324694 -Node: smoothcontour3325006 -Node: slopefield326725 -Node: ode328206 -Node: Options328463 -Ref: configuration file336197 -Ref: settings336197 -Ref: texengines337461 -Ref: convert337461 -Node: Interactive mode340906 -Ref: history343055 -Node: GUI344358 -Node: GUI installation344908 -Node: GUI usage345836 -Node: Command-Line Interface346899 -Node: Language server protocol348341 -Node: PostScript to Asymptote349766 -Node: Help350544 -Node: Debugger352218 -Node: Credits353974 -Node: Index355199 +Node: Search paths19748 +Node: Compiling from UNIX source20756 +Node: Editing modes23907 +Node: Git26345 +Node: Uninstall26852 +Node: Tutorial27198 +Node: Drawing in batch mode28045 +Node: Drawing in interactive mode28921 +Node: Figure size29953 +Node: Labels31548 +Node: Paths32376 +Ref: unitcircle32992 +Node: Drawing commands34933 +Node: draw36741 +Ref: arrows37923 +Node: fill43438 +Ref: gradient shading44484 +Node: clip49098 +Node: label49847 +Ref: Label50447 +Node: Bezier curves56304 +Node: Programming60204 +Ref: array iteration61957 +Node: Data types62124 +Ref: format72892 +Node: Paths and guides77338 +Ref: circle77592 +Ref: extension87292 +Node: Pens94102 +Ref: fillrule101793 +Ref: basealign102697 +Ref: transparency106379 +Ref: makepen109973 +Ref: overwrite110857 +Node: Transforms112071 +Node: Frames and pictures114010 +Ref: envelope115168 +Ref: size116261 +Ref: unitsize117248 +Ref: shipout118321 +Ref: filltype120672 +Ref: add124085 +Ref: add about125027 +Ref: tex128057 +Node: Files128952 +Ref: cd130009 +Ref: scroll134911 +Node: Variable initializers137829 +Node: Structures140546 +Node: Operators148123 +Node: Arithmetic & logical148437 +Node: Self & prefix operators150807 +Node: User-defined operators151601 +Node: Implicit scaling152514 +Node: Functions153077 +Ref: stack overflow156194 +Node: Default arguments156476 +Node: Named arguments157232 +Node: Rest arguments159802 +Node: Mathematical functions162923 +Node: Arrays167580 +Ref: sort175019 +Ref: tridiagonal178257 +Ref: solve179488 +Node: Slices183628 +Node: Casts187536 +Node: Import189806 +Node: Static195376 +Node: LaTeX usage198262 +Node: Base modules204778 +Node: plain207255 +Node: simplex207929 +Node: math208202 +Node: interpolate210869 +Node: geometry211148 +Node: trembling211828 +Node: stats212097 +Node: patterns212356 +Node: markers212591 +Node: map214449 +Node: tree214873 +Node: binarytree215053 +Node: drawtree215720 +Node: syzygy215921 +Node: feynman216195 +Node: roundedpath216469 +Node: animation216751 +Ref: animate217172 +Node: embed218284 +Node: slide219238 +Node: MetaPost219569 +Node: babel220285 +Node: labelpath220517 +Node: labelpath3221337 +Node: annotate221648 +Node: CAD222118 +Node: graph222428 +Ref: ticks229587 +Ref: pathmarkers243309 +Ref: marker243779 +Ref: markuniform244133 +Ref: errorbars245992 +Ref: automatic scaling251121 +Node: palette262817 +Ref: images262935 +Ref: image267231 +Ref: logimage267752 +Ref: penimage268858 +Ref: penfunctionimage269121 +Node: three269893 +Ref: PostScript3D300168 +Node: obj301906 +Node: graph3302155 +Ref: GaussianSurface307898 +Node: grid3309048 +Node: solids309876 +Node: tube310868 +Node: flowchart313140 +Node: contour317783 +Node: contour3324291 +Node: smoothcontour3324603 +Node: slopefield326322 +Node: ode327803 +Node: Options328060 +Ref: configuration file336429 +Ref: settings336429 +Ref: texengines337693 +Ref: convert337693 +Node: Interactive mode341138 +Ref: history343287 +Node: GUI344590 +Node: GUI installation345140 +Node: GUI usage346068 +Node: Command-Line Interface347131 +Node: Language server protocol348573 +Node: PostScript to Asymptote349998 +Node: Help350776 +Node: Debugger352450 +Node: Credits354206 +Node: Index355431 End Tag Table diff --git a/graphics/asymptote/examples/triads.asy b/graphics/asymptote/examples/triads.asy index 6cecc55fa4..d1923d3241 100644 --- a/graphics/asymptote/examples/triads.asy +++ b/graphics/asymptote/examples/triads.asy @@ -51,4 +51,4 @@ spectrum(m,s,l); shipout("triadkpq"); -erase(); +currentpicture.erase(); diff --git a/graphics/asymptote/fftw++.cc b/graphics/asymptote/fftw++.cc index 18071492e3..69a54934bb 100644 --- a/graphics/asymptote/fftw++.cc +++ b/graphics/asymptote/fftw++.cc @@ -1,18 +1,21 @@ #include <cstring> #include <sstream> + #include "fftw++.h" using namespace std; +using namespace utils; namespace fftwpp { const double fftw::twopi=2.0*acos(-1.0); +bool fftw::wiser=false; // User settings: -unsigned int fftw::effort=FFTW_MEASURE; -const char *fftw::WisdomName=".wisdom"; -unsigned int fftw::maxthreads=1; -double fftw::testseconds=0.2; // Time limit for threading efficiency tests +size_t fftw::effort=FFTW_MEASURE; +string wisdomName="wisdom3.txt"; +ostringstream wisdomTemp; +size_t fftw::maxthreads=1; fftw_plan (*fftw::planner)(fftw *f, Complex *in, Complex *out)=Planner; @@ -20,20 +23,17 @@ const char *fftw::oddshift="Shift is not implemented for odd nx"; const char *inout= "constructor and call must be both in place or both out of place"; -fft1d::Table fft1d::threadtable; -mfft1d::Table mfft1d::threadtable; -rcfft1d::Table rcfft1d::threadtable; -crfft1d::Table crfft1d::threadtable; -mrcfft1d::Table mrcfft1d::threadtable; -mcrfft1d::Table mcrfft1d::threadtable; -fft2d::Table fft2d::threadtable; +Mfft1d::Table Mfft1d::threadtable; +Mrcfft1d::Table Mrcfft1d::threadtable; +Mcrfft1d::Table Mcrfft1d::threadtable; -void LoadWisdom() +void loadWisdom() { static bool Wise=false; if(!Wise) { + wisdomTemp << wisdomName << "_" << getpid(); ifstream ifWisdom; - ifWisdom.open(fftw::WisdomName); + ifWisdom.open(wisdomName); ostringstream wisdom; wisdom << ifWisdom.rdbuf(); ifWisdom.close(); @@ -43,25 +43,34 @@ void LoadWisdom() } } -void SaveWisdom() +void saveWisdom() { - ofstream ofWisdom; - ofWisdom.open(fftw::WisdomName); - char *wisdom=fftw_export_wisdom_to_string(); - ofWisdom << wisdom; - fftw_free(wisdom); - ofWisdom.close(); + if(fftw::wiser) { + char *wisdom=fftw_export_wisdom_to_string(); + ofstream ofWisdom; + ofWisdom.open(wisdomTemp.str().c_str()); + ofWisdom << wisdom; + fftw_free(wisdom); + ofWisdom.close(); + rename(wisdomTemp.str().c_str(),wisdomName.c_str()); + fftw::wiser=false; + } } fftw_plan Planner(fftw *F, Complex *in, Complex *out) { - LoadWisdom(); + loadWisdom(); fftw::effort |= FFTW_WISDOM_ONLY; fftw_plan plan=F->Plan(in,out); fftw::effort &= ~FFTW_WISDOM_ONLY; if(!plan) { plan=F->Plan(in,out); - SaveWisdom(); + static bool first=true; + if(first) { + atexit(saveWisdom); + first=false; + } + fftw::wiser=true; } return plan; } @@ -71,5 +80,5 @@ ThreadBase::ThreadBase() {threads=fftw::maxthreads;} } namespace utils { -unsigned int defaultmpithreads=1; +size_t defaultmpithreads=1; } diff --git a/graphics/asymptote/fftw++.h b/graphics/asymptote/fftw++.h index bf4102e06d..162954623e 100644 --- a/graphics/asymptote/fftw++.h +++ b/graphics/asymptote/fftw++.h @@ -1,5 +1,5 @@ /* Fast Fourier transform C++ header class for the FFTW3 Library - Copyright (C) 2004-16 + Copyright (C) 2004-2022 John C. Bowman, University of Alberta Malcolm Roberts, University of Strasbourg @@ -20,7 +20,7 @@ #ifndef __fftwpp_h__ #define __fftwpp_h__ 1 -#define __FFTWPP_H_VERSION__ 2.10 +#define __FFTWPP_H_VERSION__ 2.11 #include <cstdlib> #include <fstream> @@ -29,56 +29,16 @@ #include <cerrno> #include <map> #include <typeinfo> +#include <climits> -#ifndef _OPENMP -#ifndef FFTWPP_SINGLE_THREAD -#define FFTWPP_SINGLE_THREAD -#endif -#endif - -#ifndef FFTWPP_SINGLE_THREAD -#include <omp.h> -#endif - -inline int get_thread_num() -{ -#ifdef FFTWPP_SINGLE_THREAD - return 0; -#else - return omp_get_thread_num(); -#endif -} - -inline int get_max_threads() -{ -#ifdef FFTWPP_SINGLE_THREAD - return 1; -#else - return omp_get_max_threads(); -#endif -} - -#ifndef FFTWPP_SINGLE_THREAD -#define PARALLEL(code) \ - if(threads > 1) { \ - _Pragma("omp parallel for num_threads(threads)") \ - code \ - } else { \ - code \ - } -#else -#define PARALLEL(code) \ - { \ - code \ - } -#endif +#include "seconds.h" +#include "parallel.h" #ifndef __Complex_h__ #include <complex> typedef std::complex<double> Complex; #endif -#include "seconds.h" #include "statistics.h" #include "align.h" @@ -97,35 +57,24 @@ extern "C" size_t fftw_alignment(); class fftw; extern "C" fftw_plan Planner(fftw *F, Complex *in, Complex *out); -void LoadWisdom(); -void SaveWisdom(); +void loadWisdom(); +void saveWisdom(); +extern std::string wisdomName; extern const char *inout; -struct threaddata { - unsigned int threads; - double mean; - double stdev; - threaddata() : threads(0), mean(0.0), stdev(0.0) {} - threaddata(unsigned int threads, double mean, double stdev) : - threads(threads), mean(mean), stdev(stdev) {} -}; - -class fftw; - class ThreadBase { -protected: - unsigned int threads; - unsigned int innerthreads; public: + size_t threads; + size_t innerthreads; ThreadBase(); - ThreadBase(unsigned int threads) : threads(threads) {} - void Threads(unsigned int nthreads) {threads=nthreads;} - unsigned int Threads() {return threads;} - unsigned int Innerthreads() {return innerthreads;} + ThreadBase(size_t threads) : threads(threads) {} + void Threads(size_t nthreads) {threads=nthreads;} + size_t Threads() {return threads;} + size_t Innerthreads() {return innerthreads;} - void multithread(unsigned int n) { + void multithread(size_t n) { if(n >= threads) { innerthreads=1; } else { @@ -133,65 +82,87 @@ public: threads=1; } } + + int get_thread_num0() { + return threads > 1 ? parallel::get_thread_num() : 0; + } }; -inline unsigned int realsize(unsigned int n, Complex *in, Complex *out=NULL) +inline size_t realsize(size_t n, bool inplace) +{ + return inplace ? 2*(n/2+1) : n; +} + +inline size_t Inplace(Complex *in, Complex *out=NULL) { - return (!out || in == out) ? 2*(n/2+1) : n; + return !out || in == out; } -inline unsigned int realsize(unsigned int n, Complex *in, double *out) +inline size_t Inplace(Complex *in, double *out) { - return realsize(n,in,(Complex *) out); + return Inplace(in,(Complex *) out); } -inline unsigned int realsize(unsigned int n, double *in, Complex *out) +inline size_t Inplace(double *in, Complex *out) { - return realsize(n,(Complex *) in,out); + return Inplace((Complex *) in,out); } +class Doubles { +public: + size_t rsize,csize; + + Doubles(size_t nx, size_t M, + size_t istride, size_t ostride, + size_t idist, size_t odist, bool inplace) { + rsize=(realsize(nx,inplace)-2)*istride+(M-1)*idist+2; + csize=2*(nx/2*ostride+(M-1)*odist+1); + if(inplace) + rsize=csize=std::max(rsize,csize); + } +}; + // Base clase for fft routines // class fftw : public ThreadBase { protected: - unsigned int doubles; // number of double precision values in dataset + size_t doubles; // number of double precision values in output int sign; - unsigned int threads; + size_t threads; double norm; fftw_plan plan; bool inplace; - unsigned int Dist(unsigned int n, size_t stride, size_t dist) { + size_t Dist(size_t n, size_t stride, size_t dist) { return dist ? dist : ((stride == 1) ? n : 1); } static const double twopi; public: - static unsigned int effort; - static unsigned int maxthreads; - static double testseconds; - static const char *WisdomName; + static size_t effort; + static size_t maxthreads; static fftw_plan (*planner)(fftw *f, Complex *in, Complex *out); + static bool wiser; - virtual unsigned int Threads() {return threads;} + virtual size_t Threads() {return threads;} static const char *oddshift; // In-place shift of Fourier origin to (nx/2,0) for even nx. - static void Shift(Complex *data, unsigned int nx, unsigned int ny, - unsigned int threads) { - unsigned int nyp=ny/2+1; - unsigned int stop=nx*nyp; + static void Shift(Complex *data, size_t nx, size_t ny, + size_t threads) { + size_t nyp=ny/2+1; + size_t stop=nx*nyp; if(nx % 2 == 0) { - unsigned int inc=2*nyp; + size_t inc=2*nyp; #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) #endif - for(unsigned int i=nyp; i < stop; i += inc) { + for(size_t i=nyp; i < stop; i += inc) { Complex *p=data+i; - for(unsigned int j=0; j < nyp; j++) p[j]=-p[j]; + for(size_t j=0; j < nyp; j++) p[j]=-p[j]; } } else { std::cerr << oddshift << std::endl; @@ -200,17 +171,17 @@ public: } // Out-of-place shift of Fourier origin to (nx/2,0) for even nx. - static void Shift(double *data, unsigned int nx, unsigned int ny, - unsigned int threads) { + static void Shift(double *data, size_t nx, size_t ny, + size_t threads) { if(nx % 2 == 0) { - unsigned int stop=nx*ny; - unsigned int inc=2*ny; + size_t stop=nx*ny; + size_t inc=2*ny; #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) #endif - for(unsigned int i=ny; i < stop; i += inc) { + for(size_t i=ny; i < stop; i += inc) { double *p=data+i; - for(unsigned int j=0; j < ny; j++) p[j]=-p[j]; + for(size_t j=0; j < ny; j++) p[j]=-p[j]; } } else { std::cerr << oddshift << std::endl; @@ -219,20 +190,20 @@ public: } // In-place shift of Fourier origin to (nx/2,ny/2,0) for even nx and ny. - static void Shift(Complex *data, unsigned int nx, unsigned int ny, - unsigned int nz, unsigned int threads) { - unsigned int nzp=nz/2+1; - unsigned int nyzp=ny*nzp; + static void Shift(Complex *data, size_t nx, size_t ny, + size_t nz, size_t threads) { + size_t nzp=nz/2+1; + size_t nyzp=ny*nzp; if(nx % 2 == 0 && ny % 2 == 0) { - unsigned int pinc=2*nzp; + size_t pinc=2*nzp; #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) #endif - for(unsigned int i=0; i < nx; i++) { + for(size_t i=0; i < nx; i++) { Complex *pstart=data+i*nyzp; Complex *pstop=pstart+nyzp; for(Complex *p=pstart+(1-(i % 2))*nzp; p < pstop; p += pinc) { - for(unsigned int k=0; k < nzp; k++) p[k]=-p[k]; + for(size_t k=0; k < nzp; k++) p[k]=-p[k]; } } } else { @@ -242,19 +213,19 @@ public: } // Out-of-place shift of Fourier origin to (nx/2,ny/2,0) for even nx and ny. - static void Shift(double *data, unsigned int nx, unsigned int ny, - unsigned int nz, unsigned int threads) { - unsigned int nyz=ny*nz; + static void Shift(double *data, size_t nx, size_t ny, + size_t nz, size_t threads) { + size_t nyz=ny*nz; if(nx % 2 == 0 && ny % 2 == 0) { - unsigned int pinc=2*nz; + size_t pinc=2*nz; #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) #endif - for(unsigned int i=0; i < nx; i++) { + for(size_t i=0; i < nx; i++) { double *pstart=data+i*nyz; double *pstop=pstart+nyz; for(double *p=pstart+(1-(i % 2))*nz; p < pstop; p += pinc) { - for(unsigned int k=0; k < nz; k++) p[k]=-p[k]; + for(size_t k=0; k < nz; k++) p[k]=-p[k]; } } } else { @@ -264,8 +235,8 @@ public: } fftw() : plan(NULL) {} - fftw(unsigned int doubles, int sign, unsigned int threads, - unsigned int n=0) : + fftw(size_t doubles, int sign, size_t threads, + size_t n=0) : doubles(doubles), sign(sign), threads(threads), norm(1.0/(n ? n : doubles/2)), plan(NULL) { #ifndef FFTWPP_SINGLE_THREAD @@ -274,7 +245,8 @@ public: } virtual ~fftw() { - if(plan) fftw_destroy_plan(plan); + if(plan) + fftw_destroy_plan(plan); } virtual fftw_plan Plan(Complex *in, Complex *out) {return NULL;}; @@ -290,72 +262,13 @@ public: exit(1); } - static void planThreads(unsigned int threads) { + static void planThreads(size_t threads) { #ifndef FFTWPP_SINGLE_THREAD omp_set_num_threads(threads); fftw_plan_with_nthreads(threads); #endif } - threaddata time(fftw_plan plan1, fftw_plan planT, Complex *in, Complex *out, - unsigned int Threads) { - utils::statistics S,ST; - double stop=utils::totalseconds()+testseconds; - threads=1; - plan=plan1; - fft(in,out); - threads=Threads; - plan=planT; - fft(in,out); - unsigned int N=1; - unsigned int ndoubles=doubles/2; - for(;;) { - double t0=utils::totalseconds(); - threads=1; - plan=plan1; - for(unsigned int i=0; i < N; ++i) { - for(unsigned int i=0; i < ndoubles; ++i) out[i]=i; - fft(in,out); - } - double t1=utils::totalseconds(); - threads=Threads; - plan=planT; - for(unsigned int i=0; i < N; ++i) { - for(unsigned int i=0; i < ndoubles; ++i) out[i]=i; - fft(in,out); - } - double t=utils::totalseconds(); - S.add(t1-t0); - ST.add(t-t1); - if(S.mean() < 100.0/CLOCKS_PER_SEC) { - N *= 2; - S.clear(); - ST.clear(); - } - if(S.count() >= 10) { - double error=S.stdev(); - double diff=ST.mean()-S.mean(); - if(diff >= 0.0 || t > stop) { - threads=1; - plan=plan1; - fftw_destroy_plan(planT); - break; - } - if(diff < -error) { - threads=Threads; - fftw_destroy_plan(plan1); - break; - } - } - } - return threaddata(threads,S.mean(),S.stdev()); - } - - virtual threaddata lookup(bool inplace, unsigned int threads) { - return threaddata(); - } - virtual void store(bool inplace, const threaddata& data) {} - inline Complex *CheckAlign(Complex *in, Complex *out, bool constructor=true) { #ifndef NO_CHECK_ALIGN @@ -368,51 +281,41 @@ public: return out; } - threaddata Setup(Complex *in, Complex *out=NULL) { + void Setup(Complex *in, Complex *out=NULL) { bool alloc=!in; if(alloc) in=utils::ComplexAlign((doubles+1)/2); out=CheckAlign(in,out); inplace=(out==in); - threaddata data; - unsigned int Threads=threads; - - if(threads > 1) data=lookup(inplace,threads); - else data=threaddata(1,0.0,0.0); + parallel::Threshold(threads); + if(doubles < 2*threshold) + threads=1; - threads=data.threads > 0 ? data.threads : 1; planThreads(threads); plan=(*planner)(this,in,out); if(!plan) noplan(); - fftw_plan planT; - if(fftw::maxthreads > 1) { - threads=Threads; - planThreads(threads); - planT=(*planner)(this,in,out); - - if(data.threads == 0) { - if(planT) - data=time(plan,planT,in,out,threads); - else noplan(); - store(inplace,threaddata(threads,data.mean,data.stdev)); - } - } - if(alloc) Array::deleteAlign(in,(doubles+1)/2); #ifdef FFTWPP_VERBOSE if(threads > 1) std::cout << "Using " << threads << " threads." << std::endl; #endif - return data; } - threaddata Setup(Complex *in, double *out) { - return Setup(in,(Complex *) out); + void Setup(Complex *in, double *out) { + parallel::Threshold(threads); + if(doubles < 4*threshold) + threads=1; + + Setup(in,(Complex *) out); } - threaddata Setup(double *in, Complex *out=NULL) { - return Setup((Complex *) in,out); + void Setup(double *in, Complex *out=NULL) { + parallel::Threshold(threads); + if(doubles < 4*threshold) + threads=1; + + Setup((Complex *) in,out); } virtual void Execute(Complex *in, Complex *out, bool=false) { @@ -455,51 +358,67 @@ public: } void Normalize(Complex *out) { - unsigned int stop=doubles/2; + size_t stop=doubles/2; #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) #endif - for(unsigned int i=0; i < stop; i++) out[i] *= norm; + for(size_t i=0; i < stop; i++) out[i] *= norm; } void Normalize(double *out) { #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) #endif - for(unsigned int i=0; i < doubles; i++) out[i] *= norm; + for(size_t i=0; i < doubles; i++) out[i] *= norm; } - virtual void fftNormalized(Complex *in, Complex *out=NULL, bool shift=false) + void fftNormalized(Complex *in, Complex *out=NULL) { out=Setout(in,out); - Execute(in,out,shift); + Execute(in,out); Normalize(out); } - virtual void fftNormalized(Complex *in, double *out, bool shift=false) { + void fftNormalized(Complex *in, double *out) { out=(double *) Setout(in,(Complex *) out); - Execute(in,(Complex *) out,shift); + Execute(in,(Complex *) out); Normalize(out); } - virtual void fftNormalized(double *in, Complex *out, bool shift=false) { - fftNormalized((Complex *) in,out,shift); + void fftNormalized(double *in, Complex *out) { + out=Setout((Complex *) in,out); + Execute((Complex *) in,out); + Normalize(out); } - template<class I, class O> - void fft0Normalized(I in, O out) { - fftNormalized(in,out,true); + void fft0Normalized(Complex *in, Complex *out=NULL) + { + out=Setout(in,out); + Execute(in,out,true); + Normalize(out); + } + + void fft0Normalized(Complex *in, double *out) { + out=(double *) Setout(in,(Complex *) out); + Execute(in,(Complex *) out,true); + Normalize(out); + } + + void fft0Normalized(double *in, Complex *out) { + out=Setout((Complex *) in,out); + Execute((Complex *) in,out,true); + Normalize(out); } template<class O> - void Normalize(unsigned int nx, unsigned int M, size_t ostride, + void Normalize(size_t nx, size_t M, size_t ostride, size_t odist, O *out) { - unsigned int stop=nx*ostride; + size_t stop=nx*ostride; O *outMdist=out+M*odist; #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) #endif - for(unsigned int i=0; i < stop; i += ostride) { + for(size_t i=0; i < stop; i += ostride) { O *pstop=outMdist+i; for(O *p=out+i; p < pstop; p += odist) { *p *= norm; @@ -508,10 +427,10 @@ public: } template<class I, class O> - void fftNormalized(unsigned int nx, unsigned int M, size_t ostride, - size_t odist, I *in, O *out=NULL, bool shift=false) { + void fftNormalized(size_t nx, size_t M, size_t ostride, + size_t odist, I *in, O *out) { out=(O *) Setout((Complex *) in,(Complex *) out); - Execute((Complex *) in,(Complex *) out,shift); + Execute((Complex *) in,(Complex *) out); Normalize(nx,M,ostride,odist,out); } @@ -522,9 +441,9 @@ class Transpose { bool inplace; public: template<class T> - Transpose(unsigned int rows, unsigned int cols, unsigned int length, - T *in, T *out=NULL, unsigned int threads=fftw::maxthreads) { - unsigned int size=sizeof(T); + Transpose(size_t rows, size_t cols, size_t length, + T *in, T *out=NULL, size_t threads=fftw::maxthreads) { + size_t size=sizeof(T); if(size % sizeof(double) != 0) { std::cerr << "ERROR: Transpose is not implemented for type of size " << size; @@ -537,6 +456,10 @@ public: size /= sizeof(double); length *= size; + parallel::Threshold(threads); + if(length*rows*cols/2 < threshold) + threads=1; + fftw::planThreads(threads); fftw_iodim dims[3]; @@ -559,7 +482,8 @@ public: } ~Transpose() { - if(plan) fftw_destroy_plan(plan); + if(plan) + fftw_destroy_plan(plan); } template<class T> @@ -577,74 +501,35 @@ public: template<class T, class L> class Threadtable { public: - typedef std::map<T,threaddata,L> Table; + typedef std::map<T,size_t,L> Table; - threaddata Lookup(Table& table, T key) { + size_t Lookup(Table& table, T key) { typename Table::iterator p=table.find(key); - return p == table.end() ? threaddata() : p->second; + return p == table.end() ? 0 : p->second; } - void Store(Table& threadtable, T key, const threaddata& data) { - threadtable[key]=data; + void Store(Table& threadtable, T key, size_t t) { + threadtable[key]=t; } }; -struct keytype1 { - unsigned int nx; - unsigned int threads; +struct keytype { + size_t nx; + size_t M; + size_t threads; bool inplace; - keytype1(unsigned int nx, unsigned int threads, bool inplace) : - nx(nx), threads(threads), inplace(inplace) {} + keytype(size_t nx, size_t M, size_t threads, + bool inplace) : + nx(nx), M(M), threads(threads), inplace(inplace) {} }; -struct keyless1 { - bool operator()(const keytype1& a, const keytype1& b) const { +struct keyless { + bool operator()(const keytype& a, const keytype& b) const { return a.nx < b.nx || (a.nx == b.nx && - (a.threads < b.threads || (a.threads == b.threads && - a.inplace < b.inplace))); - } -}; - -struct keytype2 { - unsigned int nx; - unsigned int ny; - unsigned int threads; - bool inplace; - keytype2(unsigned int nx, unsigned int ny, unsigned int threads, - bool inplace) : - nx(nx), ny(ny), threads(threads), inplace(inplace) {} -}; - -struct keyless2 { - bool operator()(const keytype2& a, const keytype2& b) const { - return a.nx < b.nx || (a.nx == b.nx && - (a.ny < b.ny || (a.ny == b.ny && - (a.threads < b.threads || - (a.threads == b.threads && - a.inplace < b.inplace))))); - } -}; - -struct keytype3 { - unsigned int nx; - unsigned int ny; - unsigned int nz; - unsigned int threads; - bool inplace; - keytype3(unsigned int nx, unsigned int ny, unsigned int nz, - unsigned int threads, bool inplace) : - nx(nx), ny(ny), nz(nz), threads(threads), inplace(inplace) {} -}; - -struct keyless3 { - bool operator()(const keytype3& a, const keytype3& b) const { - return a.nx < b.nx || (a.nx == b.nx && - (a.ny < b.ny || (a.ny == b.ny && - (a.nz < b.nz || - (a.nz == b.nz && + (a.M < b.M || (a.M == b.M && (a.threads < b.threads || (a.threads == b.threads && - a.inplace < b.inplace))))))); + a.inplace < b.inplace))))); } }; @@ -671,28 +556,20 @@ struct keyless3 { // fft1d Backward(n,1); // Backward.fft(in); // -class fft1d : public fftw, public Threadtable<keytype1,keyless1> { - unsigned int nx; - static Table threadtable; +class fft1d : public fftw { + size_t nx; public: - fft1d(unsigned int nx, int sign, Complex *in=NULL, Complex *out=NULL, - unsigned int threads=maxthreads) + fft1d(size_t nx, int sign, Complex *in=NULL, Complex *out=NULL, + size_t threads=maxthreads) : fftw(2*nx,sign,threads), nx(nx) {Setup(in,out);} #ifdef __Array_h__ fft1d(int sign, const Array::array1<Complex>& in, const Array::array1<Complex>& out=Array::NULL1, - unsigned int threads=maxthreads) + size_t threads=maxthreads) : fftw(2*in.Nx(),sign,threads), nx(in.Nx()) {Setup(in,out);} #endif - threaddata lookup(bool inplace, unsigned int threads) { - return this->Lookup(threadtable,keytype1(nx,threads,inplace)); - } - void store(bool inplace, const threaddata& data) { - this->Store(threadtable,keytype1(nx,data.threads,inplace),data); - } - fftw_plan Plan(Complex *in, Complex *out) { return fftw_plan_dft_1d(nx,(fftw_complex *) in,(fftw_complex *) out, sign,effort); @@ -700,62 +577,126 @@ public: }; template<class I, class O> -class fftwblock : public virtual fftw { +class fftwblock : public virtual fftw, + public virtual Threadtable<keytype,keyless> { public: int nx; - unsigned int M; + size_t M; size_t istride,ostride; size_t idist,odist; fftw_plan plan1,plan2; - unsigned int T,Q,R; - fftwblock(unsigned int nx, unsigned int M, - size_t istride, size_t ostride, size_t idist, size_t odist, - Complex *in, Complex *out, unsigned int Threads) + size_t T,Q,R; + fftwblock() : plan1(NULL), plan2(NULL) {} + + fftwblock(size_t nx, size_t M, + size_t istride, size_t ostride, size_t idist, size_t odist) : fftw(), nx(nx), M(M), istride(istride), ostride(ostride), idist(Dist(nx,istride,idist)), odist(Dist(nx,ostride,odist)), - plan1(NULL), plan2(NULL) { + plan1(NULL), plan2(NULL) {} + + void init(Complex *in, Complex *out, size_t Threads, + Table& threadtable) { T=1; Q=M; R=0; - threaddata S1=Setup(in,out); - fftw_plan planT1=plan; - threads=S1.threads; - bool hermitian=typeid(I) == typeid(double) || typeid(O) == typeid(double); + if(Threads > M && M > 1) Threads=M; - if(fftw::maxthreads > 1 && (!hermitian || ostride*(nx/2+1) < idist)) { - if(Threads > 1) { - T=std::min(M,Threads); + threads=Threads; + Setup(in,out); + Threads=threads; + + size_t T0=Threads; + if(T0 > 1) { + size_t nxp=nx/2+1; + size_t olength=0; + size_t ilength=0; + if(typeid(I) == typeid(double)) { + ilength=nx; + olength=nxp; + } + if(typeid(O) == typeid(double)) { + ilength=nxp; + olength=nx; + } + if(!inplace || + (ostride*olength*sizeof(O) <= idist*sizeof(I) && + odist*sizeof(O) >= istride*ilength*sizeof(I))) { + T=T0; Q=T > 0 ? M/T : 0; R=M-Q*T; - threads=Threads; - threaddata ST=Setup(in,out); - - if(R > 0 && threads == 1 && plan1 != plan2) { - fftw_destroy_plan(plan2); - plan2=plan1; + size_t data=Lookup(threadtable,keytype(nx,M,Threads,inplace)); + if(data == 1) + T0=1; + else { + fftw_plan planFFTW=plan; + threads=1; + Setup(in,out); + plan1=plan; + if(data == T) { + plan=NULL; + return; + } + plan=planFFTW; } + } else T0=1; + } - if(ST.mean > S1.mean-S1.stdev) { // Use FFTW's multi-threading - fftw_destroy_plan(plan); - if(R > 0) { - fftw_destroy_plan(plan2); - plan2=NULL; - } - T=1; - Q=M; - R=0; - plan=planT1; - } else { // Do the multi-threading ourselves - fftw_destroy_plan(planT1); - threads=ST.threads; + if(T0 == 1 || time(in,out)) { // Use FFTW's multithreading + T=1; + if(plan1) { + fftw_destroy_plan(plan1); + plan1=NULL; + if(plan2) { + fftw_destroy_plan(plan2); + plan2=NULL; } - } else - Setup(in,out); // Synchronize wisdom + threads=Threads; + Store(threadtable,keytype(nx,M,Threads,inplace),T); + } + } else { // Do the multithreading ourselves + T=T0; + threads=T; + Store(threadtable,keytype(nx,M,Threads,inplace),T); } } + bool time(Complex *in, Complex *out) { + utils::statistics S(true),ST(true); + utils::statistics medianS(true),medianST(true); + + double eps=0.02; + + size_t T0=T; + + do { + T=1; // FFTW + utils::cpuTimer C; + inplace ? fftNormalized(in,out) : fft(in,out); + S.add(C.nanoseconds()); + + T=T0; // BLOCK + utils::cpuTimer CT; + inplace ? fftNormalized(in,out) : fft(in,out); + ST.add(CT.nanoseconds()); + + if(S.count() >= 4 && ST.min() >= S.max()) + return true; + + if(S.count() >= 4 && S.min() >= ST.max()) + return false; + + medianS.add(S.median()); + medianST.add(ST.median()); + + } while(S.count() < 5 || medianS.stderror() > eps*medianS.mean() || + medianST.stderror() > eps*medianST.mean()); + + return S.median() <= ST.median(); + } + + fftw_plan Plan(int Q, fftw_complex *in, fftw_complex *out) { return fftw_plan_many_dft(1,&nx,Q,in,NULL,istride,idist, out,NULL,ostride,odist,sign,effort); @@ -775,7 +716,6 @@ public: if(R > 0) { plan2=Plan(Q+1,(I *) in,(O *) out); if(!plan2) return NULL; - if(threads == 1) plan1=plan2; } return Plan(Q,(I *) in,(O *) out); } @@ -796,26 +736,62 @@ public: if(T == 1) Execute(plan,(I *) in,(O *) out); else { - unsigned int extra=T-R; + size_t extra=T-R; #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(T) #endif - for(unsigned int i=0; i < T; ++i) { - unsigned int iQ=i*Q; + for(size_t i=0; i < T; ++i) { + size_t iQ=i*Q; if(i < extra) - Execute(plan,(I *) in+iQ*idist,(O *) out+iQ*odist); + Execute(plan1,(I *) in+iQ*idist,(O *) out+iQ*odist); else { - unsigned int offset=iQ+i-extra; + size_t offset=iQ+i-extra; Execute(plan2,(I *) in+offset*idist,(O *) out+offset*odist); } } } } - unsigned int Threads() {return std::max(T,threads);} + size_t Threads() {return std::max(T,threads);} ~fftwblock() { - if(plan2) fftw_destroy_plan(plan2); + if(plan1) + fftw_destroy_plan(plan1); + if(plan2) + fftw_destroy_plan(plan2); + } +}; + +class Mfft1d : public fftwblock<fftw_complex,fftw_complex>, + public virtual Threadtable<keytype,keyless> { + static Table threadtable; +public: + Mfft1d(size_t nx, int sign, size_t M=1, + Complex *in=NULL, Complex *out=NULL, + size_t threads=maxthreads) : + fftw(2*((nx-1)+(M-1)*nx+1),sign,threads,nx), + fftwblock<fftw_complex,fftw_complex>(nx,M,1,1,nx,nx) { + init(in,out,threads,threadtable); + } + + Mfft1d(size_t nx, int sign, size_t M, size_t stride=1, + size_t dist=0, Complex *in=NULL, Complex *out=NULL, + size_t threads=maxthreads) : + fftw(2*((nx-1)*stride+(M-1)*Dist(nx,stride,dist)+1),sign,threads,nx), + fftwblock<fftw_complex,fftw_complex> + (nx,M,stride,stride,dist,dist) { + init(in,out,threads,threadtable); + } + + Mfft1d(size_t nx, int sign, size_t M, + size_t istride, size_t ostride, size_t idist, size_t odist, + Complex *in, Complex *out, size_t threads=maxthreads): + fftw(std::max(2*((nx-1)*istride+(M-1)*Dist(nx,istride,idist)+1), + 2*((nx-1)*ostride+(M-1)*Dist(nx,ostride,odist)+1)),sign, + threads,nx), + fftwblock<fftw_complex,fftw_complex>(nx,M,istride,ostride,idist,odist) + { + init(in,out,threads,threadtable); } }; @@ -844,38 +820,74 @@ public: // dist is the spacing between the first elements of the vectors. // // -class mfft1d : public fftwblock<fftw_complex,fftw_complex>, - public Threadtable<keytype3,keyless3> { - static Table threadtable; +class mfft1d { + bool single; + fft1d *fft1; + Mfft1d *fftm; public: - mfft1d(unsigned int nx, int sign, unsigned int M=1, + mfft1d(size_t nx, int sign, size_t M=1, Complex *in=NULL, Complex *out=NULL, - unsigned int threads=maxthreads) : - fftw(2*((nx-1)+(M-1)*nx+1),sign,threads,nx), - fftwblock<fftw_complex,fftw_complex> - (nx,M,1,1,nx,nx,in,out,threads) {} + size_t threads=fftw::maxthreads) : single(M == 1) { + if(single) + fft1=new fft1d(nx,sign,in,out,threads); + else + fftm=new Mfft1d(nx,sign,M,in,out,threads); + } - mfft1d(unsigned int nx, int sign, unsigned int M, size_t stride=1, + mfft1d(size_t nx, int sign, size_t M, size_t stride=1, size_t dist=0, Complex *in=NULL, Complex *out=NULL, - unsigned int threads=maxthreads) : - fftw(2*((nx-1)*stride+(M-1)*Dist(nx,stride,dist)+1),sign,threads,nx), - fftwblock<fftw_complex,fftw_complex> - (nx,M,stride,stride,dist,dist,in,out,threads) {} + size_t threads=fftw::maxthreads) : + single(M == 1 && stride == 1) { + if(single) + fft1=new fft1d(nx,sign,in,out,threads); + else + fftm=new Mfft1d(nx,sign,M,stride,dist,in,out,threads); + } - mfft1d(unsigned int nx, int sign, unsigned int M, + mfft1d(size_t nx, int sign, size_t M, size_t istride, size_t ostride, size_t idist, size_t odist, - Complex *in, Complex *out, unsigned int threads=maxthreads): - fftw(std::max(2*((nx-1)*istride+(M-1)*Dist(nx,istride,idist)+1), - 2*((nx-1)*ostride+(M-1)*Dist(nx,ostride,odist)+1)),sign, - threads, nx), - fftwblock<fftw_complex,fftw_complex>(nx,M,istride,ostride,idist,odist,in, - out,threads) {} + Complex *in, Complex *out, size_t threads=fftw::maxthreads) : + single(M == 1 && istride == 1 && ostride == 1) { + if(single) + fft1=new fft1d(nx,sign,in,out,threads); + else + fftm=new Mfft1d(nx,sign,M,istride,ostride,idist,odist,in,out,threads); + } + + size_t Threads() { + return single ? fft1->Threads() : fftm->Threads(); + } - threaddata lookup(bool inplace, unsigned int threads) { - return Lookup(threadtable,keytype3(nx,Q,R,threads,inplace)); + template<class I> + void fft(I in) { + single ? fft1->fft(in) : fftm->fft(in); } - void store(bool inplace, const threaddata& data) { - Store(threadtable,keytype3(nx,Q,R,data.threads,inplace),data); + + template<class I, class O> + void fft(I in, O out) { + single ? fft1->fft(in,out) : fftm->fft(in,out); + } + + template<class I> + void fftNormalized(I in) { + single ? fft1->fftNormalized(in) : fftm->fftNormalized(in); + } + + template<class I, class O> + void fftNormalized(I in, O out) { + single ? fft1->fftNormalized(in,out) : fftm->fftNormalized(in,out); + } + + template<class O> + void Normalize(O out) { + single ? fft1->Normalize(out) : fftm->Normalize(out); + } + + ~mfft1d() { + if(single) + delete fft1; + else + delete fftm; } }; @@ -898,24 +910,16 @@ public: // in contains the n real values stored as a Complex array; // out contains the first n/2+1 Complex Fourier values. // -class rcfft1d : public fftw, public Threadtable<keytype1,keyless1> { - unsigned int nx; - static Table threadtable; +class rcfft1d : public fftw { + size_t nx; public: - rcfft1d(unsigned int nx, Complex *out=NULL, unsigned int threads=maxthreads) + rcfft1d(size_t nx, Complex *out=NULL, size_t threads=maxthreads) : fftw(2*(nx/2+1),-1,threads,nx), nx(nx) {Setup(out,(double*) NULL);} - rcfft1d(unsigned int nx, double *in, Complex *out=NULL, - unsigned int threads=maxthreads) + rcfft1d(size_t nx, double *in, Complex *out=NULL, + size_t threads=maxthreads) : fftw(2*(nx/2+1),-1,threads,nx), nx(nx) {Setup(in,out);} - threaddata lookup(bool inplace, unsigned int threads) { - return Lookup(threadtable,keytype1(nx,threads,inplace)); - } - void store(bool inplace, const threaddata& data) { - Store(threadtable,keytype1(nx,data.threads,inplace),data); - } - fftw_plan Plan(Complex *in, Complex *out) { return fftw_plan_dft_r2c_1d(nx,(double *) in,(fftw_complex *) out, effort); } @@ -946,23 +950,15 @@ public: // in contains the first n/2+1 Complex Fourier values. // out contains the n real values stored as a Complex array; // -class crfft1d : public fftw, public Threadtable<keytype1,keyless1> { - unsigned int nx; - static Table threadtable; +class crfft1d : public fftw { + size_t nx; public: - crfft1d(unsigned int nx, double *out=NULL, unsigned int threads=maxthreads) + crfft1d(size_t nx, double *out=NULL, size_t threads=maxthreads) : fftw(2*(nx/2+1),1,threads,nx), nx(nx) {Setup(out);} - crfft1d(unsigned int nx, Complex *in, double *out=NULL, - unsigned int threads=maxthreads) - : fftw(realsize(nx,in,out),1,threads,nx), nx(nx) {Setup(in,out);} - - threaddata lookup(bool inplace, unsigned int threads) { - return Lookup(threadtable,keytype1(nx,threads,inplace)); - } - void store(bool inplace, const threaddata& data) { - Store(threadtable,keytype1(nx,data.threads,inplace),data); - } + crfft1d(size_t nx, Complex *in, double *out=NULL, + size_t threads=maxthreads) + : fftw(realsize(nx,Inplace(in,out)),1,threads,nx), nx(nx) {Setup(in,out);} fftw_plan Plan(Complex *in, Complex *out) { return fftw_plan_dft_c2r_1d(nx,(fftw_complex *) in,(double *) out,effort); @@ -973,6 +969,29 @@ public: } }; +class Mrcfft1d : public fftwblock<double,fftw_complex>, + public virtual Threadtable<keytype,keyless> { + static Table threadtable; +public: + Mrcfft1d(size_t nx, size_t M, size_t istride, size_t ostride, + size_t idist, size_t odist, double *in=NULL, Complex *out=NULL, + size_t threads=maxthreads) + : fftw(Doubles(nx,M,istride,ostride,idist,odist,Inplace(in,out)).csize, + -1,threads,nx), + fftwblock<double,fftw_complex> + (nx,M,istride,ostride,idist,odist) { + init((Complex *) in,out,threads,threadtable); + } + + void Normalize(Complex *out) { + fftw::Normalize<Complex>(nx/2+1,M,ostride,odist,out); + } + + void fftNormalized(double *in, Complex *out=NULL) { + fftw::fftNormalized<double,Complex>(nx/2+1,M,ostride,odist,in,out); + } +}; + // Compute the real Fourier transform of M real vectors, each of length n, // using phase sign -1. Before calling fft(), the array in must be // allocated as double[M*n] and the array out must be allocated as @@ -997,38 +1016,77 @@ public: // in contains the n real values stored as a Complex array; // out contains the first n/2+1 Complex Fourier values. // -class mrcfft1d : public fftwblock<double,fftw_complex>, - public Threadtable<keytype3,keyless3> { - static Table threadtable; +class mrcfft1d { + bool single; + rcfft1d *fft1; + Mrcfft1d *fftm; public: - mrcfft1d(unsigned int nx, unsigned int M, - size_t istride, size_t ostride, - size_t idist, size_t odist, - double *in=NULL, Complex *out=NULL, - unsigned int threads=maxthreads) - : fftw(std::max((realsize(nx,in,out)-2)*istride+(M-1)*idist+2, - 2*(nx/2*ostride+(M-1)*odist+1)),-1,threads,nx), - fftwblock<double,fftw_complex> - (nx,M,istride,ostride,idist,odist,(Complex *) in,out,threads) {} + mrcfft1d(size_t nx, size_t M, size_t istride, size_t ostride, + size_t idist, size_t odist, double *in=NULL, Complex *out=NULL, + size_t threads=fftw::maxthreads) : + single(M == 1 && istride == 1 && ostride == 1) { + if(single) + fft1=new rcfft1d(nx,in,out,threads); + else + fftm=new Mrcfft1d(nx,M,istride,ostride,idist,odist,in,out,threads); + } - threaddata lookup(bool inplace, unsigned int threads) { - return Lookup(threadtable,keytype3(nx,Q,R,threads,inplace)); + size_t Threads() { + return single ? fft1->Threads() : fftm->Threads(); } - void store(bool inplace, const threaddata& data) { - Store(threadtable,keytype3(nx,Q,R,data.threads,inplace),data); + template<class I> + void fft(I in) { + single ? fft1->fft(in) : fftm->fft(in); + } + + template<class I, class O> + void fft(I in, O out) { + single ? fft1->fft(in,out) : fftm->fft(in,out); } void Normalize(Complex *out) { - fftw::Normalize<Complex>(nx/2+1,M,ostride,odist,out); + single ? fft1->Normalize(out) : fftm->Normalize(out); + } + + template<class I> + void fftNormalized(I in) { + single ? fft1->fftNormalized(in) : fftm->fftNormalized(in); } - void fftNormalized(double *in, Complex *out=NULL, bool shift=false) { - fftw::fftNormalized<double,Complex>(nx/2+1,M,ostride,odist,in,out,false); + template<class I, class O> + void fftNormalized(I in, O out=NULL) { + single ? fft1->fftNormalized(in,out) : fftm->fftNormalized(in,out); } - void fft0Normalized(double *in, Complex *out=NULL) { - fftw::fftNormalized<double,Complex>(nx/2+1,M,ostride,odist,in,out,true); + ~mrcfft1d() { + if(single) + delete fft1; + else + delete fftm; + } +}; + +class Mcrfft1d : public fftwblock<fftw_complex,double>, + public virtual Threadtable<keytype,keyless> { + static Table threadtable; +public: + Mcrfft1d(size_t nx, size_t M, size_t istride, size_t ostride, + size_t idist, size_t odist, Complex *in=NULL, double *out=NULL, + size_t threads=maxthreads) + : fftw(Doubles(nx,M,ostride,istride,odist,idist,Inplace(in,out)).rsize, + 1,threads,nx), + fftwblock<fftw_complex,double> + (nx,M,istride,ostride,idist,odist) { + init(in,(Complex *) out,threads,threadtable); + } + + void Normalize(double *out) { + fftw::Normalize<double>(nx,M,ostride,odist,out); + } + + void fftNormalized(Complex *in, double *out=NULL) { + fftw::fftNormalized<Complex,double>(nx,M,ostride,odist,in,out); } }; @@ -1055,36 +1113,54 @@ public: // in contains the first n/2+1 Complex Fourier values; // out contains the n real values stored as a Complex array. // -class mcrfft1d : public fftwblock<fftw_complex,double>, - public Threadtable<keytype3,keyless3> { - static Table threadtable; +class mcrfft1d { + bool single; + crfft1d *fft1; + Mcrfft1d *fftm; public: - mcrfft1d(unsigned int nx, unsigned int M, size_t istride, size_t ostride, + mcrfft1d(size_t nx, size_t M, size_t istride, size_t ostride, size_t idist, size_t odist, Complex *in=NULL, double *out=NULL, - unsigned int threads=maxthreads) - : fftw(std::max(2*(nx/2*istride+(M-1)*idist+1), - (realsize(nx,in,out)-2)*ostride+(M-1)*odist+2),1,threads,nx), - fftwblock<fftw_complex,double> - (nx,M,istride,ostride,idist,odist,in,(Complex *) out,threads) {} + size_t threads=fftw::maxthreads) : + single(M == 1 && istride == 1 && ostride == 1) { + if(single) + fft1=new crfft1d(nx,in,out,threads); + else + fftm=new Mcrfft1d(nx,M,istride,ostride,idist,odist,in,out,threads); + } + + size_t Threads() { + return single ? fft1->Threads() : fftm->Threads(); + } - threaddata lookup(bool inplace, unsigned int threads) { - return Lookup(threadtable,keytype3(nx,Q,R,threads,inplace)); + template<class I> + void fft(I in) { + single ? fft1->fft(in) : fftm->fft(in); } - void store(bool inplace, const threaddata& data) { - Store(threadtable,keytype3(nx,Q,R,data.threads,inplace),data); + template<class I, class O> + void fft(I in, O out) { + single ? fft1->fft(in,out) : fftm->fft(in,out); } void Normalize(double *out) { - fftw::Normalize<double>(nx,M,ostride,odist,out); + single ? fft1->Normalize(out) : fftm->Normalize(out); } - void fftNormalized(Complex *in, double *out=NULL, bool shift=false) { - fftw::fftNormalized<Complex,double>(nx,M,ostride,odist,in,out,false); + template<class I> + void fftNormalized(I in) { + single ? fft1->fftNormalized(in) : fftm->fftNormalized(in); } - void fft0Normalized(Complex *in, double *out=NULL) { - fftw::fftNormalized<Complex,double>(nx,M,ostride,odist,in,out,true); + template<class I, class O> + void fftNormalized(I in, O out=NULL) { + single ? fft1->fftNormalized(in,out) : fftm->fftNormalized(in,out); + } + + ~mcrfft1d() { + if(single) + delete fft1; + else + delete fftm; } }; @@ -1114,31 +1190,23 @@ public: // Note: // in[ny*i+j] contains the ny Complex values for each i=0,...,nx-1. // -class fft2d : public fftw, public Threadtable<keytype2,keyless2> { - unsigned int nx; - unsigned int ny; - static Table threadtable; +class fft2d : public fftw { + size_t nx; + size_t ny; public: - fft2d(unsigned int nx, unsigned int ny, int sign, Complex *in=NULL, - Complex *out=NULL, unsigned int threads=maxthreads) + fft2d(size_t nx, size_t ny, int sign, Complex *in=NULL, + Complex *out=NULL, size_t threads=maxthreads) : fftw(2*nx*ny,sign,threads), nx(nx), ny(ny) {Setup(in,out);} #ifdef __Array_h__ fft2d(int sign, const Array::array2<Complex>& in, const Array::array2<Complex>& out=Array::NULL2, - unsigned int threads=maxthreads) + size_t threads=maxthreads) : fftw(2*in.Size(),sign,threads), nx(in.Nx()), ny(in.Ny()) { Setup(in,out); } #endif - threaddata lookup(bool inplace, unsigned int threads) { - return this->Lookup(threadtable,keytype2(nx,ny,threads,inplace)); - } - void store(bool inplace, const threaddata& data) { - this->Store(threadtable,keytype2(nx,ny,data.threads,inplace),data); - } - fftw_plan Plan(Complex *in, Complex *out) { return fftw_plan_dft_2d(nx,ny,(fftw_complex *) in,(fftw_complex *) out, sign,effort); @@ -1173,15 +1241,15 @@ public: // out contains the upper-half portion (ky >= 0) of the Complex transform. // class rcfft2d : public fftw { - unsigned int nx; - unsigned int ny; + size_t nx; + size_t ny; public: - rcfft2d(unsigned int nx, unsigned int ny, Complex *out=NULL, - unsigned int threads=maxthreads) + rcfft2d(size_t nx, size_t ny, Complex *out=NULL, + size_t threads=maxthreads) : fftw(2*nx*(ny/2+1),-1,threads,nx*ny), nx(nx), ny(ny) {Setup(out);} - rcfft2d(unsigned int nx, unsigned int ny, double *in, Complex *out=NULL, - unsigned int threads=maxthreads) + rcfft2d(size_t nx, size_t ny, double *in, Complex *out=NULL, + size_t threads=maxthreads) : fftw(2*nx*(ny/2+1),-1,threads,nx*ny), nx(nx), ny(ny) { Setup(in,out); } @@ -1201,18 +1269,18 @@ public: // Set Nyquist modes of even shifted transforms to zero. void deNyquist(Complex *f) { - unsigned int nyp=ny/2+1; + size_t nyp=ny/2+1; if(nx % 2 == 0) #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) #endif - for(unsigned int j=0; j < nyp; ++j) + for(size_t j=0; j < nyp; ++j) f[j]=0.0; if(ny % 2 == 0) #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) #endif - for(unsigned int i=0; i < nx; ++i) + for(size_t i=0; i < nx; ++i) f[(i+1)*nyp-1]=0.0; } }; @@ -1242,16 +1310,16 @@ public: // out contains the nx*ny real values stored as a Complex array. // class crfft2d : public fftw { - unsigned int nx; - unsigned int ny; + size_t nx; + size_t ny; public: - crfft2d(unsigned int nx, unsigned int ny, double *out=NULL, - unsigned int threads=maxthreads) : + crfft2d(size_t nx, size_t ny, double *out=NULL, + size_t threads=maxthreads) : fftw(2*nx*(ny/2+1),1,threads,nx*ny), nx(nx), ny(ny) {Setup(out);} - crfft2d(unsigned int nx, unsigned int ny, Complex *in, double *out=NULL, - unsigned int threads=maxthreads) - : fftw(nx*realsize(ny,in,out),1,threads,nx*ny), nx(nx), ny(ny) { + crfft2d(size_t nx, size_t ny, Complex *in, double *out=NULL, + size_t threads=maxthreads) + : fftw(nx*realsize(ny,Inplace(in,out)),1,threads,nx*ny), nx(nx), ny(ny) { Setup(in,out); } @@ -1270,18 +1338,18 @@ public: // Set Nyquist modes of even shifted transforms to zero. void deNyquist(Complex *f) { - unsigned int nyp=ny/2+1; + size_t nyp=ny/2+1; if(nx % 2 == 0) #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) #endif - for(unsigned int j=0; j < nyp; ++j) + for(size_t j=0; j < nyp; ++j) f[j]=0.0; if(ny % 2 == 0) #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) #endif - for(unsigned int i=0; i < nx; ++i) + for(size_t i=0; i < nx; ++i) f[(i+1)*nyp-1]=0.0; } }; @@ -1314,19 +1382,19 @@ public: // indexed by i=0,...,nx-1, j=0,...,ny-1, and k=0,...,nz-1. // class fft3d : public fftw { - unsigned int nx; - unsigned int ny; - unsigned int nz; + size_t nx; + size_t ny; + size_t nz; public: - fft3d(unsigned int nx, unsigned int ny, unsigned int nz, + fft3d(size_t nx, size_t ny, size_t nz, int sign, Complex *in=NULL, Complex *out=NULL, - unsigned int threads=maxthreads) + size_t threads=maxthreads) : fftw(2*nx*ny*nz,sign,threads), nx(nx), ny(ny), nz(nz) {Setup(in,out);} #ifdef __Array_h__ fft3d(int sign, const Array::array3<Complex>& in, const Array::array3<Complex>& out=Array::NULL3, - unsigned int threads=maxthreads) + size_t threads=maxthreads) : fftw(2*in.Size(),sign,threads), nx(in.Nx()), ny(in.Ny()), nz(in.Nz()) {Setup(in,out);} #endif @@ -1360,18 +1428,18 @@ public: // out contains the upper-half portion (kz >= 0) of the Complex transform. // class rcfft3d : public fftw { - unsigned int nx; - unsigned int ny; - unsigned int nz; + size_t nx; + size_t ny; + size_t nz; public: - rcfft3d(unsigned int nx, unsigned int ny, unsigned int nz, Complex *out=NULL, - unsigned int threads=maxthreads) + rcfft3d(size_t nx, size_t ny, size_t nz, Complex *out=NULL, + size_t threads=maxthreads) : fftw(2*nx*ny*(nz/2+1),-1,threads,nx*ny*nz), nx(nx), ny(ny), nz(nz) { Setup(out); } - rcfft3d(unsigned int nx, unsigned int ny, unsigned int nz, double *in, - Complex *out=NULL, unsigned int threads=maxthreads) + rcfft3d(size_t nx, size_t ny, size_t nz, double *in, + Complex *out=NULL, size_t threads=maxthreads) : fftw(2*nx*ny*(nz/2+1),-1,threads,nx*ny*nz), nx(nx), ny(ny), nz(nz) {Setup(in,out);} @@ -1390,13 +1458,13 @@ public: // Set Nyquist modes of even shifted transforms to zero. void deNyquist(Complex *f) { - unsigned int nzp=nz/2+1; - unsigned int yz=ny*nzp; + size_t nzp=nz/2+1; + size_t yz=ny*nzp; if(nx % 2 == 0) { #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) #endif - for(unsigned int k=0; k < yz; ++k) + for(size_t k=0; k < yz; ++k) f[k]=0.0; } @@ -1404,9 +1472,9 @@ public: #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) #endif - for(unsigned int i=0; i < nx; ++i) { - unsigned int iyz=i*yz; - for(unsigned int k=0; k < nzp; ++k) + for(size_t i=0; i < nx; ++i) { + size_t iyz=i*yz; + for(size_t k=0; k < nzp; ++k) f[iyz+k]=0.0; } } @@ -1415,8 +1483,8 @@ public: #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) #endif - for(unsigned int i=0; i < nx; ++i) - for(unsigned int j=0; j < ny; ++j) + for(size_t i=0; i < nx; ++i) + for(size_t j=0; j < ny; ++j) f[i*yz+(j+1)*nzp-1]=0.0; } }; @@ -1446,19 +1514,19 @@ public: // out contains the nx*ny*nz real values stored as a Complex array. // class crfft3d : public fftw { - unsigned int nx; - unsigned int ny; - unsigned int nz; + size_t nx; + size_t ny; + size_t nz; public: - crfft3d(unsigned int nx, unsigned int ny, unsigned int nz, double *out=NULL, - unsigned int threads=maxthreads) + crfft3d(size_t nx, size_t ny, size_t nz, double *out=NULL, + size_t threads=maxthreads) : fftw(2*nx*ny*(nz/2+1),1,threads,nx*ny*nz), nx(nx), ny(ny), nz(nz) {Setup(out);} - crfft3d(unsigned int nx, unsigned int ny, unsigned int nz, Complex *in, - double *out=NULL, unsigned int threads=maxthreads) - : fftw(nx*ny*(realsize(nz,in,out)),1,threads,nx*ny*nz), nx(nx), ny(ny), - nz(nz) {Setup(in,out);} + crfft3d(size_t nx, size_t ny, size_t nz, Complex *in, + double *out=NULL, size_t threads=maxthreads) + : fftw(nx*ny*(realsize(nz,Inplace(in,out))),1,threads,nx*ny*nz), + nx(nx), ny(ny), nz(nz) {Setup(in,out);} fftw_plan Plan(Complex *in, Complex *out) { return fftw_plan_dft_c2r_3d(nx,ny,nz,(fftw_complex *) in,(double *) out, @@ -1475,13 +1543,13 @@ public: // Set Nyquist modes of even shifted transforms to zero. void deNyquist(Complex *f) { - unsigned int nzp=nz/2+1; - unsigned int yz=ny*nzp; + size_t nzp=nz/2+1; + size_t yz=ny*nzp; if(nx % 2 == 0) { #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) #endif - for(unsigned int k=0; k < yz; ++k) + for(size_t k=0; k < yz; ++k) f[k]=0.0; } @@ -1489,9 +1557,9 @@ public: #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) #endif - for(unsigned int i=0; i < nx; ++i) { - unsigned int iyz=i*yz; - for(unsigned int k=0; k < nzp; ++k) + for(size_t i=0; i < nx; ++i) { + size_t iyz=i*yz; + for(size_t k=0; k < nzp; ++k) f[iyz+k]=0.0; } } @@ -1500,8 +1568,8 @@ public: #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) #endif - for(unsigned int i=0; i < nx; ++i) - for(unsigned int j=0; j < ny; ++j) + for(size_t i=0; i < nx; ++i) + for(size_t j=0; j < ny; ++j) f[i*yz+(j+1)*nzp-1]=0.0; } }; diff --git a/graphics/asymptote/generate_enums.py b/graphics/asymptote/generate_enums.py index 07f2d77231..6558243745 100755 --- a/graphics/asymptote/generate_enums.py +++ b/graphics/asymptote/generate_enums.py @@ -14,7 +14,9 @@ from typing import List, Tuple, Any, Union from datetime import datetime import io import argparse +import os import sys +import time import re def cleanComment(s): @@ -47,12 +49,18 @@ def create_enums(filename: str) -> List[Union[Tuple[str, int, str], Tuple[str, i return final_list +def datetime_now(): + return datetime.utcfromtimestamp( + int(os.environ.get('SOURCE_DATE_EPOCH', time.time())) + ) + + def generate_enum_cpp(outname, enums, name, comment=None, *args, **kwargs): with io.open(outname, 'w') as fil: fil.write('// Enum class for {0}\n'.format(name)) if comment is not None: fil.write('// {0}\n'.format(comment)) - fil.write('// Generated at {0}\n\n'.format(datetime.now())) + fil.write('// Generated at {0}\n\n'.format(datetime_now())) if 'namespace' in kwargs: fil.write('namespace {0}\n'.format(kwargs['namespace'])) fil.write('{\n') @@ -79,7 +87,7 @@ def generate_enum_java(outname, enums, name, comment=None, *args, **kwargs): fil.write('// Enum class for {0}\n'.format(name)) if comment is not None: fil.write('// {0}\n'.format(comment)) - fil.write('// Generated at {0}\n\n'.format(datetime.now())) + fil.write('// Generated at {0}\n\n'.format(datetime_now())) if 'package' in kwargs: fil.write('package {0};\n'.format(kwargs['package'])) @@ -122,7 +130,7 @@ def generate_enum_asy(outname, enums, name, comment=None, *args, **kwargs): fil.write('// Enum class for {0}\n'.format(name)) if comment is not None: fil.write('// {0}\n'.format(comment)) - fil.write('// Generated at {0}\n\n'.format(datetime.now())) + fil.write('// Generated at {0}\n\n'.format(datetime_now())) fil.write('struct {0}\n'.format(name)) fil.write('{\n') @@ -145,7 +153,7 @@ def generate_enum_py(outname, enums, name, comment=None, *args, **kwargs): fil.write('# Enum class for {0}\n'.format(name)) if comment is not None: fil.write('""" {0} """\n'.format(comment)) - fil.write('# Generated at {0}\n\n'.format(datetime.now())) + fil.write('# Generated at {0}\n\n'.format(datetime_now())) fil.write('class {0}:\n'.format(name)) for enumTxt, enumNum, *ar in enums: fil.write(' {0}_{2}={1}\n'.format(name, enumNum, enumTxt)) diff --git a/graphics/asymptote/glrender.cc b/graphics/asymptote/glrender.cc index d43a72d034..2bcfe1cae5 100644 --- a/graphics/asymptote/glrender.cc +++ b/graphics/asymptote/glrender.cc @@ -68,7 +68,7 @@ pthread_t mainthread; #endif using settings::locateFile; -using utils::seconds; +using utils::stopWatch; #endif // HAVE_GL @@ -1194,6 +1194,8 @@ void nextframe(int) if(Step) Animate=false; } +stopWatch Timer; + void display() { if(queueScreen) { @@ -1205,9 +1207,9 @@ void display() drawscene(Width,Height); if(fps) { if(framecount < 20) // Measure steady-state framerate - seconds(); + Timer.reset(); else { - double s=seconds(); + double s=Timer.seconds(true); if(s > 0.0) { double rate=1.0/s; S.add(rate); @@ -2508,11 +2510,11 @@ void refreshBuffers() first=false; } unsigned int N=10000; - seconds(); + stopWatch Timer; for(unsigned int i=0; i < N; ++i) partialSums(); glFinish(); - double T=seconds()/N; + double T=Timer.seconds()/N; cout << "elements=" << gl::elements << endl; cout << "Tmin (ms)=" << T*1e3 << endl; cout << "Megapixels/second=" << gl::elements/T/1e6 << endl; diff --git a/graphics/asymptote/main.cc b/graphics/asymptote/main.cc index 6c69f669b9..c2b7b627bb 100644 --- a/graphics/asymptote/main.cc +++ b/graphics/asymptote/main.cc @@ -44,6 +44,10 @@ #include "interact.h" #include "fileio.h" +#ifdef HAVE_LIBFFTW3 +#include "fftw++.h" +#endif + #ifdef HAVE_LSP #include "lspserv.h" #endif @@ -114,6 +118,9 @@ void signalHandler(int) void interruptHandler(int) { +#ifdef HAVE_LIBFFTW3 + fftwpp::saveWisdom(); +#endif em.Interrupt(true); } @@ -140,6 +147,7 @@ void *asymain(void *A) setsignal(signalHandler); Args *args=(Args *) A; fpu_trap(trap()); + fftwpp::wisdomName=".wisdom"; if(interactive) { Signal(SIGINT,interruptHandler); diff --git a/graphics/asymptote/parallel.cc b/graphics/asymptote/parallel.cc new file mode 100644 index 0000000000..66bb85a342 --- /dev/null +++ b/graphics/asymptote/parallel.cc @@ -0,0 +1,74 @@ +#include <iostream> +#include <cstdlib> +#include <cstdint> + +#include "parallel.h" + +#ifndef __Complex_h__ +#include <complex> +typedef std::complex<double> Complex; +#endif + +#include "statistics.h" +#include "align.h" +#include <chrono> + +namespace utils { +int ALIGNMENT=2*sizeof(Complex); // Must be a multiple of sizeof(Complex) +} + +using namespace utils; + +size_t threshold=SIZE_MAX; + +namespace parallel { + +size_t lastThreads=SIZE_MAX; + +const size_t maxThreshold=1 << 24; + +size_t parallelLoop(Complex *A, size_t m, size_t threads) +{ + auto T0=std::chrono::steady_clock::now(); + PARALLEL( + for(size_t k=0; k < m; ++k) + A[k]=k; + ); + PARALLEL( + for(size_t k=0; k < m; ++k) + A[k] *= k; + ); + auto T1=std::chrono::steady_clock::now(); + + auto elapsed=std::chrono::duration_cast<std::chrono::nanoseconds> + (T1-T0); + return elapsed.count(); +} + +size_t measureThreshold(size_t threads) +{ + if(threads > 1) { + for(size_t m=1; m < maxThreshold; m *= 2) { + Complex *A=ComplexAlign(m); + if(!A) + break; + if(parallelLoop(A,m,threads) < parallelLoop(A,m,1)) + return m; + deleteAlign(A); + } + } + return maxThreshold; +} + +void Threshold(size_t threads) +{ + if(threads > 1 && threads < lastThreads) { + statistics S(true); + for(size_t i=0; i < 10; ++i) + S.add(measureThreshold(threads)); + threshold=S.median(); + lastThreads=threads; + } +} + +} diff --git a/graphics/asymptote/parallel.h b/graphics/asymptote/parallel.h new file mode 100644 index 0000000000..0daa164e6f --- /dev/null +++ b/graphics/asymptote/parallel.h @@ -0,0 +1,63 @@ +#pragma once + +#ifndef _OPENMP +#ifndef SINGLE_THREAD +#define SINGLE_THREAD +#endif +#endif + +#ifndef SINGLE_THREAD +#include <omp.h> +#endif + +extern size_t threshold; + +namespace parallel { +extern size_t lastThreads; +inline int get_thread_num() +{ +#ifdef SINGLE_THREAD + return 0; +#else + return omp_get_thread_num(); +#endif +} + +inline int get_max_threads() +{ +#ifdef SINGLE_THREAD + return 1; +#else + return omp_get_max_threads(); +#endif +} +} + +#ifndef SINGLE_THREAD +#define PARALLEL(code) \ + if(threads > 1) { \ + _Pragma("omp parallel for num_threads(threads)") \ + code \ + } else {code} +#else +#define PARALLEL(code) {code} +#endif + +#ifndef SINGLE_THREAD +#define OMPIF(condition,directive,code) \ + if(threads > 1 && condition) { \ + _Pragma(directive) \ + code \ + } else {code} +#else +#define OMPIF(condition,directive,code) {code} +#endif + +#define PARALLELIF(condition,code) \ + OMPIF(condition,"omp parallel for num_threads(threads)",code) + +namespace parallel { + +void Threshold(size_t threads); + +} diff --git a/graphics/asymptote/picture.cc b/graphics/asymptote/picture.cc index 6a28ad712a..2412863f60 100644 --- a/graphics/asymptote/picture.cc +++ b/graphics/asymptote/picture.cc @@ -635,7 +635,11 @@ bool picture::texprocess(const string& texname, const string& outname, int picture::epstopdf(const string& epsname, const string& pdfname) { - string compress=getSetting<bool>("compress") ? "true" : "false"; + string outputformat=getSetting<string>("outformat"); + bool pdf=settings::pdf(getSetting<string>("tex")); + bool pdfformat=(pdf && outputformat == "") || outputformat == "pdf"; + string compress=getSetting<bool>("compress") && pdfformat ? + "true" : "false"; mem::vector<string> cmd; cmd.push_back(getSetting<string>("gs")); cmd.push_back("-q"); diff --git a/graphics/asymptote/revision.cc b/graphics/asymptote/revision.cc index d262223887..e061cbfb3b 100644 --- a/graphics/asymptote/revision.cc +++ b/graphics/asymptote/revision.cc @@ -1,2 +1,2 @@ -const char *REVISION="2.83"; +const char *REVISION="2.84"; const char *AsyGLVersion="1.02"; diff --git a/graphics/asymptote/runarray.cc b/graphics/asymptote/runarray.cc index 3e7a6f7093..f841e0f522 100644 --- a/graphics/asymptote/runarray.cc +++ b/graphics/asymptote/runarray.cc @@ -2348,7 +2348,7 @@ void gen_runarray70(stack *Stack) #ifdef HAVE_EIGEN_DENSE size_t n=checkArray(a); - MatrixXd A=MatrixXd::Random(n,n); + MatrixXd A(n,n); RealSchur<MatrixXd> schur(n); array *S=new array(2); @@ -2400,7 +2400,7 @@ void gen_runarray71(stack *Stack) #ifdef HAVE_EIGEN_DENSE size_t n=checkArray(a); - MatrixXcd A=MatrixXcd::Random(n,n); + MatrixXcd A(n,n); ComplexSchur<MatrixXcd> schur(n); array *S=new array(2); diff --git a/graphics/asymptote/runarray.in b/graphics/asymptote/runarray.in index fdc28f2d3c..6748f7a890 100644 --- a/graphics/asymptote/runarray.in +++ b/graphics/asymptote/runarray.in @@ -1986,7 +1986,7 @@ realarray3* _schur(realarray2 *a) #ifdef HAVE_EIGEN_DENSE size_t n=checkArray(a); - MatrixXd A=MatrixXd::Random(n,n); + MatrixXd A(n,n); RealSchur<MatrixXd> schur(n); array *S=new array(2); @@ -2034,7 +2034,7 @@ pairarray3* _schur(pairarray2 *a) #ifdef HAVE_EIGEN_DENSE size_t n=checkArray(a); - MatrixXcd A=MatrixXcd::Random(n,n); + MatrixXcd A(n,n); ComplexSchur<MatrixXcd> schur(n); array *S=new array(2); diff --git a/graphics/asymptote/runtime.cc b/graphics/asymptote/runtime.cc index 7a6a32d6c1..18b9e162f0 100644 --- a/graphics/asymptote/runtime.cc +++ b/graphics/asymptote/runtime.cc @@ -204,6 +204,8 @@ const item Default=item(default_t()); namespace run { +stopWatch wallClock; + const char *arrayempty="cannot take min or max of empty array"; const char *noruntime="no runtime environment for embedded eval"; @@ -254,54 +256,54 @@ void unused(void *) namespace run { // Initializers -#line 226 "runtime.in" +#line 228 "runtime.in" void IntZero(stack *Stack) { -#line 227 "runtime.in" +#line 229 "runtime.in" {Stack->push<Int>(0); return;} } -#line 232 "runtime.in" +#line 234 "runtime.in" void realZero(stack *Stack) { -#line 233 "runtime.in" +#line 235 "runtime.in" {Stack->push<real>(0.0); return;} } -#line 237 "runtime.in" +#line 239 "runtime.in" void boolFalse(stack *Stack) { -#line 238 "runtime.in" +#line 240 "runtime.in" {Stack->push<bool>(false); return;} } -#line 242 "runtime.in" +#line 244 "runtime.in" // bool isnan(real x); void gen_runtime3(stack *Stack) { real x=vm::pop<real>(Stack); -#line 243 "runtime.in" +#line 245 "runtime.in" {Stack->push<bool>(std::isnan(x)); return;} } -#line 247 "runtime.in" +#line 249 "runtime.in" void pushNullArray(stack *Stack) { -#line 248 "runtime.in" +#line 250 "runtime.in" {Stack->push<array*>(0); return;} } -#line 252 "runtime.in" +#line 254 "runtime.in" void pushNullRecord(stack *Stack) { -#line 253 "runtime.in" +#line 255 "runtime.in" {Stack->push<frame*>(0); return;} } -#line 257 "runtime.in" +#line 259 "runtime.in" void pushNullFunction(stack *Stack) { -#line 258 "runtime.in" +#line 260 "runtime.in" {Stack->push(nullfunc::instance()); return;} } @@ -310,222 +312,222 @@ void pushNullFunction(stack *Stack) // Put the default value token on the stack (in place of an argument when // making a function call). -#line 267 "runtime.in" +#line 269 "runtime.in" void pushDefault(stack *Stack) { -#line 268 "runtime.in" +#line 270 "runtime.in" {Stack->push(Default); return;} } // Test if the value on the stack is the default value token. -#line 274 "runtime.in" +#line 276 "runtime.in" void isDefault(stack *Stack) { item i=vm::pop(Stack); -#line 275 "runtime.in" +#line 277 "runtime.in" {Stack->push<bool>(isdefault(i)); return;} } // Casts -#line 281 "runtime.in" +#line 283 "runtime.in" void pairToGuide(stack *Stack) { pair z=vm::pop<pair>(Stack); -#line 282 "runtime.in" +#line 284 "runtime.in" {Stack->push<guide*>(new pairguide(z)); return;} } -#line 287 "runtime.in" +#line 289 "runtime.in" void pathToGuide(stack *Stack) { path p=vm::pop<path>(Stack); -#line 288 "runtime.in" +#line 290 "runtime.in" {Stack->push<guide*>(new pathguide(p)); return;} } -#line 292 "runtime.in" +#line 294 "runtime.in" void guideToPath(stack *Stack) { guide * g=vm::pop<guide *>(Stack); -#line 293 "runtime.in" +#line 295 "runtime.in" {Stack->push<path>(g->solve()); return;} } // Pen operations -#line 299 "runtime.in" +#line 301 "runtime.in" void newPen(stack *Stack) { -#line 300 "runtime.in" +#line 302 "runtime.in" {Stack->push<pen>(pen()); return;} } -#line 305 "runtime.in" +#line 307 "runtime.in" // bool ==(pen a, pen b); void gen_runtime13(stack *Stack) { pen b=vm::pop<pen>(Stack); pen a=vm::pop<pen>(Stack); -#line 306 "runtime.in" +#line 308 "runtime.in" {Stack->push<bool>(a == b); return;} } -#line 310 "runtime.in" +#line 312 "runtime.in" // bool !=(pen a, pen b); void gen_runtime14(stack *Stack) { pen b=vm::pop<pen>(Stack); pen a=vm::pop<pen>(Stack); -#line 311 "runtime.in" +#line 313 "runtime.in" {Stack->push<bool>(a != b); return;} } -#line 315 "runtime.in" +#line 317 "runtime.in" // pen +(pen a, pen b); void gen_runtime15(stack *Stack) { pen b=vm::pop<pen>(Stack); pen a=vm::pop<pen>(Stack); -#line 316 "runtime.in" +#line 318 "runtime.in" {Stack->push<pen>(a+b); return;} } -#line 320 "runtime.in" +#line 322 "runtime.in" // pen *(real a, pen b); void gen_runtime16(stack *Stack) { pen b=vm::pop<pen>(Stack); real a=vm::pop<real>(Stack); -#line 321 "runtime.in" +#line 323 "runtime.in" {Stack->push<pen>(a*b); return;} } -#line 325 "runtime.in" +#line 327 "runtime.in" // pen *(pen a, real b); void gen_runtime17(stack *Stack) { real b=vm::pop<real>(Stack); pen a=vm::pop<pen>(Stack); -#line 326 "runtime.in" +#line 328 "runtime.in" {Stack->push<pen>(b*a); return;} } -#line 330 "runtime.in" +#line 332 "runtime.in" // pair max(pen p); void gen_runtime18(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 331 "runtime.in" +#line 333 "runtime.in" {Stack->push<pair>(p.bounds().Max()); return;} } -#line 335 "runtime.in" +#line 337 "runtime.in" // pair min(pen p); void gen_runtime19(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 336 "runtime.in" +#line 338 "runtime.in" {Stack->push<pair>(p.bounds().Min()); return;} } // Reset the meaning of pen default attributes. -#line 341 "runtime.in" +#line 343 "runtime.in" // void resetdefaultpen(); void gen_runtime20(stack *) { -#line 342 "runtime.in" +#line 344 "runtime.in" processData().defaultpen=camp::pen::initialpen(); } -#line 346 "runtime.in" +#line 348 "runtime.in" // void defaultpen(pen p); void gen_runtime21(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 347 "runtime.in" +#line 349 "runtime.in" processData().defaultpen=pen(resolvepen,p); } -#line 351 "runtime.in" +#line 353 "runtime.in" // pen defaultpen(); void gen_runtime22(stack *Stack) { -#line 352 "runtime.in" +#line 354 "runtime.in" {Stack->push<pen>(processData().defaultpen); return;} } -#line 356 "runtime.in" +#line 358 "runtime.in" // bool invisible(pen p); void gen_runtime23(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 357 "runtime.in" +#line 359 "runtime.in" {Stack->push<bool>(p.invisible()); return;} } -#line 361 "runtime.in" +#line 363 "runtime.in" // pen invisible(); void gen_runtime24(stack *Stack) { -#line 362 "runtime.in" +#line 364 "runtime.in" {Stack->push<pen>(pen(invisiblepen)); return;} } -#line 366 "runtime.in" +#line 368 "runtime.in" // pen gray(pen p); void gen_runtime25(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 367 "runtime.in" +#line 369 "runtime.in" p.togrey(); {Stack->push<pen>(p); return;} } -#line 372 "runtime.in" +#line 374 "runtime.in" // pen rgb(pen p); void gen_runtime26(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 373 "runtime.in" +#line 375 "runtime.in" p.torgb(); {Stack->push<pen>(p); return;} } -#line 378 "runtime.in" +#line 380 "runtime.in" // pen cmyk(pen p); void gen_runtime27(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 379 "runtime.in" +#line 381 "runtime.in" p.tocmyk(); {Stack->push<pen>(p); return;} } -#line 384 "runtime.in" +#line 386 "runtime.in" // pen interp(pen a, pen b, real t); void gen_runtime28(stack *Stack) { real t=vm::pop<real>(Stack); pen b=vm::pop<pen>(Stack); pen a=vm::pop<pen>(Stack); -#line 385 "runtime.in" +#line 387 "runtime.in" {Stack->push<pen>(interpolate(a,b,t)); return;} } -#line 389 "runtime.in" +#line 391 "runtime.in" // pen rgb(real r, real g, real b); void gen_runtime29(stack *Stack) { real b=vm::pop<real>(Stack); real g=vm::pop<real>(Stack); real r=vm::pop<real>(Stack); -#line 390 "runtime.in" +#line 392 "runtime.in" {Stack->push<pen>(pen(r,g,b)); return;} } -#line 394 "runtime.in" +#line 396 "runtime.in" // pen cmyk(real c, real m, real y, real k); void gen_runtime30(stack *Stack) { @@ -533,25 +535,25 @@ void gen_runtime30(stack *Stack) real y=vm::pop<real>(Stack); real m=vm::pop<real>(Stack); real c=vm::pop<real>(Stack); -#line 395 "runtime.in" +#line 397 "runtime.in" {Stack->push<pen>(pen(c,m,y,k)); return;} } -#line 399 "runtime.in" +#line 401 "runtime.in" // pen gray(real gray); void gen_runtime31(stack *Stack) { real gray=vm::pop<real>(Stack); -#line 400 "runtime.in" +#line 402 "runtime.in" {Stack->push<pen>(pen(gray)); return;} } -#line 404 "runtime.in" +#line 406 "runtime.in" // realarray* colors(pen p); void gen_runtime32(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 405 "runtime.in" +#line 407 "runtime.in" size_t n=ColorComponents[p.colorspace()]; array *a=new array(n); @@ -578,87 +580,87 @@ void gen_runtime32(stack *Stack) {Stack->push<realarray*>(a); return;} } -#line 432 "runtime.in" +#line 434 "runtime.in" // string hex(pen p); void gen_runtime33(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 433 "runtime.in" +#line 435 "runtime.in" {Stack->push<string>(p.hex()); return;} } -#line 437 "runtime.in" +#line 439 "runtime.in" // Int byte(real x); void gen_runtime34(stack *Stack) { real x=vm::pop<real>(Stack); -#line 438 "runtime.in" +#line 440 "runtime.in" {Stack->push<Int>(camp::byte(x)); return;} } -#line 442 "runtime.in" +#line 444 "runtime.in" // real byteinv(Int x); void gen_runtime35(stack *Stack) { Int x=vm::pop<Int>(Stack); -#line 443 "runtime.in" +#line 445 "runtime.in" {Stack->push<real>(x >= 0 ? camp::byteinv(x) : 0.0); return;} } -#line 447 "runtime.in" +#line 449 "runtime.in" // string colorspace(pen p); void gen_runtime36(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 448 "runtime.in" +#line 450 "runtime.in" string s=ColorDeviceSuffix[p.colorspace()]; std::transform(s.begin(),s.end(),s.begin(),tolower); {Stack->push<string>(s); return;} } -#line 454 "runtime.in" +#line 456 "runtime.in" // pen pattern(string *s); void gen_runtime37(stack *Stack) { string * s=vm::pop<string *>(Stack); -#line 455 "runtime.in" +#line 457 "runtime.in" {Stack->push<pen>(pen(setpattern,*s)); return;} } -#line 459 "runtime.in" +#line 461 "runtime.in" // string pattern(pen p); void gen_runtime38(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 460 "runtime.in" +#line 462 "runtime.in" {Stack->push<string>(p.fillpattern()); return;} } -#line 464 "runtime.in" +#line 466 "runtime.in" // pen fillrule(Int n); void gen_runtime39(stack *Stack) { Int n=vm::pop<Int>(Stack); -#line 465 "runtime.in" +#line 467 "runtime.in" {Stack->push<pen>(pen(n >= 0 && n < nFill ? (FillRule) n : DEFFILL)); return;} } -#line 469 "runtime.in" +#line 471 "runtime.in" // Int fillrule(pen p); void gen_runtime40(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 470 "runtime.in" +#line 472 "runtime.in" {Stack->push<Int>(p.Fillrule()); return;} } -#line 474 "runtime.in" +#line 476 "runtime.in" // pen opacity(real opacity=1.0, string blend=defaulttransparency); void gen_runtime41(stack *Stack) { string blend=vm::pop<string>(Stack,defaulttransparency); real opacity=vm::pop<real>(Stack,1.0); -#line 475 "runtime.in" +#line 477 "runtime.in" for(Int i=0; i < nBlendMode; ++i) if(blend == BlendMode[i]) {Stack->push<pen>(pen(Transparency(blend,opacity))); return;} @@ -667,25 +669,25 @@ void gen_runtime41(stack *Stack) error(buf); } -#line 484 "runtime.in" +#line 486 "runtime.in" // real opacity(pen p); void gen_runtime42(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 485 "runtime.in" +#line 487 "runtime.in" {Stack->push<real>(p.opacity()); return;} } -#line 489 "runtime.in" +#line 491 "runtime.in" // string blend(pen p); void gen_runtime43(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 490 "runtime.in" +#line 492 "runtime.in" {Stack->push<string>(p.blend()); return;} } -#line 494 "runtime.in" +#line 496 "runtime.in" // pen linetype(realarray *pattern, real offset=0, bool scale=true, bool adjust=true); void gen_runtime44(stack *Stack) { @@ -693,7 +695,7 @@ void gen_runtime44(stack *Stack) bool scale=vm::pop<bool>(Stack,true); real offset=vm::pop<real>(Stack,0); realarray * pattern=vm::pop<realarray *>(Stack); -#line 496 "runtime.in" +#line 498 "runtime.in" size_t size=checkArray(pattern); array *a=new array(size); for(size_t i=0; i < size; ++i) @@ -702,272 +704,272 @@ void gen_runtime44(stack *Stack) {Stack->push<pen>(pen(LineType(*a,offset,scale,adjust))); return;} } -#line 505 "runtime.in" +#line 507 "runtime.in" // realarray* linetype(pen p=CURRENTPEN); void gen_runtime45(stack *Stack) { pen p=vm::pop<pen>(Stack,CURRENTPEN); -#line 506 "runtime.in" +#line 508 "runtime.in" array a=p.linetype()->pattern; {Stack->push<realarray*>(copyArray(&a)); return;} } -#line 511 "runtime.in" +#line 513 "runtime.in" // real offset(pen p); void gen_runtime46(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 512 "runtime.in" +#line 514 "runtime.in" {Stack->push<real>(p.linetype()->offset); return;} } -#line 516 "runtime.in" +#line 518 "runtime.in" // bool scale(pen p); void gen_runtime47(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 517 "runtime.in" +#line 519 "runtime.in" {Stack->push<bool>(p.linetype()->scale); return;} } -#line 521 "runtime.in" +#line 523 "runtime.in" // bool adjust(pen p); void gen_runtime48(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 522 "runtime.in" +#line 524 "runtime.in" {Stack->push<bool>(p.linetype()->adjust); return;} } -#line 526 "runtime.in" +#line 528 "runtime.in" // pen adjust(pen p, real arclength, bool cyclic); void gen_runtime49(stack *Stack) { bool cyclic=vm::pop<bool>(Stack); real arclength=vm::pop<real>(Stack); pen p=vm::pop<pen>(Stack); -#line 527 "runtime.in" +#line 529 "runtime.in" {Stack->push<pen>(adjustdash(p,arclength,cyclic)); return;} } -#line 531 "runtime.in" +#line 533 "runtime.in" // pen linecap(Int n); void gen_runtime50(stack *Stack) { Int n=vm::pop<Int>(Stack); -#line 532 "runtime.in" +#line 534 "runtime.in" {Stack->push<pen>(pen(setlinecap,n >= 0 && n < nCap ? n : DEFCAP)); return;} } -#line 536 "runtime.in" +#line 538 "runtime.in" // Int linecap(pen p=CURRENTPEN); void gen_runtime51(stack *Stack) { pen p=vm::pop<pen>(Stack,CURRENTPEN); -#line 537 "runtime.in" +#line 539 "runtime.in" {Stack->push<Int>(p.cap()); return;} } -#line 541 "runtime.in" +#line 543 "runtime.in" // pen linejoin(Int n); void gen_runtime52(stack *Stack) { Int n=vm::pop<Int>(Stack); -#line 542 "runtime.in" +#line 544 "runtime.in" {Stack->push<pen>(pen(setlinejoin,n >= 0 && n < nJoin ? n : DEFJOIN)); return;} } -#line 546 "runtime.in" +#line 548 "runtime.in" // Int linejoin(pen p=CURRENTPEN); void gen_runtime53(stack *Stack) { pen p=vm::pop<pen>(Stack,CURRENTPEN); -#line 547 "runtime.in" +#line 549 "runtime.in" {Stack->push<Int>(p.join()); return;} } -#line 551 "runtime.in" +#line 553 "runtime.in" // pen miterlimit(real x); void gen_runtime54(stack *Stack) { real x=vm::pop<real>(Stack); -#line 552 "runtime.in" +#line 554 "runtime.in" {Stack->push<pen>(pen(setmiterlimit,x >= 1.0 ? x : DEFJOIN)); return;} } -#line 556 "runtime.in" +#line 558 "runtime.in" // real miterlimit(pen p=CURRENTPEN); void gen_runtime55(stack *Stack) { pen p=vm::pop<pen>(Stack,CURRENTPEN); -#line 557 "runtime.in" +#line 559 "runtime.in" {Stack->push<real>(p.miter()); return;} } -#line 561 "runtime.in" +#line 563 "runtime.in" // pen linewidth(real x); void gen_runtime56(stack *Stack) { real x=vm::pop<real>(Stack); -#line 562 "runtime.in" +#line 564 "runtime.in" {Stack->push<pen>(pen(setlinewidth,x >= 0.0 ? x : DEFWIDTH)); return;} } -#line 566 "runtime.in" +#line 568 "runtime.in" // real linewidth(pen p=CURRENTPEN); void gen_runtime57(stack *Stack) { pen p=vm::pop<pen>(Stack,CURRENTPEN); -#line 567 "runtime.in" +#line 569 "runtime.in" {Stack->push<real>(p.width()); return;} } -#line 571 "runtime.in" +#line 573 "runtime.in" // pen fontcommand(string *s); void gen_runtime58(stack *Stack) { string * s=vm::pop<string *>(Stack); -#line 572 "runtime.in" +#line 574 "runtime.in" {Stack->push<pen>(pen(setfont,*s)); return;} } -#line 576 "runtime.in" +#line 578 "runtime.in" // string font(pen p=CURRENTPEN); void gen_runtime59(stack *Stack) { pen p=vm::pop<pen>(Stack,CURRENTPEN); -#line 577 "runtime.in" +#line 579 "runtime.in" {Stack->push<string>(p.Font()); return;} } -#line 581 "runtime.in" +#line 583 "runtime.in" // pen fontsize(real size, real lineskip); void gen_runtime60(stack *Stack) { real lineskip=vm::pop<real>(Stack); real size=vm::pop<real>(Stack); -#line 582 "runtime.in" +#line 584 "runtime.in" {Stack->push<pen>(pen(setfontsize,size > 0.0 ? size : 0.0, lineskip > 0.0 ? lineskip : 0.0)); return;} } -#line 587 "runtime.in" +#line 589 "runtime.in" // real fontsize(pen p=CURRENTPEN); void gen_runtime61(stack *Stack) { pen p=vm::pop<pen>(Stack,CURRENTPEN); -#line 588 "runtime.in" +#line 590 "runtime.in" {Stack->push<real>(p.size()); return;} } -#line 592 "runtime.in" +#line 594 "runtime.in" // real lineskip(pen p=CURRENTPEN); void gen_runtime62(stack *Stack) { pen p=vm::pop<pen>(Stack,CURRENTPEN); -#line 593 "runtime.in" +#line 595 "runtime.in" {Stack->push<real>(p.Lineskip()); return;} } -#line 597 "runtime.in" +#line 599 "runtime.in" // pen overwrite(Int n); void gen_runtime63(stack *Stack) { Int n=vm::pop<Int>(Stack); -#line 598 "runtime.in" +#line 600 "runtime.in" {Stack->push<pen>(pen(setoverwrite,n >= 0 && n < nOverwrite ? (overwrite_t) n : DEFWRITE)); return;} } -#line 603 "runtime.in" +#line 605 "runtime.in" // Int overwrite(pen p=CURRENTPEN); void gen_runtime64(stack *Stack) { pen p=vm::pop<pen>(Stack,CURRENTPEN); -#line 604 "runtime.in" +#line 606 "runtime.in" {Stack->push<Int>(p.Overwrite()); return;} } -#line 608 "runtime.in" +#line 610 "runtime.in" // pen basealign(Int n); void gen_runtime65(stack *Stack) { Int n=vm::pop<Int>(Stack); -#line 609 "runtime.in" +#line 611 "runtime.in" {Stack->push<pen>(pen(n >= 0 && n < nBaseLine ? (BaseLine) n : DEFBASE)); return;} } -#line 613 "runtime.in" +#line 615 "runtime.in" // Int basealign(pen p=CURRENTPEN); void gen_runtime66(stack *Stack) { pen p=vm::pop<pen>(Stack,CURRENTPEN); -#line 614 "runtime.in" +#line 616 "runtime.in" {Stack->push<Int>(p.Baseline()); return;} } -#line 618 "runtime.in" +#line 620 "runtime.in" // transform transform(pen p); void gen_runtime67(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 619 "runtime.in" +#line 621 "runtime.in" {Stack->push<transform>(p.getTransform()); return;} } -#line 623 "runtime.in" +#line 625 "runtime.in" // path nib(pen p); void gen_runtime68(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 624 "runtime.in" +#line 626 "runtime.in" {Stack->push<path>(p.Path()); return;} } -#line 628 "runtime.in" +#line 630 "runtime.in" // pen makepen(path p); void gen_runtime69(stack *Stack) { path p=vm::pop<path>(Stack); -#line 629 "runtime.in" +#line 631 "runtime.in" {Stack->push<pen>(pen(p)); return;} } -#line 633 "runtime.in" +#line 635 "runtime.in" // pen colorless(pen p); void gen_runtime70(stack *Stack) { pen p=vm::pop<pen>(Stack); -#line 634 "runtime.in" +#line 636 "runtime.in" p.colorless(); {Stack->push<pen>(p); return;} } // Interactive mode -#line 640 "runtime.in" +#line 642 "runtime.in" // bool interactive(); void gen_runtime71(stack *Stack) { -#line 641 "runtime.in" +#line 643 "runtime.in" {Stack->push<bool>(interact::interactive); return;} } -#line 646 "runtime.in" +#line 648 "runtime.in" // bool uptodate(); void gen_runtime72(stack *Stack) { -#line 647 "runtime.in" +#line 649 "runtime.in" {Stack->push<bool>(interact::uptodate); return;} } // System commands -#line 653 "runtime.in" +#line 655 "runtime.in" // Int system(stringarray *s); void gen_runtime73(stack *Stack) { stringarray * s=vm::pop<stringarray *>(Stack); -#line 654 "runtime.in" +#line 656 "runtime.in" if(safe) error("system() call disabled; override with option -nosafe"); size_t size=checkArray(s); if(size == 0) {Stack->push<Int>(0); return;} @@ -977,57 +979,57 @@ void gen_runtime73(stack *Stack) {Stack->push<Int>(System(cmd)); return;} } -#line 665 "runtime.in" +#line 667 "runtime.in" // bool view(); void gen_runtime74(stack *Stack) { -#line 666 "runtime.in" +#line 668 "runtime.in" {Stack->push<bool>(view()); return;} } -#line 670 "runtime.in" +#line 672 "runtime.in" // string asydir(); void gen_runtime75(stack *Stack) { -#line 671 "runtime.in" +#line 673 "runtime.in" {Stack->push<string>(systemDir); return;} } -#line 675 "runtime.in" +#line 677 "runtime.in" // string locale(string s=emptystring); void gen_runtime76(stack *Stack) { string s=vm::pop<string>(Stack,emptystring); -#line 676 "runtime.in" +#line 678 "runtime.in" char *L=setlocale(LC_ALL,s.empty() ? NULL : s.c_str()); {Stack->push<string>(L != NULL ? string(L) : ""); return;} } -#line 681 "runtime.in" +#line 683 "runtime.in" // void abort(string s=emptystring); void gen_runtime77(stack *Stack) { string s=vm::pop<string>(Stack,emptystring); -#line 682 "runtime.in" +#line 684 "runtime.in" if(s.empty()) throw handled_error(); error(s.c_str()); } -#line 687 "runtime.in" +#line 689 "runtime.in" // void exit(); void gen_runtime78(stack *) { -#line 688 "runtime.in" +#line 690 "runtime.in" throw quit(); } -#line 692 "runtime.in" +#line 694 "runtime.in" // void assert(bool b, string s=emptystring); void gen_runtime79(stack *Stack) { string s=vm::pop<string>(Stack,emptystring); bool b=vm::pop<bool>(Stack); -#line 693 "runtime.in" +#line 695 "runtime.in" flush(cout); if(!b) { ostringstream buf; @@ -1037,34 +1039,34 @@ void gen_runtime79(stack *Stack) } } -#line 703 "runtime.in" +#line 705 "runtime.in" // void sleep(Int seconds); void gen_runtime80(stack *Stack) { Int seconds=vm::pop<Int>(Stack); -#line 704 "runtime.in" +#line 706 "runtime.in" if(seconds <= 0) return; sleep(seconds); } -#line 709 "runtime.in" +#line 711 "runtime.in" // void usleep(Int microseconds); void gen_runtime81(stack *Stack) { Int microseconds=vm::pop<Int>(Stack); -#line 710 "runtime.in" +#line 712 "runtime.in" if(microseconds <= 0) return; usleep((unsigned long) microseconds); } -#line 715 "runtime.in" +#line 717 "runtime.in" // void _eval(string *s, bool embedded, bool interactiveWrite=false); void gen_runtime82(stack *Stack) { bool interactiveWrite=vm::pop<bool>(Stack,false); bool embedded=vm::pop<bool>(Stack); string * s=vm::pop<string *>(Stack); -#line 716 "runtime.in" +#line 718 "runtime.in" if(embedded) { trans::coenv *e=Stack->getEnvironment(); vm::interactiveStack *is=dynamic_cast<vm::interactiveStack *>(Stack); @@ -1076,13 +1078,13 @@ void gen_runtime82(stack *Stack) runString(*s,interactiveWrite); } -#line 728 "runtime.in" +#line 730 "runtime.in" // void _eval(runnable *s, bool embedded); void gen_runtime83(stack *Stack) { bool embedded=vm::pop<bool>(Stack); runnable * s=vm::pop<runnable *>(Stack); -#line 729 "runtime.in" +#line 731 "runtime.in" absyntax::block *ast=new absyntax::block(s->getPos(), false); ast->add(s); @@ -1097,51 +1099,51 @@ void gen_runtime83(stack *Stack) runCode(ast); } -#line 744 "runtime.in" +#line 746 "runtime.in" // string xasyKEY(); void gen_runtime84(stack *Stack) { -#line 745 "runtime.in" +#line 747 "runtime.in" processDataStruct& P=processData(); xkey_t& xkey=P.xkey; xkey_t::iterator p=xkey.find(P.topPos.LineColumn()); {Stack->push<string>(p != xkey.end() ? p->second+" 1" : toplocation()+" 0"); return;} } -#line 751 "runtime.in" +#line 753 "runtime.in" // void xasyKEY(string *s); void gen_runtime85(stack *Stack) { string * s=vm::pop<string *>(Stack); -#line 752 "runtime.in" +#line 754 "runtime.in" processData().KEY=*s; } -#line 755 "runtime.in" +#line 757 "runtime.in" // string location(); void gen_runtime86(stack *Stack) { -#line 756 "runtime.in" +#line 758 "runtime.in" ostringstream buf; buf << getPos(); {Stack->push<string>(buf.str()); return;} } // Wrapper for the stack::load() method. -#line 762 "runtime.in" +#line 764 "runtime.in" void loadModule(stack *Stack) { string * index=vm::pop<string *>(Stack); -#line 763 "runtime.in" +#line 765 "runtime.in" Stack->load(*index); } -#line 767 "runtime.in" +#line 769 "runtime.in" // string cd(string s=emptystring); void gen_runtime88(stack *Stack) { string s=vm::pop<string>(Stack,emptystring); -#line 768 "runtime.in" +#line 770 "runtime.in" if(!globalread()) readDisabled(); if(!s.empty() && !globalwrite()) { string outname=settings::outname(); @@ -1151,13 +1153,13 @@ void gen_runtime88(stack *Stack) {Stack->push<string>(setPath(s.c_str())); return;} } -#line 778 "runtime.in" +#line 780 "runtime.in" // void list(string *s, bool imports=false); void gen_runtime89(stack *Stack) { bool imports=vm::pop<bool>(Stack,false); string * s=vm::pop<string *>(Stack); -#line 779 "runtime.in" +#line 781 "runtime.in" if(*s == "-") return; trans::genv ge; symbol name=symbol::trans(*s); @@ -1167,18 +1169,18 @@ void gen_runtime89(stack *Stack) // Guide operations -#line 789 "runtime.in" +#line 791 "runtime.in" void nullGuide(stack *Stack) { -#line 790 "runtime.in" +#line 792 "runtime.in" {Stack->push<guide*>(new pathguide(path())); return;} } -#line 795 "runtime.in" +#line 797 "runtime.in" void dotsGuide(stack *Stack) { guidearray * a=vm::pop<guidearray *>(Stack); -#line 796 "runtime.in" +#line 798 "runtime.in" guidevector v; size_t size=checkArray(a); for (size_t i=0; i < size; ++i) @@ -1187,11 +1189,11 @@ void dotsGuide(stack *Stack) {Stack->push<guide*>(new multiguide(v)); return;} } -#line 805 "runtime.in" +#line 807 "runtime.in" void dashesGuide(stack *Stack) { guidearray * a=vm::pop<guidearray *>(Stack); -#line 806 "runtime.in" +#line 808 "runtime.in" static camp::curlSpec curly; static camp::specguide curlout(&curly, camp::OUT); static camp::specguide curlin(&curly, camp::IN); @@ -1217,179 +1219,179 @@ void dashesGuide(stack *Stack) {Stack->push<guide*>(new multiguide(v)); return;} } -#line 832 "runtime.in" +#line 834 "runtime.in" void newCycleToken(stack *Stack) { -#line 833 "runtime.in" +#line 835 "runtime.in" {Stack->push<cycleToken>(cycleToken()); return;} } -#line 837 "runtime.in" +#line 839 "runtime.in" // guide* operator cast(cycleToken tok); void gen_runtime94(stack *Stack) { cycleToken tok=vm::pop<cycleToken>(Stack); -#line 838 "runtime.in" +#line 840 "runtime.in" // Avoid unused variable warning messages. unused(&tok); {Stack->push<guide*>(new cycletokguide()); return;} } -#line 844 "runtime.in" +#line 846 "runtime.in" // guide* operator spec(pair z, Int p); void gen_runtime95(stack *Stack) { Int p=vm::pop<Int>(Stack); pair z=vm::pop<pair>(Stack); -#line 845 "runtime.in" +#line 847 "runtime.in" camp::side d=(camp::side) p; camp::dirSpec *sp=new camp::dirSpec(z); {Stack->push<guide*>(new specguide(sp,d)); return;} } -#line 852 "runtime.in" +#line 854 "runtime.in" // curlSpecifier operator curl(real gamma, Int p); void gen_runtime96(stack *Stack) { Int p=vm::pop<Int>(Stack); real gamma=vm::pop<real>(Stack); -#line 853 "runtime.in" +#line 855 "runtime.in" camp::side s=(camp::side) p; {Stack->push<curlSpecifier>(curlSpecifier(gamma,s)); return;} } -#line 858 "runtime.in" +#line 860 "runtime.in" void curlSpecifierValuePart(stack *Stack) { curlSpecifier spec=vm::pop<curlSpecifier>(Stack); -#line 859 "runtime.in" +#line 861 "runtime.in" {Stack->push<real>(spec.getValue()); return;} } -#line 863 "runtime.in" +#line 865 "runtime.in" void curlSpecifierSidePart(stack *Stack) { curlSpecifier spec=vm::pop<curlSpecifier>(Stack); -#line 864 "runtime.in" +#line 866 "runtime.in" {Stack->push<Int>(spec.getSide()); return;} } -#line 868 "runtime.in" +#line 870 "runtime.in" // guide* operator cast(curlSpecifier spec); void gen_runtime99(stack *Stack) { curlSpecifier spec=vm::pop<curlSpecifier>(Stack); -#line 869 "runtime.in" +#line 871 "runtime.in" {Stack->push<guide*>(new specguide(spec)); return;} } -#line 873 "runtime.in" +#line 875 "runtime.in" // tensionSpecifier operator tension(real tout, real tin, bool atleast); void gen_runtime100(stack *Stack) { bool atleast=vm::pop<bool>(Stack); real tin=vm::pop<real>(Stack); real tout=vm::pop<real>(Stack); -#line 874 "runtime.in" +#line 876 "runtime.in" {Stack->push<tensionSpecifier>(tensionSpecifier(tout, tin, atleast)); return;} } -#line 878 "runtime.in" +#line 880 "runtime.in" void tensionSpecifierOutPart(stack *Stack) { tensionSpecifier t=vm::pop<tensionSpecifier>(Stack); -#line 879 "runtime.in" +#line 881 "runtime.in" {Stack->push<real>(t.getOut()); return;} } -#line 883 "runtime.in" +#line 885 "runtime.in" void tensionSpecifierInPart(stack *Stack) { tensionSpecifier t=vm::pop<tensionSpecifier>(Stack); -#line 884 "runtime.in" +#line 886 "runtime.in" {Stack->push<real>(t.getIn()); return;} } -#line 888 "runtime.in" +#line 890 "runtime.in" void tensionSpecifierAtleastPart(stack *Stack) { tensionSpecifier t=vm::pop<tensionSpecifier>(Stack); -#line 889 "runtime.in" +#line 891 "runtime.in" {Stack->push<bool>(t.getAtleast()); return;} } -#line 893 "runtime.in" +#line 895 "runtime.in" // guide* operator cast(tensionSpecifier t); void gen_runtime104(stack *Stack) { tensionSpecifier t=vm::pop<tensionSpecifier>(Stack); -#line 894 "runtime.in" +#line 896 "runtime.in" {Stack->push<guide*>(new tensionguide(t)); return;} } -#line 898 "runtime.in" +#line 900 "runtime.in" // guide* operator controls(pair zout, pair zin); void gen_runtime105(stack *Stack) { pair zin=vm::pop<pair>(Stack); pair zout=vm::pop<pair>(Stack); -#line 899 "runtime.in" +#line 901 "runtime.in" {Stack->push<guide*>(new controlguide(zout, zin)); return;} } -#line 903 "runtime.in" +#line 905 "runtime.in" // Int size(guide *g); void gen_runtime106(stack *Stack) { guide * g=vm::pop<guide *>(Stack); -#line 904 "runtime.in" +#line 906 "runtime.in" flatguide f; g->flatten(f,false); {Stack->push<Int>(f.size()); return;} } -#line 910 "runtime.in" +#line 912 "runtime.in" // Int length(guide *g); void gen_runtime107(stack *Stack) { guide * g=vm::pop<guide *>(Stack); -#line 911 "runtime.in" +#line 913 "runtime.in" flatguide f; g->flatten(f,false); {Stack->push<Int>(g->cyclic() ? f.size() : f.size()-1); return;} } -#line 917 "runtime.in" +#line 919 "runtime.in" // bool cyclic(guide *g); void gen_runtime108(stack *Stack) { guide * g=vm::pop<guide *>(Stack); -#line 918 "runtime.in" +#line 920 "runtime.in" flatguide f; g->flatten(f,false); {Stack->push<bool>(g->cyclic()); return;} } -#line 924 "runtime.in" +#line 926 "runtime.in" // pair point(guide *g, Int t); void gen_runtime109(stack *Stack) { Int t=vm::pop<Int>(Stack); guide * g=vm::pop<guide *>(Stack); -#line 925 "runtime.in" +#line 927 "runtime.in" flatguide f; g->flatten(f,false); {Stack->push<pair>(f.Nodes(adjustedIndex(t,f.size(),g->cyclic())).z); return;} } -#line 931 "runtime.in" +#line 933 "runtime.in" // pairarray* dirSpecifier(guide *g, Int t); void gen_runtime110(stack *Stack) { Int t=vm::pop<Int>(Stack); guide * g=vm::pop<guide *>(Stack); -#line 932 "runtime.in" +#line 934 "runtime.in" flatguide f; g->flatten(f,false); Int n=f.size(); @@ -1400,13 +1402,13 @@ void gen_runtime110(stack *Stack) {Stack->push<pairarray*>(c); return;} } -#line 943 "runtime.in" +#line 945 "runtime.in" // pairarray* controlSpecifier(guide *g, Int t); void gen_runtime111(stack *Stack) { Int t=vm::pop<Int>(Stack); guide * g=vm::pop<guide *>(Stack); -#line 944 "runtime.in" +#line 946 "runtime.in" flatguide f; g->flatten(f,false); Int n=f.size(); @@ -1422,13 +1424,13 @@ void gen_runtime111(stack *Stack) } else {Stack->push<pairarray*>(new array(0)); return;} } -#line 960 "runtime.in" +#line 962 "runtime.in" // tensionSpecifier tensionSpecifier(guide *g, Int t); void gen_runtime112(stack *Stack) { Int t=vm::pop<Int>(Stack); guide * g=vm::pop<guide *>(Stack); -#line 961 "runtime.in" +#line 963 "runtime.in" flatguide f; g->flatten(f,false); Int n=f.size(); @@ -1437,13 +1439,13 @@ void gen_runtime112(stack *Stack) {Stack->push<tensionSpecifier>(tensionSpecifier(curr.tout.val,f.Nodes(t+1).tin.val,curr.tout.atleast)); return;} } -#line 970 "runtime.in" +#line 972 "runtime.in" // realarray* curlSpecifier(guide *g, Int t); void gen_runtime113(stack *Stack) { Int t=vm::pop<Int>(Stack); guide * g=vm::pop<guide *>(Stack); -#line 971 "runtime.in" +#line 973 "runtime.in" flatguide f; g->flatten(f,false); Int n=f.size(); @@ -1456,12 +1458,12 @@ void gen_runtime113(stack *Stack) {Stack->push<realarray*>(c); return;} } -#line 984 "runtime.in" +#line 986 "runtime.in" // guide* reverse(guide *g); void gen_runtime114(stack *Stack) { guide * g=vm::pop<guide *>(Stack); -#line 985 "runtime.in" +#line 987 "runtime.in" flatguide f; g->flatten(f,false); if(f.precyclic()) @@ -1512,11 +1514,11 @@ void gen_runtime114(stack *Stack) {Stack->push<guide*>(new multiguide(v)); return;} } -#line 1037 "runtime.in" +#line 1039 "runtime.in" // realarray* _cputime(); void gen_runtime115(stack *Stack) { -#line 1038 "runtime.in" +#line 1040 "runtime.in" static const real ticktime=1.0/sysconf(_SC_CLK_TCK); struct tms buf; @@ -1526,109 +1528,109 @@ void gen_runtime115(stack *Stack) (*t)[1]=((real) buf.tms_stime)*ticktime; (*t)[2]=((real) buf.tms_cutime)*ticktime; (*t)[3]=((real) buf.tms_cstime)*ticktime; - (*t)[4]=utils::totalseconds(); + (*t)[4]=wallClock.seconds(); {Stack->push<realarray*>(t); return;} } // Transforms -#line 1054 "runtime.in" +#line 1056 "runtime.in" // bool ==(transform a, transform b); void gen_runtime116(stack *Stack) { transform b=vm::pop<transform>(Stack); transform a=vm::pop<transform>(Stack); -#line 1055 "runtime.in" +#line 1057 "runtime.in" {Stack->push<bool>(a == b); return;} } -#line 1060 "runtime.in" +#line 1062 "runtime.in" // bool !=(transform a, transform b); void gen_runtime117(stack *Stack) { transform b=vm::pop<transform>(Stack); transform a=vm::pop<transform>(Stack); -#line 1061 "runtime.in" +#line 1063 "runtime.in" {Stack->push<bool>(a != b); return;} } -#line 1065 "runtime.in" +#line 1067 "runtime.in" // transform +(transform a, transform b); void gen_runtime118(stack *Stack) { transform b=vm::pop<transform>(Stack); transform a=vm::pop<transform>(Stack); -#line 1066 "runtime.in" +#line 1068 "runtime.in" {Stack->push<transform>(a+b); return;} } -#line 1070 "runtime.in" +#line 1072 "runtime.in" // transform *(transform a, transform b); void gen_runtime119(stack *Stack) { transform b=vm::pop<transform>(Stack); transform a=vm::pop<transform>(Stack); -#line 1071 "runtime.in" +#line 1073 "runtime.in" {Stack->push<transform>(a*b); return;} } -#line 1075 "runtime.in" +#line 1077 "runtime.in" // pair *(transform t, pair z); void gen_runtime120(stack *Stack) { pair z=vm::pop<pair>(Stack); transform t=vm::pop<transform>(Stack); -#line 1076 "runtime.in" +#line 1078 "runtime.in" {Stack->push<pair>(t*z); return;} } -#line 1080 "runtime.in" +#line 1082 "runtime.in" // path *(transform t, path g); void gen_runtime121(stack *Stack) { path g=vm::pop<path>(Stack); transform t=vm::pop<transform>(Stack); -#line 1081 "runtime.in" +#line 1083 "runtime.in" {Stack->push<path>(transformed(t,g)); return;} } -#line 1085 "runtime.in" +#line 1087 "runtime.in" // pen *(transform t, pen p); void gen_runtime122(stack *Stack) { pen p=vm::pop<pen>(Stack); transform t=vm::pop<transform>(Stack); -#line 1086 "runtime.in" +#line 1088 "runtime.in" {Stack->push<pen>(transformed(t,p)); return;} } -#line 1090 "runtime.in" +#line 1092 "runtime.in" // picture* *(transform t, picture *f); void gen_runtime123(stack *Stack) { picture * f=vm::pop<picture *>(Stack); transform t=vm::pop<transform>(Stack); -#line 1091 "runtime.in" +#line 1093 "runtime.in" {Stack->push<picture*>(transformed(t,f)); return;} } -#line 1095 "runtime.in" +#line 1097 "runtime.in" // picture* *(realarray2 *t, picture *f); void gen_runtime124(stack *Stack) { picture * f=vm::pop<picture *>(Stack); realarray2 * t=vm::pop<realarray2 *>(Stack); -#line 1096 "runtime.in" +#line 1098 "runtime.in" {Stack->push<picture*>(transformed(*t,f)); return;} } -#line 1100 "runtime.in" +#line 1102 "runtime.in" // transform ^(transform t, Int n); void gen_runtime125(stack *Stack) { Int n=vm::pop<Int>(Stack); transform t=vm::pop<transform>(Stack); -#line 1101 "runtime.in" +#line 1103 "runtime.in" transform T; if(n < 0) { n=-n; @@ -1638,55 +1640,55 @@ void gen_runtime125(stack *Stack) {Stack->push<transform>(T); return;} } -#line 1111 "runtime.in" +#line 1113 "runtime.in" void transformXPart(stack *Stack) { transform t=vm::pop<transform>(Stack); -#line 1112 "runtime.in" +#line 1114 "runtime.in" {Stack->push<real>(t.getx()); return;} } -#line 1116 "runtime.in" +#line 1118 "runtime.in" void transformYPart(stack *Stack) { transform t=vm::pop<transform>(Stack); -#line 1117 "runtime.in" +#line 1119 "runtime.in" {Stack->push<real>(t.gety()); return;} } -#line 1121 "runtime.in" +#line 1123 "runtime.in" void transformXXPart(stack *Stack) { transform t=vm::pop<transform>(Stack); -#line 1122 "runtime.in" +#line 1124 "runtime.in" {Stack->push<real>(t.getxx()); return;} } -#line 1126 "runtime.in" +#line 1128 "runtime.in" void transformXYPart(stack *Stack) { transform t=vm::pop<transform>(Stack); -#line 1127 "runtime.in" +#line 1129 "runtime.in" {Stack->push<real>(t.getxy()); return;} } -#line 1131 "runtime.in" +#line 1133 "runtime.in" void transformYXPart(stack *Stack) { transform t=vm::pop<transform>(Stack); -#line 1132 "runtime.in" +#line 1134 "runtime.in" {Stack->push<real>(t.getyx()); return;} } -#line 1136 "runtime.in" +#line 1138 "runtime.in" void transformYYPart(stack *Stack) { transform t=vm::pop<transform>(Stack); -#line 1137 "runtime.in" +#line 1139 "runtime.in" {Stack->push<real>(t.getyy()); return;} } -#line 1141 "runtime.in" +#line 1143 "runtime.in" void real6ToTransform(stack *Stack) { real yy=vm::pop<real>(Stack); @@ -1695,140 +1697,140 @@ void real6ToTransform(stack *Stack) real xx=vm::pop<real>(Stack); real y=vm::pop<real>(Stack); real x=vm::pop<real>(Stack); -#line 1143 "runtime.in" +#line 1145 "runtime.in" {Stack->push<transform>(transform(x,y,xx,xy,yx,yy)); return;} } -#line 1147 "runtime.in" +#line 1149 "runtime.in" // transform shift(transform t); void gen_runtime133(stack *Stack) { transform t=vm::pop<transform>(Stack); -#line 1148 "runtime.in" +#line 1150 "runtime.in" {Stack->push<transform>(transform(t.getx(),t.gety(),0,0,0,0)); return;} } -#line 1152 "runtime.in" +#line 1154 "runtime.in" // transform shiftless(transform t); void gen_runtime134(stack *Stack) { transform t=vm::pop<transform>(Stack); -#line 1153 "runtime.in" +#line 1155 "runtime.in" {Stack->push<transform>(transform(0,0,t.getxx(),t.getxy(),t.getyx(),t.getyy())); return;} } -#line 1157 "runtime.in" +#line 1159 "runtime.in" // transform identity(); void transformIdentity(stack *Stack) { -#line 1158 "runtime.in" +#line 1160 "runtime.in" {Stack->push<transform>(identity); return;} } -#line 1162 "runtime.in" +#line 1164 "runtime.in" // transform inverse(transform t); void gen_runtime136(stack *Stack) { transform t=vm::pop<transform>(Stack); -#line 1163 "runtime.in" +#line 1165 "runtime.in" {Stack->push<transform>(inverse(t)); return;} } -#line 1167 "runtime.in" +#line 1169 "runtime.in" // transform shift(pair z); void gen_runtime137(stack *Stack) { pair z=vm::pop<pair>(Stack); -#line 1168 "runtime.in" +#line 1170 "runtime.in" {Stack->push<transform>(shift(z)); return;} } -#line 1172 "runtime.in" +#line 1174 "runtime.in" // transform shift(real x, real y); void gen_runtime138(stack *Stack) { real y=vm::pop<real>(Stack); real x=vm::pop<real>(Stack); -#line 1173 "runtime.in" +#line 1175 "runtime.in" {Stack->push<transform>(shift(pair(x,y))); return;} } -#line 1177 "runtime.in" +#line 1179 "runtime.in" // transform xscale(real x); void gen_runtime139(stack *Stack) { real x=vm::pop<real>(Stack); -#line 1178 "runtime.in" +#line 1180 "runtime.in" {Stack->push<transform>(xscale(x)); return;} } -#line 1182 "runtime.in" +#line 1184 "runtime.in" // transform yscale(real y); void gen_runtime140(stack *Stack) { real y=vm::pop<real>(Stack); -#line 1183 "runtime.in" +#line 1185 "runtime.in" {Stack->push<transform>(yscale(y)); return;} } -#line 1187 "runtime.in" +#line 1189 "runtime.in" // transform scale(real x); void gen_runtime141(stack *Stack) { real x=vm::pop<real>(Stack); -#line 1188 "runtime.in" +#line 1190 "runtime.in" {Stack->push<transform>(scale(x)); return;} } -#line 1192 "runtime.in" +#line 1194 "runtime.in" // transform scale(real x, real y); void gen_runtime142(stack *Stack) { real y=vm::pop<real>(Stack); real x=vm::pop<real>(Stack); -#line 1193 "runtime.in" +#line 1195 "runtime.in" {Stack->push<transform>(scale(x,y)); return;} } -#line 1197 "runtime.in" +#line 1199 "runtime.in" // transform slant(real s); void gen_runtime143(stack *Stack) { real s=vm::pop<real>(Stack); -#line 1198 "runtime.in" +#line 1200 "runtime.in" {Stack->push<transform>(slant(s)); return;} } -#line 1202 "runtime.in" +#line 1204 "runtime.in" // transform rotate(real angle, pair z=0); void gen_runtime144(stack *Stack) { pair z=vm::pop<pair>(Stack,0); real angle=vm::pop<real>(Stack); -#line 1203 "runtime.in" +#line 1205 "runtime.in" {Stack->push<transform>(rotatearound(z,radians(angle))); return;} } -#line 1207 "runtime.in" +#line 1209 "runtime.in" // transform reflect(pair a, pair b); void gen_runtime145(stack *Stack) { pair b=vm::pop<pair>(Stack); pair a=vm::pop<pair>(Stack); -#line 1208 "runtime.in" +#line 1210 "runtime.in" {Stack->push<transform>(reflectabout(a,b)); return;} } -#line 1212 "runtime.in" +#line 1214 "runtime.in" // bool isometry(transform t); void gen_runtime146(stack *Stack) { transform t=vm::pop<transform>(Stack); -#line 1213 "runtime.in" +#line 1215 "runtime.in" {Stack->push<bool>(t.isIsometry()); return;} } -#line 1217 "runtime.in" +#line 1219 "runtime.in" // real bezier(real a, real b, real c, real d, real t); void gen_runtime147(stack *Stack) { @@ -1837,7 +1839,7 @@ void gen_runtime147(stack *Stack) real c=vm::pop<real>(Stack); real b=vm::pop<real>(Stack); real a=vm::pop<real>(Stack); -#line 1218 "runtime.in" +#line 1220 "runtime.in" real onemt=1-t; real onemt2=onemt*onemt; {Stack->push<real>(onemt2*onemt*a+t*(3.0*(onemt2*b+t*onemt*c)+t*t*d)); return;} @@ -1849,301 +1851,301 @@ namespace trans { void gen_runtime_venv(venv &ve) { -#line 224 "runtime.in" +#line 226 "runtime.in" REGISTER_BLTIN(run::IntZero,"IntZero"); -#line 232 "runtime.in" +#line 234 "runtime.in" REGISTER_BLTIN(run::realZero,"realZero"); -#line 237 "runtime.in" +#line 239 "runtime.in" REGISTER_BLTIN(run::boolFalse,"boolFalse"); -#line 242 "runtime.in" +#line 244 "runtime.in" addFunc(ve, run::gen_runtime3, primBoolean(), SYM(isnan), formal(primReal(), SYM(x), false, false)); -#line 247 "runtime.in" +#line 249 "runtime.in" REGISTER_BLTIN(run::pushNullArray,"pushNullArray"); -#line 252 "runtime.in" +#line 254 "runtime.in" REGISTER_BLTIN(run::pushNullRecord,"pushNullRecord"); -#line 257 "runtime.in" +#line 259 "runtime.in" REGISTER_BLTIN(run::pushNullFunction,"pushNullFunction"); -#line 262 "runtime.in" +#line 264 "runtime.in" REGISTER_BLTIN(run::pushDefault,"pushDefault"); -#line 272 "runtime.in" +#line 274 "runtime.in" REGISTER_BLTIN(run::isDefault,"isDefault"); -#line 279 "runtime.in" +#line 281 "runtime.in" REGISTER_BLTIN(run::pairToGuide,"pairToGuide"); -#line 287 "runtime.in" +#line 289 "runtime.in" REGISTER_BLTIN(run::pathToGuide,"pathToGuide"); -#line 292 "runtime.in" +#line 294 "runtime.in" REGISTER_BLTIN(run::guideToPath,"guideToPath"); -#line 297 "runtime.in" +#line 299 "runtime.in" REGISTER_BLTIN(run::newPen,"newPen"); -#line 305 "runtime.in" +#line 307 "runtime.in" addFunc(ve, run::gen_runtime13, primBoolean(), SYM_EQ, formal(primPen(), SYM(a), false, false), formal(primPen(), SYM(b), false, false)); -#line 310 "runtime.in" +#line 312 "runtime.in" addFunc(ve, run::gen_runtime14, primBoolean(), SYM_NEQ, formal(primPen(), SYM(a), false, false), formal(primPen(), SYM(b), false, false)); -#line 315 "runtime.in" +#line 317 "runtime.in" addFunc(ve, run::gen_runtime15, primPen(), SYM_PLUS, formal(primPen(), SYM(a), false, false), formal(primPen(), SYM(b), false, false)); -#line 320 "runtime.in" +#line 322 "runtime.in" addFunc(ve, run::gen_runtime16, primPen(), SYM_TIMES, formal(primReal(), SYM(a), false, false), formal(primPen(), SYM(b), false, false)); -#line 325 "runtime.in" +#line 327 "runtime.in" addFunc(ve, run::gen_runtime17, primPen(), SYM_TIMES, formal(primPen(), SYM(a), false, false), formal(primReal(), SYM(b), false, false)); -#line 330 "runtime.in" +#line 332 "runtime.in" addFunc(ve, run::gen_runtime18, primPair(), SYM(max), formal(primPen(), SYM(p), false, false)); -#line 335 "runtime.in" +#line 337 "runtime.in" addFunc(ve, run::gen_runtime19, primPair(), SYM(min), formal(primPen(), SYM(p), false, false)); -#line 340 "runtime.in" +#line 342 "runtime.in" addFunc(ve, run::gen_runtime20, primVoid(), SYM(resetdefaultpen)); -#line 346 "runtime.in" +#line 348 "runtime.in" addFunc(ve, run::gen_runtime21, primVoid(), SYM(defaultpen), formal(primPen(), SYM(p), false, false)); -#line 351 "runtime.in" +#line 353 "runtime.in" addFunc(ve, run::gen_runtime22, primPen(), SYM(defaultpen)); -#line 356 "runtime.in" +#line 358 "runtime.in" addFunc(ve, run::gen_runtime23, primBoolean(), SYM(invisible), formal(primPen(), SYM(p), false, false)); -#line 361 "runtime.in" +#line 363 "runtime.in" addFunc(ve, run::gen_runtime24, primPen(), SYM(invisible)); -#line 366 "runtime.in" +#line 368 "runtime.in" addFunc(ve, run::gen_runtime25, primPen(), SYM(gray), formal(primPen(), SYM(p), false, false)); -#line 372 "runtime.in" +#line 374 "runtime.in" addFunc(ve, run::gen_runtime26, primPen(), SYM(rgb), formal(primPen(), SYM(p), false, false)); -#line 378 "runtime.in" +#line 380 "runtime.in" addFunc(ve, run::gen_runtime27, primPen(), SYM(cmyk), formal(primPen(), SYM(p), false, false)); -#line 384 "runtime.in" +#line 386 "runtime.in" addFunc(ve, run::gen_runtime28, primPen(), SYM(interp), formal(primPen(), SYM(a), false, false), formal(primPen(), SYM(b), false, false), formal(primReal(), SYM(t), false, false)); -#line 389 "runtime.in" +#line 391 "runtime.in" addFunc(ve, run::gen_runtime29, primPen(), SYM(rgb), formal(primReal(), SYM(r), false, false), formal(primReal(), SYM(g), false, false), formal(primReal(), SYM(b), false, false)); -#line 394 "runtime.in" +#line 396 "runtime.in" addFunc(ve, run::gen_runtime30, primPen(), SYM(cmyk), formal(primReal(), SYM(c), false, false), formal(primReal(), SYM(m), false, false), formal(primReal(), SYM(y), false, false), formal(primReal(), SYM(k), false, false)); -#line 399 "runtime.in" +#line 401 "runtime.in" addFunc(ve, run::gen_runtime31, primPen(), SYM(gray), formal(primReal(), SYM(gray), false, false)); -#line 404 "runtime.in" +#line 406 "runtime.in" addFunc(ve, run::gen_runtime32, realArray(), SYM(colors), formal(primPen(), SYM(p), false, false)); -#line 432 "runtime.in" +#line 434 "runtime.in" addFunc(ve, run::gen_runtime33, primString(), SYM(hex), formal(primPen(), SYM(p), false, false)); -#line 437 "runtime.in" +#line 439 "runtime.in" addFunc(ve, run::gen_runtime34, primInt(), SYM(byte), formal(primReal(), SYM(x), false, false)); -#line 442 "runtime.in" +#line 444 "runtime.in" addFunc(ve, run::gen_runtime35, primReal(), SYM(byteinv), formal(primInt(), SYM(x), false, false)); -#line 447 "runtime.in" +#line 449 "runtime.in" addFunc(ve, run::gen_runtime36, primString(), SYM(colorspace), formal(primPen(), SYM(p), false, false)); -#line 454 "runtime.in" +#line 456 "runtime.in" addFunc(ve, run::gen_runtime37, primPen(), SYM(pattern), formal(primString(), SYM(s), false, false)); -#line 459 "runtime.in" +#line 461 "runtime.in" addFunc(ve, run::gen_runtime38, primString(), SYM(pattern), formal(primPen(), SYM(p), false, false)); -#line 464 "runtime.in" +#line 466 "runtime.in" addFunc(ve, run::gen_runtime39, primPen(), SYM(fillrule), formal(primInt(), SYM(n), false, false)); -#line 469 "runtime.in" +#line 471 "runtime.in" addFunc(ve, run::gen_runtime40, primInt(), SYM(fillrule), formal(primPen(), SYM(p), false, false)); -#line 474 "runtime.in" +#line 476 "runtime.in" addFunc(ve, run::gen_runtime41, primPen(), SYM(opacity), formal(primReal(), SYM(opacity), true, false), formal(primString(), SYM(blend), true, false)); -#line 484 "runtime.in" +#line 486 "runtime.in" addFunc(ve, run::gen_runtime42, primReal(), SYM(opacity), formal(primPen(), SYM(p), false, false)); -#line 489 "runtime.in" +#line 491 "runtime.in" addFunc(ve, run::gen_runtime43, primString(), SYM(blend), formal(primPen(), SYM(p), false, false)); -#line 494 "runtime.in" +#line 496 "runtime.in" addFunc(ve, run::gen_runtime44, primPen(), SYM(linetype), formal(realArray(), SYM(pattern), false, false), formal(primReal(), SYM(offset), true, false), formal(primBoolean(), SYM(scale), true, false), formal(primBoolean(), SYM(adjust), true, false)); -#line 505 "runtime.in" +#line 507 "runtime.in" addFunc(ve, run::gen_runtime45, realArray(), SYM(linetype), formal(primPen(), SYM(p), true, false)); -#line 511 "runtime.in" +#line 513 "runtime.in" addFunc(ve, run::gen_runtime46, primReal(), SYM(offset), formal(primPen(), SYM(p), false, false)); -#line 516 "runtime.in" +#line 518 "runtime.in" addFunc(ve, run::gen_runtime47, primBoolean(), SYM(scale), formal(primPen(), SYM(p), false, false)); -#line 521 "runtime.in" +#line 523 "runtime.in" addFunc(ve, run::gen_runtime48, primBoolean(), SYM(adjust), formal(primPen(), SYM(p), false, false)); -#line 526 "runtime.in" +#line 528 "runtime.in" addFunc(ve, run::gen_runtime49, primPen(), SYM(adjust), formal(primPen(), SYM(p), false, false), formal(primReal(), SYM(arclength), false, false), formal(primBoolean(), SYM(cyclic), false, false)); -#line 531 "runtime.in" +#line 533 "runtime.in" addFunc(ve, run::gen_runtime50, primPen(), SYM(linecap), formal(primInt(), SYM(n), false, false)); -#line 536 "runtime.in" +#line 538 "runtime.in" addFunc(ve, run::gen_runtime51, primInt(), SYM(linecap), formal(primPen(), SYM(p), true, false)); -#line 541 "runtime.in" +#line 543 "runtime.in" addFunc(ve, run::gen_runtime52, primPen(), SYM(linejoin), formal(primInt(), SYM(n), false, false)); -#line 546 "runtime.in" +#line 548 "runtime.in" addFunc(ve, run::gen_runtime53, primInt(), SYM(linejoin), formal(primPen(), SYM(p), true, false)); -#line 551 "runtime.in" +#line 553 "runtime.in" addFunc(ve, run::gen_runtime54, primPen(), SYM(miterlimit), formal(primReal(), SYM(x), false, false)); -#line 556 "runtime.in" +#line 558 "runtime.in" addFunc(ve, run::gen_runtime55, primReal(), SYM(miterlimit), formal(primPen(), SYM(p), true, false)); -#line 561 "runtime.in" +#line 563 "runtime.in" addFunc(ve, run::gen_runtime56, primPen(), SYM(linewidth), formal(primReal(), SYM(x), false, false)); -#line 566 "runtime.in" +#line 568 "runtime.in" addFunc(ve, run::gen_runtime57, primReal(), SYM(linewidth), formal(primPen(), SYM(p), true, false)); -#line 571 "runtime.in" +#line 573 "runtime.in" addFunc(ve, run::gen_runtime58, primPen(), SYM(fontcommand), formal(primString(), SYM(s), false, false)); -#line 576 "runtime.in" +#line 578 "runtime.in" addFunc(ve, run::gen_runtime59, primString(), SYM(font), formal(primPen(), SYM(p), true, false)); -#line 581 "runtime.in" +#line 583 "runtime.in" addFunc(ve, run::gen_runtime60, primPen(), SYM(fontsize), formal(primReal(), SYM(size), false, false), formal(primReal(), SYM(lineskip), false, false)); -#line 587 "runtime.in" +#line 589 "runtime.in" addFunc(ve, run::gen_runtime61, primReal(), SYM(fontsize), formal(primPen(), SYM(p), true, false)); -#line 592 "runtime.in" +#line 594 "runtime.in" addFunc(ve, run::gen_runtime62, primReal(), SYM(lineskip), formal(primPen(), SYM(p), true, false)); -#line 597 "runtime.in" +#line 599 "runtime.in" addFunc(ve, run::gen_runtime63, primPen(), SYM(overwrite), formal(primInt(), SYM(n), false, false)); -#line 603 "runtime.in" +#line 605 "runtime.in" addFunc(ve, run::gen_runtime64, primInt(), SYM(overwrite), formal(primPen(), SYM(p), true, false)); -#line 608 "runtime.in" +#line 610 "runtime.in" addFunc(ve, run::gen_runtime65, primPen(), SYM(basealign), formal(primInt(), SYM(n), false, false)); -#line 613 "runtime.in" +#line 615 "runtime.in" addFunc(ve, run::gen_runtime66, primInt(), SYM(basealign), formal(primPen(), SYM(p), true, false)); -#line 618 "runtime.in" +#line 620 "runtime.in" addFunc(ve, run::gen_runtime67, primTransform(), SYM(transform), formal(primPen(), SYM(p), false, false)); -#line 623 "runtime.in" +#line 625 "runtime.in" addFunc(ve, run::gen_runtime68, primPath(), SYM(nib), formal(primPen(), SYM(p), false, false)); -#line 628 "runtime.in" +#line 630 "runtime.in" addFunc(ve, run::gen_runtime69, primPen(), SYM(makepen), formal(primPath(), SYM(p), false, false)); -#line 633 "runtime.in" +#line 635 "runtime.in" addFunc(ve, run::gen_runtime70, primPen(), SYM(colorless), formal(primPen(), SYM(p), false, false)); -#line 639 "runtime.in" +#line 641 "runtime.in" addFunc(ve, run::gen_runtime71, primBoolean(), SYM(interactive)); -#line 646 "runtime.in" +#line 648 "runtime.in" addFunc(ve, run::gen_runtime72, primBoolean(), SYM(uptodate)); -#line 651 "runtime.in" +#line 653 "runtime.in" addFunc(ve, run::gen_runtime73, primInt(), SYM(system), formal(stringArray(), SYM(s), false, false)); -#line 665 "runtime.in" +#line 667 "runtime.in" addFunc(ve, run::gen_runtime74, primBoolean(), SYM(view)); -#line 670 "runtime.in" +#line 672 "runtime.in" addFunc(ve, run::gen_runtime75, primString(), SYM(asydir)); -#line 675 "runtime.in" +#line 677 "runtime.in" addFunc(ve, run::gen_runtime76, primString(), SYM(locale), formal(primString(), SYM(s), true, false)); -#line 681 "runtime.in" +#line 683 "runtime.in" addFunc(ve, run::gen_runtime77, primVoid(), SYM(abort), formal(primString(), SYM(s), true, false)); -#line 687 "runtime.in" +#line 689 "runtime.in" addFunc(ve, run::gen_runtime78, primVoid(), SYM(exit)); -#line 692 "runtime.in" +#line 694 "runtime.in" addFunc(ve, run::gen_runtime79, primVoid(), SYM(assert), formal(primBoolean(), SYM(b), false, false), formal(primString(), SYM(s), true, false)); -#line 703 "runtime.in" +#line 705 "runtime.in" addFunc(ve, run::gen_runtime80, primVoid(), SYM(sleep), formal(primInt(), SYM(seconds), false, false)); -#line 709 "runtime.in" +#line 711 "runtime.in" addFunc(ve, run::gen_runtime81, primVoid(), SYM(usleep), formal(primInt(), SYM(microseconds), false, false)); -#line 715 "runtime.in" +#line 717 "runtime.in" addFunc(ve, run::gen_runtime82, primVoid(), SYM(_eval), formal(primString(), SYM(s), false, false), formal(primBoolean(), SYM(embedded), false, false), formal(primBoolean(), SYM(interactivewrite), true, false)); -#line 728 "runtime.in" +#line 730 "runtime.in" addFunc(ve, run::gen_runtime83, primVoid(), SYM(_eval), formal(primCode(), SYM(s), false, false), formal(primBoolean(), SYM(embedded), false, false)); -#line 744 "runtime.in" +#line 746 "runtime.in" addFunc(ve, run::gen_runtime84, primString(), SYM(xasyKEY)); -#line 751 "runtime.in" +#line 753 "runtime.in" addFunc(ve, run::gen_runtime85, primVoid(), SYM(xasyKEY), formal(primString(), SYM(s), false, false)); -#line 755 "runtime.in" +#line 757 "runtime.in" addFunc(ve, run::gen_runtime86, primString(), SYM(location)); -#line 761 "runtime.in" +#line 763 "runtime.in" REGISTER_BLTIN(run::loadModule,"loadModule"); -#line 767 "runtime.in" +#line 769 "runtime.in" addFunc(ve, run::gen_runtime88, primString(), SYM(cd), formal(primString(), SYM(s), true, false)); -#line 778 "runtime.in" +#line 780 "runtime.in" addFunc(ve, run::gen_runtime89, primVoid(), SYM(list), formal(primString(), SYM(s), false, false), formal(primBoolean(), SYM(imports), true, false)); -#line 787 "runtime.in" +#line 789 "runtime.in" REGISTER_BLTIN(run::nullGuide,"nullGuide"); -#line 795 "runtime.in" +#line 797 "runtime.in" REGISTER_BLTIN(run::dotsGuide,"dotsGuide"); -#line 805 "runtime.in" +#line 807 "runtime.in" REGISTER_BLTIN(run::dashesGuide,"dashesGuide"); -#line 832 "runtime.in" +#line 834 "runtime.in" REGISTER_BLTIN(run::newCycleToken,"newCycleToken"); -#line 837 "runtime.in" +#line 839 "runtime.in" addFunc(ve, run::gen_runtime94, primGuide(), symbol::trans("operator cast"), formal(primCycleToken(), SYM(tok), false, false)); -#line 844 "runtime.in" +#line 846 "runtime.in" addFunc(ve, run::gen_runtime95, primGuide(), symbol::trans("operator spec"), formal(primPair(), SYM(z), false, false), formal(primInt(), SYM(p), false, false)); -#line 852 "runtime.in" +#line 854 "runtime.in" addFunc(ve, run::gen_runtime96, primCurlSpecifier(), SYM_CURL, formal(primReal(), SYM(gamma), false, false), formal(primInt(), SYM(p), false, false)); -#line 858 "runtime.in" +#line 860 "runtime.in" REGISTER_BLTIN(run::curlSpecifierValuePart,"curlSpecifierValuePart"); -#line 863 "runtime.in" +#line 865 "runtime.in" REGISTER_BLTIN(run::curlSpecifierSidePart,"curlSpecifierSidePart"); -#line 868 "runtime.in" +#line 870 "runtime.in" addFunc(ve, run::gen_runtime99, primGuide(), symbol::trans("operator cast"), formal(primCurlSpecifier(), SYM(spec), false, false)); -#line 873 "runtime.in" +#line 875 "runtime.in" addFunc(ve, run::gen_runtime100, primTensionSpecifier(), SYM_TENSION, formal(primReal(), SYM(tout), false, false), formal(primReal(), SYM(tin), false, false), formal(primBoolean(), SYM(atleast), false, false)); -#line 878 "runtime.in" +#line 880 "runtime.in" REGISTER_BLTIN(run::tensionSpecifierOutPart,"tensionSpecifierOutPart"); -#line 883 "runtime.in" +#line 885 "runtime.in" REGISTER_BLTIN(run::tensionSpecifierInPart,"tensionSpecifierInPart"); -#line 888 "runtime.in" +#line 890 "runtime.in" REGISTER_BLTIN(run::tensionSpecifierAtleastPart,"tensionSpecifierAtleastPart"); -#line 893 "runtime.in" +#line 895 "runtime.in" addFunc(ve, run::gen_runtime104, primGuide(), symbol::trans("operator cast"), formal(primTensionSpecifier(), SYM(t), false, false)); -#line 898 "runtime.in" +#line 900 "runtime.in" addFunc(ve, run::gen_runtime105, primGuide(), SYM_CONTROLS, formal(primPair(), SYM(zout), false, false), formal(primPair(), SYM(zin), false, false)); -#line 903 "runtime.in" +#line 905 "runtime.in" addFunc(ve, run::gen_runtime106, primInt(), SYM(size), formal(primGuide(), SYM(g), false, false)); -#line 910 "runtime.in" +#line 912 "runtime.in" addFunc(ve, run::gen_runtime107, primInt(), SYM(length), formal(primGuide(), SYM(g), false, false)); -#line 917 "runtime.in" +#line 919 "runtime.in" addFunc(ve, run::gen_runtime108, primBoolean(), SYM(cyclic), formal(primGuide(), SYM(g), false, false)); -#line 924 "runtime.in" +#line 926 "runtime.in" addFunc(ve, run::gen_runtime109, primPair(), SYM(point), formal(primGuide(), SYM(g), false, false), formal(primInt(), SYM(t), false, false)); -#line 931 "runtime.in" +#line 933 "runtime.in" addFunc(ve, run::gen_runtime110, pairArray(), SYM(dirSpecifier), formal(primGuide(), SYM(g), false, false), formal(primInt(), SYM(t), false, false)); -#line 943 "runtime.in" +#line 945 "runtime.in" addFunc(ve, run::gen_runtime111, pairArray(), SYM(controlSpecifier), formal(primGuide(), SYM(g), false, false), formal(primInt(), SYM(t), false, false)); -#line 960 "runtime.in" +#line 962 "runtime.in" addFunc(ve, run::gen_runtime112, primTensionSpecifier(), SYM(tensionSpecifier), formal(primGuide(), SYM(g), false, false), formal(primInt(), SYM(t), false, false)); -#line 970 "runtime.in" +#line 972 "runtime.in" addFunc(ve, run::gen_runtime113, realArray(), SYM(curlSpecifier), formal(primGuide(), SYM(g), false, false), formal(primInt(), SYM(t), false, false)); -#line 984 "runtime.in" +#line 986 "runtime.in" addFunc(ve, run::gen_runtime114, primGuide(), SYM(reverse), formal(primGuide(), SYM(g), false, false)); -#line 1037 "runtime.in" +#line 1039 "runtime.in" addFunc(ve, run::gen_runtime115, realArray(), SYM(_cputime)); -#line 1052 "runtime.in" +#line 1054 "runtime.in" addFunc(ve, run::gen_runtime116, primBoolean(), SYM_EQ, formal(primTransform(), SYM(a), false, false), formal(primTransform(), SYM(b), false, false)); -#line 1060 "runtime.in" +#line 1062 "runtime.in" addFunc(ve, run::gen_runtime117, primBoolean(), SYM_NEQ, formal(primTransform(), SYM(a), false, false), formal(primTransform(), SYM(b), false, false)); -#line 1065 "runtime.in" +#line 1067 "runtime.in" addFunc(ve, run::gen_runtime118, primTransform(), SYM_PLUS, formal(primTransform(), SYM(a), false, false), formal(primTransform(), SYM(b), false, false)); -#line 1070 "runtime.in" +#line 1072 "runtime.in" addFunc(ve, run::gen_runtime119, primTransform(), SYM_TIMES, formal(primTransform(), SYM(a), false, false), formal(primTransform(), SYM(b), false, false)); -#line 1075 "runtime.in" +#line 1077 "runtime.in" addFunc(ve, run::gen_runtime120, primPair(), SYM_TIMES, formal(primTransform(), SYM(t), false, false), formal(primPair(), SYM(z), false, false)); -#line 1080 "runtime.in" +#line 1082 "runtime.in" addFunc(ve, run::gen_runtime121, primPath(), SYM_TIMES, formal(primTransform(), SYM(t), false, false), formal(primPath(), SYM(g), false, false)); -#line 1085 "runtime.in" +#line 1087 "runtime.in" addFunc(ve, run::gen_runtime122, primPen(), SYM_TIMES, formal(primTransform(), SYM(t), false, false), formal(primPen(), SYM(p), false, false)); -#line 1090 "runtime.in" +#line 1092 "runtime.in" addFunc(ve, run::gen_runtime123, primPicture(), SYM_TIMES, formal(primTransform(), SYM(t), false, false), formal(primPicture(), SYM(f), false, false)); -#line 1095 "runtime.in" +#line 1097 "runtime.in" addFunc(ve, run::gen_runtime124, primPicture(), SYM_TIMES, formal(realArray2(), SYM(t), false, false), formal(primPicture(), SYM(f), false, false)); -#line 1100 "runtime.in" +#line 1102 "runtime.in" addFunc(ve, run::gen_runtime125, primTransform(), SYM_CARET, formal(primTransform(), SYM(t), false, false), formal(primInt(), SYM(n), false, false)); -#line 1111 "runtime.in" +#line 1113 "runtime.in" REGISTER_BLTIN(run::transformXPart,"transformXPart"); -#line 1116 "runtime.in" +#line 1118 "runtime.in" REGISTER_BLTIN(run::transformYPart,"transformYPart"); -#line 1121 "runtime.in" +#line 1123 "runtime.in" REGISTER_BLTIN(run::transformXXPart,"transformXXPart"); -#line 1126 "runtime.in" +#line 1128 "runtime.in" REGISTER_BLTIN(run::transformXYPart,"transformXYPart"); -#line 1131 "runtime.in" +#line 1133 "runtime.in" REGISTER_BLTIN(run::transformYXPart,"transformYXPart"); -#line 1136 "runtime.in" +#line 1138 "runtime.in" REGISTER_BLTIN(run::transformYYPart,"transformYYPart"); -#line 1141 "runtime.in" +#line 1143 "runtime.in" REGISTER_BLTIN(run::real6ToTransform,"real6ToTransform"); -#line 1147 "runtime.in" +#line 1149 "runtime.in" addFunc(ve, run::gen_runtime133, primTransform(), SYM(shift), formal(primTransform(), SYM(t), false, false)); -#line 1152 "runtime.in" +#line 1154 "runtime.in" addFunc(ve, run::gen_runtime134, primTransform(), SYM(shiftless), formal(primTransform(), SYM(t), false, false)); -#line 1157 "runtime.in" +#line 1159 "runtime.in" addFunc(ve, run::transformIdentity, primTransform(), SYM(identity)); -#line 1162 "runtime.in" +#line 1164 "runtime.in" addFunc(ve, run::gen_runtime136, primTransform(), SYM(inverse), formal(primTransform(), SYM(t), false, false)); -#line 1167 "runtime.in" +#line 1169 "runtime.in" addFunc(ve, run::gen_runtime137, primTransform(), SYM(shift), formal(primPair(), SYM(z), false, false)); -#line 1172 "runtime.in" +#line 1174 "runtime.in" addFunc(ve, run::gen_runtime138, primTransform(), SYM(shift), formal(primReal(), SYM(x), false, false), formal(primReal(), SYM(y), false, false)); -#line 1177 "runtime.in" +#line 1179 "runtime.in" addFunc(ve, run::gen_runtime139, primTransform(), SYM(xscale), formal(primReal(), SYM(x), false, false)); -#line 1182 "runtime.in" +#line 1184 "runtime.in" addFunc(ve, run::gen_runtime140, primTransform(), SYM(yscale), formal(primReal(), SYM(y), false, false)); -#line 1187 "runtime.in" +#line 1189 "runtime.in" addFunc(ve, run::gen_runtime141, primTransform(), SYM(scale), formal(primReal(), SYM(x), false, false)); -#line 1192 "runtime.in" +#line 1194 "runtime.in" addFunc(ve, run::gen_runtime142, primTransform(), SYM(scale), formal(primReal(), SYM(x), false, false), formal(primReal(), SYM(y), false, false)); -#line 1197 "runtime.in" +#line 1199 "runtime.in" addFunc(ve, run::gen_runtime143, primTransform(), SYM(slant), formal(primReal(), SYM(s), false, false)); -#line 1202 "runtime.in" +#line 1204 "runtime.in" addFunc(ve, run::gen_runtime144, primTransform(), SYM(rotate), formal(primReal(), SYM(angle), false, false), formal(primPair(), SYM(z), true, false)); -#line 1207 "runtime.in" +#line 1209 "runtime.in" addFunc(ve, run::gen_runtime145, primTransform(), SYM(reflect), formal(primPair(), SYM(a), false, false), formal(primPair(), SYM(b), false, false)); -#line 1212 "runtime.in" +#line 1214 "runtime.in" addFunc(ve, run::gen_runtime146, primBoolean(), SYM(isometry), formal(primTransform(), SYM(t), false, false)); -#line 1217 "runtime.in" +#line 1219 "runtime.in" addFunc(ve, run::gen_runtime147, primReal(), SYM(bezier), formal(primReal(), SYM(a), false, false), formal(primReal(), SYM(b), false, false), formal(primReal(), SYM(c), false, false), formal(primReal(), SYM(d), false, false), formal(primReal(), SYM(t), false, false)); } diff --git a/graphics/asymptote/runtime.in b/graphics/asymptote/runtime.in index 42ea5dffc8..048689c789 100644 --- a/graphics/asymptote/runtime.in +++ b/graphics/asymptote/runtime.in @@ -179,6 +179,8 @@ const item Default=item(default_t()); namespace run { +stopWatch wallClock; + const char *arrayempty="cannot take min or max of empty array"; const char *noruntime="no runtime environment for embedded eval"; @@ -1045,7 +1047,7 @@ realarray *_cputime() (*t)[1]=((real) buf.tms_stime)*ticktime; (*t)[2]=((real) buf.tms_cutime)*ticktime; (*t)[3]=((real) buf.tms_cstime)*ticktime; - (*t)[4]=utils::totalseconds(); + (*t)[4]=wallClock.seconds(); return t; } diff --git a/graphics/asymptote/seconds.h b/graphics/asymptote/seconds.h index 0b92e902e2..a7ea9c0e59 100644 --- a/graphics/asymptote/seconds.h +++ b/graphics/asymptote/seconds.h @@ -1,99 +1,81 @@ #ifndef __seconds_h__ #define __seconds_h__ 1 -#ifdef _WIN32 -#include <Winsock2.h> +#include <chrono> -#include <time.h> -#include <windows.h> -#include <iostream> +namespace utils { -#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS) -#define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64 +#ifdef _WIN32 +#include <Windows.h> +#define getpid GetCurrentProcessId +inline double cpuTime() { + FILETIME a,b,c,d; + return GetProcessTimes(GetCurrentThread(),&a,&b,&c,&d) != 0 ? + (double) (d.dwLowDateTime | + ((unsigned long long)d.dwHighDateTime << 32))*100.0 : 0.0; +} #else -#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL +#include <unistd.h> +#include <time.h> +inline double cpuTime() { + timespec t; + clock_gettime(CLOCK_THREAD_CPUTIME_ID,&t); + return 1.0e9*t.tv_sec+t.tv_nsec; +} #endif -struct timezone -{ - int tz_minuteswest; /* minutes W of Greenwich */ - int tz_dsttime; /* type of dst correction */ +class stopWatch { + std::chrono::time_point<std::chrono::steady_clock> Start; + +public: + void reset() { + Start=std::chrono::steady_clock::now(); + } + + stopWatch() { + reset(); + } + + double nanoseconds(bool reset=false) { + auto Stop=std::chrono::steady_clock::now(); + double ns=std::chrono::duration_cast<std::chrono::nanoseconds> + (Stop-Start).count(); + if(reset) Start=Stop; + return ns; + } + + double seconds(bool reset=false) { + return 1.0e-9*nanoseconds(reset); + } }; -// Definition of a gettimeofday function - -inline int gettimeofday(struct timeval *tv, struct timezone *tz) -{ -// Define a structure to receive the current Windows filetime - FILETIME ft; - -// Initialize the present time to 0 and the timezone to UTC - unsigned __int64 tmpres = 0; - static int tzflag = 0; - - if (NULL != tv) - { - GetSystemTimeAsFileTime(&ft); - -// The GetSystemTimeAsFileTime returns the number of 100 nanosecond -// intervals since Jan 1, 1601 in a structure. Copy the high bits to -// the 64 bit tmpres, shift it left by 32 then or in the low 32 bits. - tmpres |= ft.dwHighDateTime; - tmpres <<= 32; - tmpres |= ft.dwLowDateTime; - -// Convert to microseconds by dividing by 10 - tmpres /= 10; - -// The Unix epoch starts on Jan 1 1970. Need to subtract the difference -// in seconds from Jan 1 1601. - tmpres -= DELTA_EPOCH_IN_MICROSECS; - -// Finally change microseconds to seconds and place in the seconds value. -// The modulus picks up the microseconds. - tv->tv_sec = (long)(tmpres / 1000000UL); - tv->tv_usec = (long)(tmpres % 1000000UL); - } - - if (NULL != tz) - { - if (!tzflag) - { - _tzset(); - tzflag++; - } - -// Adjust for the timezone west of Greenwich - tz->tz_minuteswest = _timezone / 60; - tz->tz_dsttime = _daylight; - } - - return 0; -} +class cpuTimer { + double start; + std::chrono::time_point<std::chrono::steady_clock> Start; -#else +public: + void reset() { + start=cpuTime(); + Start=std::chrono::steady_clock::now(); + } -#include <sys/time.h> + cpuTimer() { + reset(); + } -#endif + double nanoseconds() { + auto Stop=std::chrono::steady_clock::now(); + double stop=cpuTime(); -namespace utils { + return + std::min((double) std::chrono::duration_cast<std::chrono::nanoseconds> + (Stop-Start).count(),stop-start); + } -inline double totalseconds() -{ - timeval tv; - gettimeofday(&tv,NULL); - return tv.tv_sec+tv.tv_usec/1000000.0; -} - -inline double seconds() -{ - static double lastseconds=totalseconds(); - double t=totalseconds(); - double seconds=t-lastseconds; - lastseconds=t; - return seconds; -} + double seconds() { + return 1.0e-9*nanoseconds(); + } +}; } diff --git a/graphics/asymptote/settings.cc b/graphics/asymptote/settings.cc index 355e7ca2ec..be96fd0cd1 100644 --- a/graphics/asymptote/settings.cc +++ b/graphics/asymptote/settings.cc @@ -101,8 +101,8 @@ string defaultPSViewer="open"; string defaultPDFViewer="open"; string defaultHTMLViewer="open"; #else -string defaultPSViewer="gv"; -string defaultPDFViewer="acroread"; +string defaultPSViewer="evince"; +string defaultPDFViewer="evince"; string defaultHTMLViewer="google-chrome"; #endif string defaultGhostscript="gs"; @@ -118,14 +118,12 @@ bool msdos=true; string HOME="USERPROFILE"; string docdir="c:\\Program Files\\Asymptote"; const char pathSeparator=';'; -//string defaultPSViewer="gsview32.exe"; string defaultPSViewer="cmd"; //string defaultPDFViewer="AcroRd32.exe"; string defaultPDFViewer="cmd"; string defaultHTMLViewer="cmd"; string defaultGhostscript; string defaultGhostscriptLibrary; -//string defaultDisplay="imdisplay"; string defaultDisplay="cmd"; //string defaultAnimate="animate"; string defaultAnimate="cmd"; @@ -203,8 +201,6 @@ void queryRegistry() if(defaultPDFViewer != "cmd") defaultPDFViewer=getEntry("Adobe/Acrobat Reader/*/InstallPath/@")+"\\"+ defaultPDFViewer; - if(defaultPSViewer != "cmd") - defaultPSViewer=getEntry("Ghostgum/GSview/*")+"\\gsview\\"+defaultPSViewer; string s; s=getEntry("Microsoft/Windows/CurrentVersion/App Paths/Asymptote/Path"); if(!s.empty()) docdir=s; @@ -367,9 +363,9 @@ struct option : public gc { } // Outputs description of the command for the -help option. - virtual void describe() { + virtual void describe(char option) { // Don't show the option if it has no desciption. - if (!desc.empty()) { + if(!hide() && ((option == 'h') ^ env())) { const unsigned WIDTH=22; string start=describeStart(); cerr << std::left << std::setw(WIDTH) << start; @@ -379,14 +375,19 @@ struct option : public gc { } cerr << " " << desc; if(cmdlineonly) cerr << "; command-line only"; - if(Default != "") - cerr << " [" << Default << "]"; + if(Default != "") { + if(!desc.empty()) cerr << " "; + cerr << Default; + } cerr << endl; } } virtual void reset() { } + + virtual bool env() {return false;} + virtual bool hide() {return false;} }; const string noarg; @@ -464,7 +465,7 @@ struct boolSetting : public itemSetting { bool defaultValue=false) : itemSetting(name, code, noarg, desc, types::primBoolean(), (item)defaultValue, - defaultValue ? "true" : "false") {} + defaultValue ? "[true]" : "[false]") {} bool getOption() { value=(item)true; @@ -475,6 +476,8 @@ struct boolSetting : public itemSetting { struct negOption : public option { boolSetting &base; + bool hide() {return true;} + negOption(boolSetting &base, string name) : option(name, 0, noarg, ""), base(base) {} @@ -521,6 +524,8 @@ struct boolSetting : public itemSetting { struct negOption : public option { multiOption &base; + bool hide() {return true;} + negOption(multiOption &base, string name) : option(name, 0, noarg, ""), base(base) {} @@ -562,7 +567,7 @@ struct stringSetting : public argumentSetting { stringSetting(string name, char code, string argname, string desc, string defaultValue="") - : argumentSetting(name, code, argname, desc.empty() ? "" : + : argumentSetting(name, code, argname, desc == "" ? "["+defaultValue+"]" : desc+(defaultValue.empty() ? "" : " ["+defaultValue+"]"), types::primString(), (item)defaultValue) {} @@ -601,6 +606,8 @@ struct warnSetting : public option { struct negOption : public option { warnSetting &base; + bool hide() {return true;} + negOption(warnSetting &base, string name, string argname) : option(name, 0, argname, ""), base(base) {} @@ -631,6 +638,7 @@ string GetEnv(string s, string Default) { struct envSetting : public stringSetting { envSetting(string name, string Default) : stringSetting(name, 0, " ", "", GetEnv(name,Default)) {} + bool env() {return true;} }; template<class T> @@ -706,6 +714,7 @@ struct stringArraySetting : public itemSetting { stringArraySetting(string name, array *defaultValue) : itemSetting(name, 0, "", "", types::stringArray(), (item) defaultValue) {} + bool hide() {return true;} bool getOption() {return true;} }; @@ -788,6 +797,8 @@ struct boolrefSetting : public refSetting<bool> { struct negOption : public option { boolrefSetting &base; + bool hide() {return true;} + negOption(boolrefSetting &base, string name) : option(name, 0, noarg, ""), base(base) {} @@ -839,6 +850,8 @@ struct incrementSetting : public refSetting<Int> { struct negOption : public option { incrementSetting &base; + bool hide() {return true;} + negOption(incrementSetting &base, string name) : option(name, 0, noarg, ""), base(base) {} @@ -868,6 +881,8 @@ struct incrementOption : public option { Int level=1) : option(name, code, noarg, desc, true), ref(ref), level(level) {} + bool hide() {return true;} + bool getOption() { // Increment the value. (*ref) += level; @@ -903,15 +918,19 @@ void reportSyntax() { exit(1); } -void displayOptions() +void displayOptions(char code) { cerr << endl; - cerr << "Options (negate by replacing - with -no): " - << endl << endl; + if(code == 'h') + cerr << "Options (negate boolean options by replacing - with -no): " + << endl << endl; + else + cerr << "Environment settings: " + << endl << endl; for (optionsMap_t::iterator opt=optionsMap.begin(); opt!=optionsMap.end(); ++opt) - opt->second->describe(); + opt->second->describe(code); } struct helpOption : public option { @@ -920,7 +939,7 @@ struct helpOption : public option { bool getOption() { usage(argv0); - displayOptions(); + displayOptions(code); cerr << endl; exit(0); @@ -1211,7 +1230,7 @@ void initSettings() { addOption(new stringArraySetting("wheeldown", stringArray(wheeldown))); addOption(new stringArraySetting("suppress", new array)); - addOption(new warnSetting("warn", 0, "string", "Enable warning")); + addOption(new warnSetting("warn", 0, "str", "Enable warning")); multiOption *view=new multiOption("View", 'V', "View output"); view->add(new boolSetting("batchView", 0, "View output in batch mode", @@ -1235,9 +1254,9 @@ void initSettings() { "Show 3D axes in PDF output", true)); addOption(new boolSetting("ibl", 0, "Enable environment map image-based lighting", false)); - addOption(new stringSetting("image", 0,"string","Environment image name","snowyField")); - addOption(new stringSetting("imageDir", 0,"string","Environment image library directory","ibl")); - addOption(new stringSetting("imageURL", 0,"string","Environment image library URL","https://vectorgraphics.gitlab.io/asymptote/ibl")); + addOption(new stringSetting("image", 0,"str","Environment image name","snowyField")); + addOption(new stringSetting("imageDir", 0,"str","Environment image library directory","ibl")); + addOption(new stringSetting("imageURL", 0,"str","Environment image library URL","https://vectorgraphics.gitlab.io/asymptote/ibl")); addOption(new realSetting("render", 0, "n", "Render 3D graphics using n pixels per bp (-1=auto)", havegl ? -1.0 : 0.0)); @@ -1290,6 +1309,7 @@ void initSettings() { "Write expressions entered at the prompt to stdout", true)); addOption(new helpOption("help", 'h', "Show summary of options")); + addOption(new helpOption("environment", 'e', "Show summary of environment settings")); addOption(new versionOption("version", 0, "Show version")); addOption(new pairSetting("offset", 'O', "pair", "PostScript offset")); @@ -1379,8 +1399,8 @@ void initSettings() { "Garbage collect using purge(divisor=n) [2]")); #endif - addOption(new stringSetting("prompt", 0,"string","Prompt","> ")); - addOption(new stringSetting("prompt2", 0,"string", + addOption(new stringSetting("prompt", 0,"str","Prompt","> ")); + addOption(new stringSetting("prompt2", 0,"str", "Continuation prompt for multiline input ", "..")); addOption(new boolSetting("multiline", 0, @@ -1394,8 +1414,8 @@ void initSettings() { addOption(new boolSetting("wait", 0, "Wait for child processes to finish before exiting")); - addOption(new IntSetting("inpipe", 0, "n","",-1)); - addOption(new IntSetting("outpipe", 0, "n","",-1)); + addOption(new IntSetting("inpipe", 0, "n","Input pipe",-1)); + addOption(new IntSetting("outpipe", 0, "n","Output pipe",-1)); addOption(new boolSetting("exitonEOF", 0, "Exit interactive mode on EOF", true)); @@ -1422,11 +1442,11 @@ void initSettings() { addOption(new IntSetting("pdfreloaddelay", 0, "usec", "Delay before attempting initial pdf reload" ,750000)); - addOption(new stringSetting("autoimport", 0, "string", + addOption(new stringSetting("autoimport", 0, "str", "Module to automatically import")); - addOption(new userSetting("command", 'c', "string", + addOption(new userSetting("command", 'c', "str", "Command to autoexecute")); - addOption(new userSetting("user", 'u', "string", + addOption(new userSetting("user", 'u', "str", "General purpose user string")); addOption(new realSetting("zoomfactor", 0, "factor", "Zoom step factor", @@ -1456,20 +1476,20 @@ void initSettings() { addOption(new IntSetting("digits", 0, "n", "Default output file precision", 7)); - addOption(new realSetting("paperwidth", 0, "bp", "")); - addOption(new realSetting("paperheight", 0, "bp", "")); + addOption(new realSetting("paperwidth", 0, "bp", "Default page width")); + addOption(new realSetting("paperheight", 0, "bp", "Default page height")); - addOption(new stringSetting("dvipsOptions", 0, "string", "")); - addOption(new stringSetting("dvisvgmOptions", 0, "string", "")); + addOption(new stringSetting("dvipsOptions", 0, "str", "")); + addOption(new stringSetting("dvisvgmOptions", 0, "str", "")); addOption(new boolSetting("dvisvgmMultipleFiles", 0, "dvisvgm supports multiple files", true)); - addOption(new stringSetting("convertOptions", 0, "string", "")); - addOption(new stringSetting("gsOptions", 0, "string", "")); - addOption(new stringSetting("htmlviewerOptions", 0, "string", "")); - addOption(new stringSetting("psviewerOptions", 0, "string", "")); - addOption(new stringSetting("pdfviewerOptions", 0, "string", "")); - addOption(new stringSetting("pdfreloadOptions", 0, "string", "")); - addOption(new stringSetting("glOptions", 0, "string", "")); + addOption(new stringSetting("convertOptions", 0, "str", "")); + addOption(new stringSetting("gsOptions", 0, "str", "")); + addOption(new stringSetting("htmlviewerOptions", 0, "str", "")); + addOption(new stringSetting("psviewerOptions", 0, "str", "")); + addOption(new stringSetting("pdfviewerOptions", 0, "str", "")); + addOption(new stringSetting("pdfreloadOptions", 0, "str", "")); + addOption(new stringSetting("glOptions", 0, "str", "")); addOption(new stringSetting("hyperrefOptions", 0, "str", "","setpagesize=false,unicode,pdfborder=0 0 0")); diff --git a/graphics/asymptote/statistics.h b/graphics/asymptote/statistics.h index a8cca39bf4..5588f7a99d 100644 --- a/graphics/asymptote/statistics.h +++ b/graphics/asymptote/statistics.h @@ -1,18 +1,46 @@ #ifndef __statistics_h__ #define __statistics_h__ 1 +#include <queue> +#include <cfloat> + namespace utils { +template <class T, class S, class C> +void clearpq(std::priority_queue<T, S, C>& q) { + struct HackedQueue : private std::priority_queue<T, S, C> { + static S& Container(std::priority_queue<T, S, C>& q) { + return q.*&HackedQueue::c; + } + }; + HackedQueue::Container(q).clear(); +} + class statistics { - unsigned int N; + size_t N; double A; double varL; double varH; + double m,M; + double Median; + bool computeMedian; + + // These heap stores are only used when computeMedian=true. + // Max heap stores the smaller half elements: + std::priority_queue<double> s; + // Min heap stores the greater half elements: + std::priority_queue<double,std::vector<double>,std::greater<double> > g; + public: - statistics() {clear();} - void clear() {N=0; A=varL=varH=0.0;} + statistics(bool computeMedian=false) : computeMedian(computeMedian) { + clear(); + } + void clear() {N=0; A=varL=varH=0.0; m=DBL_MAX; M=-m; clearpq(s); clearpq(g);} double count() {return N;} double mean() {return A;} + double max() {return M;} + double min() {return m;} + double sum() {return N*A;} void add(double t) { ++N; double diff=t-A; @@ -22,10 +50,53 @@ public: varL += v; else varH += v; + + if(t < m) m=t; + if(t > M) M=t; + + if(computeMedian) { + if(N == 1) + s.push(Median=t); + else { + if(s.size() > g.size()) { // left side heap has more elements + + if(t < Median) { + g.push(s.top()); + s.pop(); + s.push(t); + } else + g.push(t); + + Median=0.5*(s.top()+g.top()); + } + + else if(s.size() == g.size()) { // both heaps are balanced + if(t < Median) { + s.push(t); + Median=(double) s.top(); + } else { + g.push(t); + Median=(double) g.top(); + } + } + + else { // right side heap has more elements + if(t > Median) { + s.push(g.top()); + g.pop(); + g.push(t); + } else + s.push(t); + + Median=0.5*(s.top()+g.top()); + } + } + } } + double stdev(double var, double f) { - double factor=N > f ? f/(N-f) : 0.0; - return sqrt(var*factor); + if(N <= f) return DBL_MAX; + return sqrt(var*f/(N-f)); } double stdev() { return stdev(varL+varH,1.0); @@ -36,8 +107,18 @@ public: double stdevH() { return stdev(varH,2.0); } - void output(const char *text, unsigned int m) { - std::cout << text << ":\n" + double stderror() { + return stdev()/sqrt(N); + } + double median() { + if(!computeMedian) { + std::cerr << "Constructor requires median=true" << std::endl; + exit(-1); + } + return Median; + } + void output(const char *text, size_t m) { + std::cout << text << ": \n" << m << "\t" << A << "\t" << stdevL() << "\t" diff --git a/graphics/asymptote/v3dheadertypes.h b/graphics/asymptote/v3dheadertypes.h index cc9a0d6649..8644f1ce8a 100644 --- a/graphics/asymptote/v3dheadertypes.h +++ b/graphics/asymptote/v3dheadertypes.h @@ -1,6 +1,6 @@ // Enum class for v3dheadertypes // AUTO-GENERATED from v3dheadertypes.csv -// Generated at 2022-09-17 12:45:44.250502 +// Generated at 2023-01-23 00:17:36 namespace camp { diff --git a/graphics/asymptote/v3dheadertypes.py b/graphics/asymptote/v3dheadertypes.py index 94f5f054d8..d0fcb63ff2 100644 --- a/graphics/asymptote/v3dheadertypes.py +++ b/graphics/asymptote/v3dheadertypes.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # Enum class for v3dheadertypes """ AUTO-GENERATED from v3dheadertypes.csv """ -# Generated at 2022-09-17 12:47:07.682666 +# Generated at 2023-01-23 00:17:44 class v3dheadertypes: v3dheadertypes_canvasWidth=1 diff --git a/graphics/asymptote/v3dtypes.h b/graphics/asymptote/v3dtypes.h index 5ad157db61..305584ad3b 100644 --- a/graphics/asymptote/v3dtypes.h +++ b/graphics/asymptote/v3dtypes.h @@ -1,6 +1,6 @@ // Enum class for v3dtypes // AUTO-GENERATED from v3dtypes.csv -// Generated at 2022-09-17 12:45:44.273869 +// Generated at 2023-01-23 00:17:36 namespace camp { diff --git a/graphics/asymptote/v3dtypes.py b/graphics/asymptote/v3dtypes.py index 9581c3736d..62dbea5aa6 100644 --- a/graphics/asymptote/v3dtypes.py +++ b/graphics/asymptote/v3dtypes.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # Enum class for v3dtypes """ AUTO-GENERATED from v3dtypes.csv """ -# Generated at 2022-09-17 12:47:07.664682 +# Generated at 2023-01-23 00:17:44 class v3dtypes: v3dtypes_material=1 diff --git a/graphics/asymptote/xstream.h b/graphics/asymptote/xstream.h index 4c550fe5a0..c2c2f4cdeb 100644 --- a/graphics/asymptote/xstream.h +++ b/graphics/asymptote/xstream.h @@ -134,7 +134,7 @@ private: protected: XDR xdri; public: - ixstream(bool singleprecision=false): singleprecision(singleprecision) {} + ixstream(bool singleprecision=false) : singleprecision(singleprecision) {} virtual void open(const char *filename, open_mode=in) { clear(); @@ -156,8 +156,10 @@ public: buf=nullptr; } } - ixstream(const char *filename) {open(filename);} - ixstream(const char *filename, open_mode mode) {open(filename,mode);} + ixstream(const char *filename, bool singleprecision=false) : + singleprecision(singleprecision) {open(filename);} + ixstream(const char *filename, open_mode mode, bool singleprecision=false) : + singleprecision(singleprecision) {open(filename,mode);} virtual ~ixstream() {close();} typedef ixstream& (*imanip)(ixstream&); @@ -226,9 +228,10 @@ public: } } - oxstream(const char *filename, bool singleprecision=false): singleprecision(singleprecision) {open(filename);} - oxstream(const char *filename, open_mode mode, bool singleprecision=false): singleprecision(singleprecision) - { + oxstream(const char *filename, bool singleprecision=false) : + singleprecision(singleprecision) {open(filename);} + oxstream(const char *filename, open_mode mode, bool singleprecision=false) : + singleprecision(singleprecision) { open(filename,mode); } virtual ~oxstream() {closefile();} |