Merge pull request #1 from savetheclocktower/possible-rng-fix

Update Catch2…

Author: confused-Techie

benchmark/native/marker-index-benchmark.cc

@@ -2,7 +2,7 @@
 #include <iostream>
 #include <vector>
 #include <stdlib.h>
-#include "catch.hpp"
+#include "catch_amalgamated.hpp"
 #include "point.h"
 #include "range.h"
 #include "marker-index.h"

binding.gyp

@@ -85,7 +85,7 @@
                     }
                 }],
                 ['OS=="win"', {
-                   'sources': [
+                    'sources': [
                        'vendor/win-iconv/win_iconv.c',
                     ],
                     'include_dirs': [
@@ -148,10 +148,16 @@
             "targets": [{
                 "target_name": "tests",
                 "type": "executable",
+                "cflags_cc": ["-std=c++17"],
                 "cflags_cc!": ["-fno-exceptions"],
                 "defines": [
-                    "CATCH_CONFIG_CPP11_NO_IS_ENUM"
+                    "CATCH_CONFIG_CPP11_NO_IS_ENUM",
+                    "CATCH_CONFIG_CPP17_STRING_VIEW"
                 ],
+                'xcode_settings': {
+                    'CLANG_CXX_LIBRARY': 'libc++',
+                    'CLANG_CXX_LANGUAGE_STANDARD': 'c++17',
+                },
                 "sources": [
                     "test/native/test-helpers.cc",
                     "test/native/tests.cc",
@@ -160,6 +166,7 @@
                     "test/native/text-buffer-test.cc",
                     "test/native/text-test.cc",
                     "test/native/text-diff-test.cc",
+                    "vendor/catch_amalgamated.cpp"
                 ],
                 "include_dirs": [
                     "vendor",
@@ -175,7 +182,7 @@
                         ],
                         "xcode_settings": {
                             "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
-                            'MACOSX_DEPLOYMENT_TARGET': '10.8',
+                            'MACOSX_DEPLOYMENT_TARGET': '10.12',
                         }
                     }]
                 ]
@@ -189,7 +196,8 @@
             ['OS=="mac"', {
                 "xcode_settings": {
                     'CLANG_CXX_LIBRARY': 'libc++',
-                    'CLANG_CXX_LANGUAGE_STANDARD':'c++11',
+                    'CLANG_CXX_LANGUAGE_STANDARD': 'c++17',
+                    'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',  # -fvisibility=hidden
                 }
             }],
             ['OS=="win"', {

test/native/test-helpers.cc

@@ -2,7 +2,7 @@
 #include "patch.h"
 #include "range.h"
 #include "text-buffer.h"
-#include <catch.hpp>
+#include <catch_amalgamated.hpp>
 #include <cstring>
 #include <memory>
 #include <ostream>

test/native/test-helpers.h

@@ -2,7 +2,7 @@
 #define SUPERSTRING_TEST_HELPERS_H
 
 #include "patch.h"
-#include <catch.hpp>
+#include <catch_amalgamated.hpp>
 #include <cstring>
 #include <memory>
 #include <ostream>

test/native/tests.cc

@@ -2,4 +2,4 @@
 // for a faster feedback loop
 
 #define CATCH_CONFIG_MAIN
-#include <catch.hpp>
+#include <catch_amalgamated.hpp>

test/native/text-buffer-test.cc

@@ -338,20 +338,20 @@ TEST_CASE("TextBuffer::find") {
   Regex(u"(", &error_message);
   REQUIRE(error_message == u"missing closing parenthesis");
 
-  REQUIRE(buffer.find(Regex(u"", nullptr)) == (Range{{0, 0}, {0, 0}}));
-  REQUIRE(TextBuffer().find(Regex(u"", nullptr)) == (Range{{0, 0}, {0, 0}}));
+  REQUIRE(*buffer.find(Regex(u"", nullptr)) == (Range{{0, 0}, {0, 0}}));
+  REQUIRE(*TextBuffer().find(Regex(u"", nullptr)) == (Range{{0, 0}, {0, 0}}));
 
-  REQUIRE(buffer.find(Regex(u"ef*", nullptr)) == (Range{{1, 0}, {1, 2}}));
+  REQUIRE(*buffer.find(Regex(u"ef*", nullptr)) == (Range{{1, 0}, {1, 2}}));
   REQUIRE(buffer.find(Regex(u"x", nullptr)) == optional<Range>{});
-  REQUIRE(buffer.find(Regex(u"c.", nullptr)) == (Range{{0, 2}, {0, 4}}));
-  REQUIRE(buffer.find(Regex(u"d", nullptr)) == (Range{{0, 3}, {0, 4}}));
-  REQUIRE(buffer.find(Regex(u"\\n", nullptr)) == (Range{{0, 4}, {1, 0}}));
-  REQUIRE(buffer.find(Regex(u"\\be", nullptr)) == (Range{{1, 0}, {1, 1}}));
-  REQUIRE(buffer.find(Regex(u"^e", nullptr)) == (Range{{1, 0}, {1, 1}}));
-  REQUIRE(buffer.find(Regex(u"^(e|d)g?", nullptr)) == (Range{{1, 0}, {1, 1}}));
+  REQUIRE(*buffer.find(Regex(u"c.", nullptr)) == (Range{{0, 2}, {0, 4}}));
+  REQUIRE(*buffer.find(Regex(u"d", nullptr)) == (Range{{0, 3}, {0, 4}}));
+  REQUIRE(*buffer.find(Regex(u"\\n", nullptr)) == (Range{{0, 4}, {1, 0}}));
+  REQUIRE(*buffer.find(Regex(u"\\be", nullptr)) == (Range{{1, 0}, {1, 1}}));
+  REQUIRE(*buffer.find(Regex(u"^e", nullptr)) == (Range{{1, 0}, {1, 1}}));
+  REQUIRE(*buffer.find(Regex(u"^(e|d)g?", nullptr)) == (Range{{1, 0}, {1, 1}}));
 
   buffer.reset(Text{u"a1b"});
-  REQUIRE(buffer.find(Regex(u"\\d", nullptr)) == (Range{{0, 1}, {0, 2}}));
+  REQUIRE(*buffer.find(Regex(u"\\d", nullptr)) == (Range{{0, 1}, {0, 2}}));
 }
 
 TEST_CASE("TextBuffer::find - spanning edits") {
@@ -360,17 +360,17 @@ TEST_CASE("TextBuffer::find - spanning edits") {
   buffer.set_text_in_range({{0, 9}, {0, 9}}, u"67890");
 
   REQUIRE(buffer.text() == u"ab12345cd67890");
-  REQUIRE(buffer.find(Regex(u"b1234", nullptr)) == (Range{{0, 1}, {0, 6}}));
-  REQUIRE(buffer.find(Regex(u"b12345c", nullptr)) == (Range{{0, 1}, {0, 8}}));
-  REQUIRE(buffer.find(Regex(u"b12345cd6", nullptr)) == (Range{{0, 1}, {0, 10}}));
-  REQUIRE(buffer.find(Regex(u"345[a-z][a-z]", nullptr)) == (Range{{0, 4}, {0, 9}}));
-  REQUIRE(buffer.find(Regex(u"5cd6", nullptr)) == (Range{{0, 6}, {0, 10}}));
+  REQUIRE(*buffer.find(Regex(u"b1234", nullptr)) == (Range{{0, 1}, {0, 6}}));
+  REQUIRE(*buffer.find(Regex(u"b12345c", nullptr)) == (Range{{0, 1}, {0, 8}}));
+  REQUIRE(*buffer.find(Regex(u"b12345cd6", nullptr)) == (Range{{0, 1}, {0, 10}}));
+  REQUIRE(*buffer.find(Regex(u"345[a-z][a-z]", nullptr)) == (Range{{0, 4}, {0, 9}}));
+  REQUIRE(*buffer.find(Regex(u"5cd6", nullptr)) == (Range{{0, 6}, {0, 10}}));
 
   buffer.reset(Text{u"abcdef"});
   buffer.set_text_in_range({{0, 2}, {0, 4}}, u"");
   REQUIRE(buffer.text() == u"abef");
-  REQUIRE(buffer.find(Regex(u"abe", nullptr)) == (Range{{0, 0}, {0, 3}}));
-  REQUIRE(buffer.find(Regex(u"bef", nullptr)) == (Range{{0, 1}, {0, 4}}));
+  REQUIRE(*buffer.find(Regex(u"abe", nullptr)) == (Range{{0, 0}, {0, 3}}));
+  REQUIRE(*buffer.find(Regex(u"bef", nullptr)) == (Range{{0, 1}, {0, 4}}));
   REQUIRE(buffer.find(Regex(u"bc", nullptr)) == optional<Range>{});
 }