Merge "Updates to motor controller code"
diff --git a/.bazelrc b/.bazelrc
index 57f01ea..1318580 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -76,6 +76,8 @@
build --spawn_strategy=linux-sandbox
build --experimental_sandbox_default_allow_network=false
+build --strategy=TypeScriptCompile=worker --strategy=AngularTemplateCompile=worker
+
# Use our hermetic JDK.
# Note that this doesn't quite work fully, but it should. See
# https://github.com/bazelbuild/bazel/issues/6341 for ongoing discussion with
diff --git a/aos/containers/ring_buffer.h b/aos/containers/ring_buffer.h
index d4cd92a..cd7872e 100644
--- a/aos/containers/ring_buffer.h
+++ b/aos/containers/ring_buffer.h
@@ -55,6 +55,74 @@
// Clears all the data out of the buffer.
void Reset() { size_ = 0; }
+ class iterator {
+ public:
+ using iterator_category = ::std::forward_iterator_tag;
+ using value_type = Data;
+ using difference_type = ::std::ptrdiff_t;
+ using pointer = Data *;
+ using reference = Data &;
+
+ explicit iterator(RingBuffer *buffer, size_t index)
+ : buffer_(buffer), index_(index) {}
+
+ iterator &operator++() {
+ ++index_;
+ return *this;
+ }
+ iterator operator++(int) {
+ iterator retval = *this;
+ ++(*this);
+ return retval;
+ }
+ bool operator==(iterator other) const {
+ return buffer_ == other.buffer_ && index_ == other.index_;
+ }
+ bool operator!=(iterator other) const { return !(*this == other); }
+ reference operator*() const { return (*buffer_)[index_]; }
+
+ private:
+ RingBuffer *buffer_;
+ size_t index_;
+ };
+
+ class const_iterator {
+ public:
+ using iterator_category = ::std::forward_iterator_tag;
+ using value_type = Data;
+ using difference_type = ::std::ptrdiff_t;
+ using pointer = Data *;
+ using reference = Data &;
+
+ explicit const_iterator(const RingBuffer *buffer, size_t index)
+ : buffer_(buffer), index_(index) {}
+
+ const_iterator &operator++() {
+ ++index_;
+ return *this;
+ }
+ const_iterator operator++(int) {
+ const_iterator retval = *this;
+ ++(*this);
+ return retval;
+ }
+ bool operator==(const_iterator other) const {
+ return buffer_ == other.buffer_ && index_ == other.index_;
+ }
+ bool operator!=(const_iterator other) const { return !(*this == other); }
+ const Data &operator*() const { return (*buffer_)[index_]; }
+
+ private:
+ const RingBuffer *buffer_;
+ size_t index_;
+ };
+
+ iterator begin() { return iterator(this, 0); }
+ iterator end() { return iterator(this, size()); }
+
+ const_iterator begin() const { return const_iterator(this, 0); }
+ const_iterator end() const { return const_iterator(this, size()); }
+
private:
::std::array<Data, buffer_size> data_;
diff --git a/aos/containers/ring_buffer_test.cc b/aos/containers/ring_buffer_test.cc
index 5fb2331..01e057f 100644
--- a/aos/containers/ring_buffer_test.cc
+++ b/aos/containers/ring_buffer_test.cc
@@ -118,5 +118,41 @@
}
}
+// Test that an iterator over the buffer works.
+TEST_F(RingBufferTest, Iterator) {
+ // Over fill it, and then clear it out.
+ ASSERT_TRUE(buffer_.empty());
+
+ for (int i = 0; i < 12; ++i) {
+ buffer_.Push(i);
+ }
+
+ int i = 0;
+ for (int element : buffer_) {
+ EXPECT_EQ(i + 2, element);
+ ++i;
+ }
+ EXPECT_EQ(i, buffer_.size());
+}
+
+// Test that a const iterator over the buffer works.
+TEST_F(RingBufferTest, CIterator) {
+ // Over fill it, and then clear it out.
+ ASSERT_TRUE(buffer_.empty());
+
+ for (int i = 0; i < 12; ++i) {
+ buffer_.Push(i);
+ }
+
+ const RingBuffer<int, 10> &cbuffer = buffer_;
+
+ int i = 0;
+ for (const int element : cbuffer) {
+ EXPECT_EQ(i + 2, element);
+ ++i;
+ }
+ EXPECT_EQ(i, buffer_.size());
+}
+
} // namespace testing
} // namespace aos
diff --git a/aos/input/action_joystick_input.cc b/aos/input/action_joystick_input.cc
index 81e277d..6a38967 100644
--- a/aos/input/action_joystick_input.cc
+++ b/aos/input/action_joystick_input.cc
@@ -23,7 +23,8 @@
}
}
- if (!auto_running_ || (run_teleop_in_auto_ && !action_queue_.Running())) {
+ if (!auto_running_ ||
+ (input_config_.run_teleop_in_auto && !action_queue_.Running())) {
if (auto_was_running_) {
AutoEnded();
auto_was_running_ = false;
@@ -36,6 +37,11 @@
HandleTeleop(data);
}
+ if (auto_action_running_ &&
+ data.IsPressed(input_config_.cancel_auto_button)) {
+ StopAuto();
+ }
+
// Process pending actions.
action_queue_.Tick();
was_running_ = action_queue_.Running();
@@ -43,12 +49,15 @@
void ActionJoystickInput::StartAuto() {
LOG(INFO, "Starting auto mode\n");
- action_queue_.EnqueueAction(::frc971::autonomous::MakeAutonomousAction(0));
+ action_queue_.EnqueueAction(
+ ::frc971::autonomous::MakeAutonomousAction(GetAutonomousMode()));
+ auto_action_running_ = true;
}
void ActionJoystickInput::StopAuto() {
LOG(INFO, "Stopping auto mode\n");
action_queue_.CancelAllActions();
+ auto_action_running_ = false;
}
} // namespace input
diff --git a/aos/input/action_joystick_input.h b/aos/input/action_joystick_input.h
index 87b980e..bb4e563 100644
--- a/aos/input/action_joystick_input.h
+++ b/aos/input/action_joystick_input.h
@@ -14,21 +14,29 @@
// Turns out we do the same thing every year, so let's stop copying it.
class ActionJoystickInput : public ::aos::input::JoystickInput {
public:
+ // Configuration parameters that don't really belong in the DrivetrainConfig.
+ struct InputConfig {
+ // If true, we will run teleop during auto mode after auto mode ends. This
+ // is to support the 2019 sandstorm mode. Auto will run, and then when the
+ // action ends (either when it's done, or when the driver triggers it to
+ // finish early), we will run teleop regardless of the mode.
+ bool run_teleop_in_auto = false;
+ // A button, for use with the run_teleop_in_auto, that will cancel the auto
+ // mode, and if run_telop_in_auto is specified, resume teloperation.
+ const driver_station::ButtonLocation cancel_auto_button;
+ };
ActionJoystickInput(
::aos::EventLoop *event_loop,
- const ::frc971::control_loops::drivetrain::DrivetrainConfig<double>
- &dt_config)
+ const ::frc971::control_loops::drivetrain::DrivetrainConfig<double> &
+ dt_config,
+ const InputConfig &input_config)
: ::aos::input::JoystickInput(event_loop),
+ input_config_(input_config),
drivetrain_input_reader_(DrivetrainInputReader::Make(
DrivetrainInputReader::InputType::kPistol, dt_config)) {}
virtual ~ActionJoystickInput() {}
- protected:
- void set_run_teleop_in_auto(bool run_teleop_in_auto) {
- run_teleop_in_auto_ = run_teleop_in_auto;
- }
-
private:
// Handles anything that needs to be cleaned up when the auto action exits.
virtual void AutoEnded() {}
@@ -40,21 +48,22 @@
void StartAuto();
void StopAuto();
+ // Returns the current autonomous mode which has been selected by robot
+ // inputs.
+ virtual uint32_t GetAutonomousMode() { return 0; }
+
// True if the internal state machine thinks auto is running right now.
bool auto_running_ = false;
+ // True if we think that the auto *action* is running right now.
+ bool auto_action_running_ = false;
// True if an action was running last cycle.
bool was_running_ = false;
- // If true, we will run teleop during auto mode after auto mode ends. This is
- // to support the 2019 sandstorm mode. Auto will run, and then when the
- // action ends (either when it's done, or when the driver triggers it to
- // finish early), we will run teleop regardless of the mode.
- bool run_teleop_in_auto_ = false;
+ const InputConfig input_config_;
// Bool to track if auto was running the last cycle through. This lets us
// call AutoEnded when the auto mode function stops.
bool auto_was_running_ = false;
-
::std::unique_ptr<DrivetrainInputReader> drivetrain_input_reader_;
::aos::common::actions::ActionQueue action_queue_;
};
diff --git a/aos/input/drivetrain_input.cc b/aos/input/drivetrain_input.cc
index 248f1ce..631f97d 100644
--- a/aos/input/drivetrain_input.cc
+++ b/aos/input/drivetrain_input.cc
@@ -170,6 +170,10 @@
throttle = ::std::max(-1.0, throttle / 0.7);
}
+ if (data.IsPressed(slow_down_)) {
+ throttle *= 0.5;
+ }
+
if (!data.GetControlBit(ControlBit::kEnabled)) {
high_gear_ = default_high_gear_;
}
@@ -242,6 +246,7 @@
const ButtonLocation TopButton(1, 1);
const ButtonLocation SecondButton(1, 2);
+ const ButtonLocation BottomButton(1, 4);
// Non-existant button for nops.
const ButtonLocation DummyButton(1, 10);
@@ -264,7 +269,8 @@
kWheelHigh, kWheelLow, kTriggerVelocityHigh, kTriggerVelocityLow,
kTriggerTorqueHigh, kTriggerTorqueLow, kTriggerHigh, kTriggerLow,
kWheelVelocityHigh, kWheelVelocityLow, kWheelTorqueHigh,
- kWheelTorqueLow, kQuickTurn, kShiftHigh, kShiftLow, kTurn1, kTurn2));
+ kWheelTorqueLow, kQuickTurn, kShiftHigh, kShiftLow, kTurn1, kTurn2,
+ BottomButton));
result->set_default_high_gear(default_high_gear);
return result;
diff --git a/aos/input/drivetrain_input.h b/aos/input/drivetrain_input.h
index f4b0212..ec52368 100644
--- a/aos/input/drivetrain_input.h
+++ b/aos/input/drivetrain_input.h
@@ -182,7 +182,8 @@
driver_station::ButtonLocation shift_high,
driver_station::ButtonLocation shift_low,
driver_station::ButtonLocation turn1,
- driver_station::ButtonLocation turn2)
+ driver_station::ButtonLocation turn2,
+ driver_station::ButtonLocation slow_down)
: DrivetrainInputReader(wheel_high, throttle_high, quick_turn, turn1,
TurnButtonUse::kLineFollow, turn2,
TurnButtonUse::kControlLoopDriving),
@@ -197,7 +198,8 @@
throttle_torque_high_(throttle_torque_high),
throttle_torque_low_(throttle_torque_low),
shift_high_(shift_high),
- shift_low_(shift_low) {}
+ shift_low_(shift_low),
+ slow_down_(slow_down) {}
WheelAndThrottle GetWheelAndThrottle(
const ::aos::input::driver_station::Data &data) override;
@@ -222,6 +224,7 @@
const driver_station::ButtonLocation shift_high_;
const driver_station::ButtonLocation shift_low_;
+ const driver_station::ButtonLocation slow_down_;
bool high_gear_;
bool default_high_gear_;
diff --git a/aos/scoped/BUILD b/aos/scoped/BUILD
index 002026e..f5b3832 100644
--- a/aos/scoped/BUILD
+++ b/aos/scoped/BUILD
@@ -2,6 +2,9 @@
cc_library(
name = "scoped_fd",
+ srcs = [
+ "scoped_fd.cc",
+ ],
hdrs = [
"scoped_fd.h",
],
diff --git a/aos/scoped/scoped_fd.cc b/aos/scoped/scoped_fd.cc
new file mode 100644
index 0000000..a570df0
--- /dev/null
+++ b/aos/scoped/scoped_fd.cc
@@ -0,0 +1,15 @@
+#include "aos/scoped/scoped_fd.h"
+
+#include "aos/logging/logging.h"
+
+namespace aos {
+
+void ScopedFD::Close() {
+ if (fd_ != -1) {
+ if (close(fd_) == -1) {
+ PLOG(WARNING, "close(%d) failed", fd_);
+ }
+ }
+}
+
+} // namespace aos
diff --git a/aos/scoped/scoped_fd.h b/aos/scoped/scoped_fd.h
index 696cf3b..e098d2c 100644
--- a/aos/scoped/scoped_fd.h
+++ b/aos/scoped/scoped_fd.h
@@ -1,9 +1,8 @@
-#ifndef _AOS_SCOPED_FD_
-#define _AOS_SCOPED_FD_
+#ifndef AOS_SCOPED_SCOPED_FD_H_
+#define AOS_SCOPED_SCOPED_FD_H_
#include <unistd.h>
-#include "aos/logging/logging.h"
#include "aos/macros.h"
namespace aos {
@@ -29,16 +28,10 @@
private:
int fd_;
- void Close() {
- if (fd_ != -1) {
- if (close(fd_) == -1) {
- PLOG(WARNING, "close(%d) failed", fd_);
- }
- }
- }
+ void Close();
DISALLOW_COPY_AND_ASSIGN(ScopedFD);
};
} // namespace aos
-#endif // _AOS_SCOPED_FD_
+#endif // AOS_SCOPED_SCOPED_FD_H_
diff --git a/aos/seasocks/BUILD b/aos/seasocks/BUILD
index d4411f1..ae8d402 100644
--- a/aos/seasocks/BUILD
+++ b/aos/seasocks/BUILD
@@ -1,7 +1,18 @@
py_binary(
- name = 'gen_embedded',
- visibility = ['//visibility:public'],
- srcs = [
- 'gen_embedded.py',
- ],
+ name = "gen_embedded",
+ srcs = [
+ "gen_embedded.py",
+ ],
+ visibility = ["//visibility:public"],
+)
+
+cc_library(
+ name = "seasocks_logger",
+ srcs = ["seasocks_logger.cc"],
+ hdrs = ["seasocks_logger.h"],
+ visibility = ["//visibility:public"],
+ deps = [
+ "//aos/logging",
+ "//third_party/seasocks",
+ ],
)
diff --git a/aos/seasocks/seasocks_logger.cc b/aos/seasocks/seasocks_logger.cc
new file mode 100644
index 0000000..dad9970
--- /dev/null
+++ b/aos/seasocks/seasocks_logger.cc
@@ -0,0 +1,33 @@
+#include "aos/seasocks/seasocks_logger.h"
+
+#include "aos/logging/logging.h"
+#include "seasocks/PrintfLogger.h"
+
+namespace aos {
+namespace seasocks {
+
+void SeasocksLogger::log(::seasocks::Logger::Level level, const char *message) {
+ // Convert Seasocks error codes to AOS.
+ log_level aos_level;
+ switch (level) {
+ case ::seasocks::Logger::Level::Info:
+ aos_level = INFO;
+ break;
+ case ::seasocks::Logger::Level::Warning:
+ aos_level = WARNING;
+ break;
+ case ::seasocks::Logger::Level::Error:
+ case ::seasocks::Logger::Level::Severe:
+ aos_level = ERROR;
+ break;
+ case ::seasocks::Logger::Level::Debug:
+ case ::seasocks::Logger::Level::Access:
+ default:
+ aos_level = DEBUG;
+ break;
+ }
+ LOG(aos_level, "Seasocks: %s\n", message);
+}
+
+} // namespace seasocks
+} // namespace aos
diff --git a/aos/seasocks/seasocks_logger.h b/aos/seasocks/seasocks_logger.h
new file mode 100644
index 0000000..64f13fa
--- /dev/null
+++ b/aos/seasocks/seasocks_logger.h
@@ -0,0 +1,19 @@
+#ifndef AOS_SEASOCKS_SEASOCKS_LOGGER_H_
+#define AOS_SEASOCKS_SEASOCKS_LOGGER_H_
+
+#include "seasocks/PrintfLogger.h"
+
+namespace aos {
+namespace seasocks {
+
+class SeasocksLogger : public ::seasocks::PrintfLogger {
+ public:
+ SeasocksLogger(::seasocks::Logger::Level min_level_to_log)
+ : PrintfLogger(min_level_to_log) {}
+ void log(::seasocks::Logger::Level level, const char *message) override;
+};
+
+} // namespace seasocks
+} // namespace aos
+
+#endif // AOS_SEASOCKS_SEASOCKS_LOGGER_H_
diff --git a/aos/util/BUILD b/aos/util/BUILD
index af6faf5..7b50f49 100644
--- a/aos/util/BUILD
+++ b/aos/util/BUILD
@@ -295,6 +295,7 @@
"file.h",
],
deps = [
+ "//aos/logging",
"//aos/scoped:scoped_fd",
],
)
diff --git a/aos/util/file.cc b/aos/util/file.cc
index dc31ddd..f952955 100644
--- a/aos/util/file.cc
+++ b/aos/util/file.cc
@@ -3,6 +3,7 @@
#include <fcntl.h>
#include <unistd.h>
+#include "aos/logging/logging.h"
#include "aos/scoped/scoped_fd.h"
namespace aos {
diff --git a/aos/vision/blob/BUILD b/aos/vision/blob/BUILD
index 81afb93..7d5f930 100644
--- a/aos/vision/blob/BUILD
+++ b/aos/vision/blob/BUILD
@@ -18,9 +18,6 @@
cc_library(
name = "region_alloc",
hdrs = ["region_alloc.h"],
- deps = [
- "//aos/logging",
- ],
)
cc_library(
diff --git a/aos/vision/blob/disjoint_set.h b/aos/vision/blob/disjoint_set.h
index ed15caf..38cca1d 100644
--- a/aos/vision/blob/disjoint_set.h
+++ b/aos/vision/blob/disjoint_set.h
@@ -6,7 +6,7 @@
namespace aos {
namespace vision {
-// Disjoint set algorithm:
+// Disjoint set algorithm, which is similar to what this class does:
// https://en.wikipedia.org/wiki/Disjoint-set_data_structure
class DisjointSet {
public:
diff --git a/aos/vision/blob/find_blob.cc b/aos/vision/blob/find_blob.cc
index 3153fcb..ab65e34 100644
--- a/aos/vision/blob/find_blob.cc
+++ b/aos/vision/blob/find_blob.cc
@@ -93,54 +93,82 @@
std::vector<BlobBuilder> items;
};
-BlobList FindBlobs(const RangeImage &rimg) {
+BlobList FindBlobs(const RangeImage &input_image) {
BlobDisjointSet blob_set;
- // prev and current ids.
- std::vector<int> pids;
- std::vector<int> cids;
- for (ImageRange rng : rimg.ranges()[0]) {
- pids.push_back(blob_set.AddBlob(0, rng));
+ std::vector<int> previous_ids;
+ std::vector<int> current_ids;
+ for (ImageRange input_range : input_image.ranges()[0]) {
+ previous_ids.push_back(blob_set.AddBlob(0, input_range));
}
- for (int i = 1; i < rimg.size(); i++) {
- int mi = 0;
- int mj = 0;
- const std::vector<ImageRange> &pranges = rimg.ranges()[i - 1];
- const std::vector<ImageRange> &cranges = rimg.ranges()[i];
- cids.clear();
+ for (int input_row = 1; input_row < input_image.size(); input_row++) {
+ // The index of previous_ranges we're currently considering.
+ int previous_location = 0;
+ // The index of current_ranges we're currently considering.
+ int current_location = 0;
+ const std::vector<ImageRange> &previous_ranges =
+ input_image.ranges()[input_row - 1];
+ const std::vector<ImageRange> ¤t_ranges =
+ input_image.ranges()[input_row];
+ current_ids.clear();
- // Merge sort pids and cids.
- while (mi < static_cast<int>(pranges.size()) &&
- mj < static_cast<int>(cranges.size())) {
- ImageRange rprev = pranges[mi];
- ImageRange rcur = cranges[mj];
- if (rcur.last() < rprev.st) {
- if (static_cast<int>(cids.size()) == mj) {
- cids.push_back(blob_set.AddBlob(i, cranges[mj]));
+ while (previous_location < static_cast<int>(previous_ranges.size()) &&
+ current_location < static_cast<int>(current_ranges.size())) {
+ const ImageRange previous_range = previous_ranges[previous_location];
+ const ImageRange current_range = current_ranges[current_location];
+ if (current_range.last() < previous_range.st) {
+ // If current_range ends before previous_range starts, then they don't
+ // overlap, so we might want to add current_range to a separate blob.
+ if (static_cast<int>(current_ids.size()) == current_location) {
+ // We only want to add it if we haven't already added this
+ // current_range to a blob.
+ current_ids.push_back(blob_set.AddBlob(input_row, current_range));
}
- mj++;
- } else if (rprev.last() < rcur.st) {
- mi++;
+ current_location++;
+ } else if (previous_range.last() < current_range.st) {
+ // If previous_range ends before current_range starts, then they don't
+ // overlap. Definitely nothing to merge before current_range in the
+ // current row.
+ previous_location++;
} else {
- if (static_cast<int>(cids.size()) > mj) {
- blob_set.MergeInBlob(cids[mj], pids[mi]);
+ if (static_cast<int>(current_ids.size()) > current_location) {
+ // If we've already added current_range, and they still overlap, then
+ // we should merge the blobs.
+ blob_set.MergeInBlob(current_ids[current_location],
+ previous_ids[previous_location]);
} else {
- cids.push_back(blob_set.AddToBlob(pids[mi], i, cranges[mj]));
+ // If we haven't yet added current_range to a blob, then do that now.
+ current_ids.push_back(
+ blob_set.AddToBlob(previous_ids[previous_location], input_row,
+ current_ranges[current_location]));
}
- if (rcur.last() < rprev.last()) {
- mj++;
+ // Increment the furthest-left-ending range in either row. The
+ // further-right-ending one might merge with the next one in the other
+ // row, so we need to look at it again next iteration.
+ if (current_range.last() < previous_range.last()) {
+ current_location++;
} else {
- mi++;
+ previous_location++;
}
}
}
- while (mj < static_cast<int>(cranges.size())) {
- if (static_cast<int>(cids.size()) == mj) {
- cids.push_back(blob_set.AddBlob(i, cranges[mj]));
+ // Finish processing the current row. This is sometimes necessary if the
+ // previous row was fully processed first.
+ //
+ // Note that we don't care if the previous row didn't get fully iterated
+ // over.
+ while (current_location < static_cast<int>(current_ranges.size())) {
+ if (static_cast<int>(current_ids.size()) == current_location) {
+ // We only want to add it if we haven't already added this range to a
+ // blob.
+ current_ids.push_back(
+ blob_set.AddBlob(input_row, current_ranges[current_location]));
}
- mj++;
+ current_location++;
}
- std::swap(pids, cids);
+
+ // Update previous_ids for the next iteration.
+ std::swap(previous_ids, current_ids);
}
return blob_set.MoveBlobs();
}
diff --git a/aos/vision/blob/find_blob.h b/aos/vision/blob/find_blob.h
index b167c3e..d633354 100644
--- a/aos/vision/blob/find_blob.h
+++ b/aos/vision/blob/find_blob.h
@@ -1,5 +1,5 @@
-#ifndef _AOS_VISION_BLOB_FIND_BLOB_H_
-#define _AOS_VISION_BLOB_FIND_BLOB_H_
+#ifndef AOS_VISION_BLOB_FIND_BLOB_H_
+#define AOS_VISION_BLOB_FIND_BLOB_H_
#include "aos/vision/blob/range_image.h"
@@ -8,9 +8,9 @@
// Uses disjoint sets to group ranges into disjoint RangeImage.
// ranges that overlap are grouped into the same output RangeImage.
-BlobList FindBlobs(const RangeImage &rimg);
+BlobList FindBlobs(const RangeImage &input_image);
} // namespace vision
} // namespace aos
-#endif // _AOS_VISION_BLOB_FIND_BLOB_H_
+#endif // AOS_VISION_BLOB_FIND_BLOB_H_
diff --git a/aos/vision/blob/region_alloc.h b/aos/vision/blob/region_alloc.h
index 8c7bc57..df33fed 100644
--- a/aos/vision/blob/region_alloc.h
+++ b/aos/vision/blob/region_alloc.h
@@ -9,8 +9,6 @@
#include <utility>
#include <vector>
-#include "aos/logging/logging.h"
-
namespace aos {
namespace vision {
@@ -22,12 +20,12 @@
T *cons_obj(Args &&... args) {
uint8_t *ptr = NULL;
if (sizeof(T) + alignof(T) > block_size_) {
- LOG(FATAL, "allocating %d too much\n", (int)sizeof(T));
+ __builtin_trap();
}
while (ptr == NULL) {
if (next_free_ >= memory_.size()) {
if (next_free_ >= 1024) {
- LOG(FATAL, "too much alloc\n");
+ __builtin_trap();
}
memory_.emplace_back(new uint8_t[block_size_]);
} else if ((used_size_ % alignof(T)) != 0) {
diff --git a/aos/vision/blob/threshold.cc b/aos/vision/blob/threshold.cc
index 74809d1..46221b5 100644
--- a/aos/vision/blob/threshold.cc
+++ b/aos/vision/blob/threshold.cc
@@ -4,20 +4,17 @@
namespace aos {
namespace vision {
+namespace {
-// Expands to a unique value for each combination of values for 5 bools.
-#define MASH(v0, v1, v2, v3, v4) \
- ((uint8_t(v0) << 4) | (uint8_t(v1) << 3) | (uint8_t(v2) << 2) | \
- (uint8_t(v3) << 1) | (uint8_t(v4)))
+constexpr int kChunkSize = 8;
+
+} // namespace
// At a high level, the algorithm is the same as the slow thresholding, except
-// it operates in 4-pixel chunks. The handling for each of these chunks is
-// manually flattened (via codegen) into a 32-case switch statement. There are
-// 2^4 cases for each pixel being in or out, along with another set of cases
-// depending on whether the start of the chunk is in a range or not.
+// it operates in kChunkSize-pixel chunks.
RangeImage FastYuyvYThreshold(ImageFormat fmt, const char *data,
uint8_t value) {
- CHECK_EQ(0, fmt.w % 4);
+ CHECK_EQ(0, fmt.w % kChunkSize);
std::vector<std::vector<ImageRange>> result;
result.reserve(fmt.h);
@@ -28,195 +25,23 @@
bool in_range = false;
int current_range_start = -1;
std::vector<ImageRange> current_row_ranges;
- // Iterate through each 4-pixel chunk
- for (int x = 0; x < fmt.w / 4; ++x) {
+ // Iterate through each kChunkSize-pixel chunk
+ for (int x = 0; x < fmt.w / kChunkSize; ++x) {
// The per-channel (YUYV) values in the current chunk.
- uint8_t chunk_channels[8];
- memcpy(&chunk_channels[0], current_row + x * 4 * 2, 8);
- const uint8_t pattern =
- MASH(in_range, chunk_channels[0] > value, chunk_channels[2] > value,
- chunk_channels[4] > value, chunk_channels[6] > value);
- switch (pattern) {
- // clang-format off
-/*
-# Ruby code to generate the below code:
-32.times do |v|
- puts "case MASH(#{[v[4], v[3], v[2], v[1], v[0]].join(", ")}):"
- in_range = v[4]
- current_range_start = "current_range_start"
- 4.times do |i|
- if v[3 - i] != in_range
- if (in_range == 1)
- puts " current_row_ranges.emplace_back(ImageRange(#{current_range_start}, x * 4 + #{i}));"
- else
- current_range_start = "x * 4 + #{i}"
- end
- in_range = v[3 - i]
- end
- end
- if (current_range_start != "current_range_start")
- puts " current_range_start = #{current_range_start};"
- end
- if (in_range != v[4])
- puts " in_range = #{["false", "true"][v[0]]};"
- end
- puts " break;"
-end
-*/
- // clang-format on
- case MASH(0, 0, 0, 0, 0):
- break;
- case MASH(0, 0, 0, 0, 1):
- current_range_start = x * 4 + 3;
- in_range = true;
- break;
- case MASH(0, 0, 0, 1, 0):
- current_row_ranges.emplace_back(ImageRange(x * 4 + 2, x * 4 + 3));
- current_range_start = x * 4 + 2;
- break;
- case MASH(0, 0, 0, 1, 1):
- current_range_start = x * 4 + 2;
- in_range = true;
- break;
- case MASH(0, 0, 1, 0, 0):
- current_row_ranges.emplace_back(ImageRange(x * 4 + 1, x * 4 + 2));
- current_range_start = x * 4 + 1;
- break;
- case MASH(0, 0, 1, 0, 1):
- current_row_ranges.emplace_back(ImageRange(x * 4 + 1, x * 4 + 2));
- current_range_start = x * 4 + 3;
- in_range = true;
- break;
- case MASH(0, 0, 1, 1, 0):
- current_row_ranges.emplace_back(ImageRange(x * 4 + 1, x * 4 + 3));
- current_range_start = x * 4 + 1;
- break;
- case MASH(0, 0, 1, 1, 1):
- current_range_start = x * 4 + 1;
- in_range = true;
- break;
- case MASH(0, 1, 0, 0, 0):
- current_row_ranges.emplace_back(ImageRange(x * 4 + 0, x * 4 + 1));
- current_range_start = x * 4 + 0;
- break;
- case MASH(0, 1, 0, 0, 1):
- current_row_ranges.emplace_back(ImageRange(x * 4 + 0, x * 4 + 1));
- current_range_start = x * 4 + 3;
- in_range = true;
- break;
- case MASH(0, 1, 0, 1, 0):
- current_row_ranges.emplace_back(ImageRange(x * 4 + 0, x * 4 + 1));
- current_row_ranges.emplace_back(ImageRange(x * 4 + 2, x * 4 + 3));
- current_range_start = x * 4 + 2;
- break;
- case MASH(0, 1, 0, 1, 1):
- current_row_ranges.emplace_back(ImageRange(x * 4 + 0, x * 4 + 1));
- current_range_start = x * 4 + 2;
- in_range = true;
- break;
- case MASH(0, 1, 1, 0, 0):
- current_row_ranges.emplace_back(ImageRange(x * 4 + 0, x * 4 + 2));
- current_range_start = x * 4 + 0;
- break;
- case MASH(0, 1, 1, 0, 1):
- current_row_ranges.emplace_back(ImageRange(x * 4 + 0, x * 4 + 2));
- current_range_start = x * 4 + 3;
- in_range = true;
- break;
- case MASH(0, 1, 1, 1, 0):
- current_row_ranges.emplace_back(ImageRange(x * 4 + 0, x * 4 + 3));
- current_range_start = x * 4 + 0;
- break;
- case MASH(0, 1, 1, 1, 1):
- current_range_start = x * 4 + 0;
- in_range = true;
- break;
- case MASH(1, 0, 0, 0, 0):
- current_row_ranges.emplace_back(
- ImageRange(current_range_start, x * 4 + 0));
- in_range = false;
- break;
- case MASH(1, 0, 0, 0, 1):
- current_row_ranges.emplace_back(
- ImageRange(current_range_start, x * 4 + 0));
- current_range_start = x * 4 + 3;
- break;
- case MASH(1, 0, 0, 1, 0):
- current_row_ranges.emplace_back(
- ImageRange(current_range_start, x * 4 + 0));
- current_row_ranges.emplace_back(ImageRange(x * 4 + 2, x * 4 + 3));
- current_range_start = x * 4 + 2;
- in_range = false;
- break;
- case MASH(1, 0, 0, 1, 1):
- current_row_ranges.emplace_back(
- ImageRange(current_range_start, x * 4 + 0));
- current_range_start = x * 4 + 2;
- break;
- case MASH(1, 0, 1, 0, 0):
- current_row_ranges.emplace_back(
- ImageRange(current_range_start, x * 4 + 0));
- current_row_ranges.emplace_back(ImageRange(x * 4 + 1, x * 4 + 2));
- current_range_start = x * 4 + 1;
- in_range = false;
- break;
- case MASH(1, 0, 1, 0, 1):
- current_row_ranges.emplace_back(
- ImageRange(current_range_start, x * 4 + 0));
- current_row_ranges.emplace_back(ImageRange(x * 4 + 1, x * 4 + 2));
- current_range_start = x * 4 + 3;
- break;
- case MASH(1, 0, 1, 1, 0):
- current_row_ranges.emplace_back(
- ImageRange(current_range_start, x * 4 + 0));
- current_row_ranges.emplace_back(ImageRange(x * 4 + 1, x * 4 + 3));
- current_range_start = x * 4 + 1;
- in_range = false;
- break;
- case MASH(1, 0, 1, 1, 1):
- current_row_ranges.emplace_back(
- ImageRange(current_range_start, x * 4 + 0));
- current_range_start = x * 4 + 1;
- break;
- case MASH(1, 1, 0, 0, 0):
- current_row_ranges.emplace_back(
- ImageRange(current_range_start, x * 4 + 1));
- in_range = false;
- break;
- case MASH(1, 1, 0, 0, 1):
- current_row_ranges.emplace_back(
- ImageRange(current_range_start, x * 4 + 1));
- current_range_start = x * 4 + 3;
- break;
- case MASH(1, 1, 0, 1, 0):
- current_row_ranges.emplace_back(
- ImageRange(current_range_start, x * 4 + 1));
- current_row_ranges.emplace_back(ImageRange(x * 4 + 2, x * 4 + 3));
- current_range_start = x * 4 + 2;
- in_range = false;
- break;
- case MASH(1, 1, 0, 1, 1):
- current_row_ranges.emplace_back(
- ImageRange(current_range_start, x * 4 + 1));
- current_range_start = x * 4 + 2;
- break;
- case MASH(1, 1, 1, 0, 0):
- current_row_ranges.emplace_back(
- ImageRange(current_range_start, x * 4 + 2));
- in_range = false;
- break;
- case MASH(1, 1, 1, 0, 1):
- current_row_ranges.emplace_back(
- ImageRange(current_range_start, x * 4 + 2));
- current_range_start = x * 4 + 3;
- break;
- case MASH(1, 1, 1, 1, 0):
- current_row_ranges.emplace_back(
- ImageRange(current_range_start, x * 4 + 3));
- in_range = false;
- break;
- case MASH(1, 1, 1, 1, 1):
- break;
+ uint8_t chunk_channels[2 * kChunkSize];
+ memcpy(&chunk_channels[0], current_row + x * kChunkSize * 2, 2 * kChunkSize);
+ __builtin_prefetch(current_row + (x + 1) * kChunkSize * 2);
+
+ for (int i = 0; i < kChunkSize; ++i) {
+ if ((chunk_channels[i * 2] > value) != in_range) {
+ const int here = x * kChunkSize + i;
+ if (in_range) {
+ current_row_ranges.emplace_back(ImageRange(current_range_start, here));
+ } else {
+ current_range_start = here;
+ }
+ in_range = !in_range;
+ }
}
}
if (in_range) {
@@ -227,7 +52,74 @@
return RangeImage(0, std::move(result));
}
-#undef MASH
+FastYuyvYPooledThresholder::FastYuyvYPooledThresholder() {
+ states_.fill(ThreadState::kWaitingForInputData);
+ for (int i = 0; i < kThreads; ++i) {
+ threads_[i] = std::thread([this, i]() { RunThread(i); });
+ }
+}
+
+FastYuyvYPooledThresholder::~FastYuyvYPooledThresholder() {
+ {
+ std::unique_lock<std::mutex> locker(mutex_);
+ quit_ = true;
+ condition_variable_.notify_all();
+ }
+ for (int i = 0; i < kThreads; ++i) {
+ threads_[i].join();
+ }
+}
+
+RangeImage FastYuyvYPooledThresholder::Threshold(ImageFormat fmt,
+ const char *data,
+ uint8_t value) {
+ input_format_ = fmt;
+ input_data_ = data;
+ input_value_ = value;
+ {
+ std::unique_lock<std::mutex> locker(mutex_);
+ for (int i = 0; i < kThreads; ++i) {
+ states_[i] = ThreadState::kProcessing;
+ }
+ condition_variable_.notify_all();
+ while (!AllThreadsDone()) {
+ condition_variable_.wait(locker);
+ }
+ }
+ std::vector<std::vector<ImageRange>> result;
+ result.reserve(fmt.h);
+ for (int i = 0; i < kThreads; ++i) {
+ result.insert(result.end(), outputs_[i].begin(), outputs_[i].end());
+ }
+ return RangeImage(0, std::move(result));
+}
+
+void FastYuyvYPooledThresholder::RunThread(int i) {
+ while (true) {
+ {
+ std::unique_lock<std::mutex> locker(mutex_);
+ while (states_[i] == ThreadState::kWaitingForInputData) {
+ if (quit_) {
+ return;
+ }
+ condition_variable_.wait(locker);
+ }
+ }
+
+ ImageFormat shard_format = input_format_;
+ CHECK_EQ(shard_format.h % kThreads, 0);
+ shard_format.h /= kThreads;
+
+ outputs_[i] = FastYuyvYThreshold(
+ shard_format, input_data_ + shard_format.w * 2 * shard_format.h * i,
+ input_value_);
+ {
+ std::unique_lock<std::mutex> locker(mutex_);
+ states_[i] = ThreadState::kWaitingForInputData;
+ condition_variable_.notify_all();
+ }
+ }
+}
} // namespace vision
} // namespace aos
diff --git a/aos/vision/blob/threshold.h b/aos/vision/blob/threshold.h
index 9891722..8251b3a 100644
--- a/aos/vision/blob/threshold.h
+++ b/aos/vision/blob/threshold.h
@@ -1,6 +1,10 @@
#ifndef AOS_VISION_BLOB_THRESHOLD_H_
#define AOS_VISION_BLOB_THRESHOLD_H_
+#include <condition_variable>
+#include <mutex>
+#include <thread>
+
#include "aos/vision/blob/range_image.h"
#include "aos/vision/image/image_types.h"
@@ -80,6 +84,58 @@
// This is implemented via some tricky bit shuffling that goes fast.
RangeImage FastYuyvYThreshold(ImageFormat fmt, const char *data, uint8_t value);
+// Manages a pool of threads which do sharded thresholding.
+class FastYuyvYPooledThresholder {
+ public:
+ // The number of threads we'll use.
+ static constexpr int kThreads = 4;
+
+ FastYuyvYPooledThresholder();
+ // Shuts down and joins the threads.
+ ~FastYuyvYPooledThresholder();
+
+ // Actually does a threshold, merges the result, and returns it.
+ RangeImage Threshold(ImageFormat fmt, const char *data, uint8_t value);
+
+ private:
+ enum class ThreadState {
+ // Each thread moves itself into this state once it's done processing the
+ // previous input data.
+ kWaitingForInputData,
+ // The main thread moves all the threads into this state once it has
+ // finished setting up new input data.
+ kProcessing,
+ };
+
+ // The main function for a thread.
+ void RunThread(int index);
+
+ // Returns true if all threads are currently done.
+ bool AllThreadsDone() const {
+ for (ThreadState state : states_) {
+ if (state != ThreadState::kWaitingForInputData) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ std::array<std::thread, kThreads> threads_;
+ // Protects access to the states_ and coordinates with condition_variable_.
+ std::mutex mutex_;
+ // Signals changes to states_ and quit_.
+ std::condition_variable condition_variable_;
+ bool quit_ = false;
+
+ std::array<ThreadState, kThreads> states_;
+
+ // Access to these is protected by coordination via states_.
+ ImageFormat input_format_;
+ const char *input_data_;
+ uint8_t input_value_;
+ std::array<RangeImage, kThreads> outputs_;
+};
+
} // namespace vision
} // namespace aos
diff --git a/aos/vision/debug/BUILD b/aos/vision/debug/BUILD
index c550de7..05d93ad 100644
--- a/aos/vision/debug/BUILD
+++ b/aos/vision/debug/BUILD
@@ -26,8 +26,8 @@
gtk_dependent_cc_library(
name = "debug_framework",
srcs = [
- "blob_log-source.cc",
"aveugle-source.cc",
+ "blob_log-source.cc",
"camera-source.cc",
"debug_framework.cc",
"jpeg_list-source.cc",
@@ -45,10 +45,11 @@
"//aos/vision/events:epoll_events",
"//aos/vision/events:gtk_event",
"//aos/vision/events:tcp_client",
- "//aos/vision/image:image_stream",
"//aos/vision/image:image_dataset",
+ "//aos/vision/image:image_stream",
"//aos/vision/image:image_types",
"//aos/vision/image:jpeg_routines",
+ "@com_github_google_glog//:glog",
"@usr_repo//:gtk+-3.0",
],
alwayslink = 1,
diff --git a/aos/vision/debug/aveugle-source.cc b/aos/vision/debug/aveugle-source.cc
index cbe3d0a..d03be14 100644
--- a/aos/vision/debug/aveugle-source.cc
+++ b/aos/vision/debug/aveugle-source.cc
@@ -46,6 +46,9 @@
++i_;
}
});
+ interface_->InstallSetExposure([this](int abs_exp) {
+ this->SetExposure(abs_exp);
+ });
}
void ProcessImage(DataRef data, aos::monotonic_clock::time_point) override {
prev_data_ = std::string(data);
diff --git a/aos/vision/debug/blob_log-source.cc b/aos/vision/debug/blob_log-source.cc
index 337a764..26706bb 100644
--- a/aos/vision/debug/blob_log-source.cc
+++ b/aos/vision/debug/blob_log-source.cc
@@ -12,6 +12,8 @@
#include "aos/vision/blob/stream_view.h"
#include "aos/vision/debug/overlay.h"
+#include "glog/logging.h"
+
namespace aos {
namespace vision {
@@ -52,7 +54,7 @@
InputFile(const std::string &fname)
: ifs_(fname, std::ifstream::in), len_(GetFileSize(fname)) {
if (len_ <= 0) {
- LOG(FATAL, "File (%s) not found. Size (%d)\n", fname.c_str(), (int)len_);
+ LOG(FATAL) << "File (" << fname << ") not found. Size (" << len_ << ")";
}
// assert(len_ > 0);
tmp_buf_.resize(len_, 0);
diff --git a/aos/vision/debug/debug_framework.cc b/aos/vision/debug/debug_framework.cc
index 1d94217..7b3ad76 100644
--- a/aos/vision/debug/debug_framework.cc
+++ b/aos/vision/debug/debug_framework.cc
@@ -60,6 +60,11 @@
if (GetScreenHeight() < 1024) {
view_.SetScale(1.0);
}
+
+ // Pass along the set exposure so that users can acceess it.
+ filter->InstallSetExposure([this](uint32_t abs_exp) {
+ this->SetExposure(abs_exp);
+ });
}
// This the first stage in the pipeline that takes
diff --git a/aos/vision/debug/debug_framework.h b/aos/vision/debug/debug_framework.h
index a46812f..d8ed4a1 100644
--- a/aos/vision/debug/debug_framework.h
+++ b/aos/vision/debug/debug_framework.h
@@ -39,6 +39,16 @@
virtual std::function<void(uint32_t)> RegisterKeyPress() {
return std::function<void(uint32_t)>();
}
+
+ // The DebugFramework will tells us where to call to get the camera.
+ void InstallSetExposure(std::function<void(int)> set_exp) {
+ set_exposure_ = set_exp;
+ }
+ void SetExposure(int abs_exp) {
+ set_exposure_(abs_exp);
+ }
+ private:
+ std::function<void(int)> set_exposure_;
};
// For ImageSource implementations only. Allows registering key press events
@@ -51,6 +61,12 @@
key_press_events_.emplace_back(std::move(key_press_event));
}
+ // The camera will tell us where to call to set exposure.
+ void InstallSetExposure(std::function<void(int)> set_exp) {
+ set_exposure_ = std::move(set_exp);
+ }
+ void SetExposure(int abs_exp) { set_exposure_(abs_exp); }
+
// The return value bool here for all of these is
// if the frame is "interesting" ie has a target.
virtual bool NewJpeg(DataRef data) = 0;
@@ -76,6 +92,8 @@
private:
std::vector<std::function<void(uint32_t)>> key_press_events_;
+
+ std::function<void(int)> set_exposure_;
};
// Implemented by each source type. Will stream frames to
diff --git a/aos/vision/events/BUILD b/aos/vision/events/BUILD
index c05fc09..b887872 100644
--- a/aos/vision/events/BUILD
+++ b/aos/vision/events/BUILD
@@ -69,6 +69,7 @@
srcs = ["gtk_event.cc"],
deps = [
":epoll_events",
+ "//aos/logging",
"@usr_repo//:gtk+-3.0",
],
)
diff --git a/aos/vision/events/epoll_events.cc b/aos/vision/events/epoll_events.cc
index 0043b78..f6cba76 100644
--- a/aos/vision/events/epoll_events.cc
+++ b/aos/vision/events/epoll_events.cc
@@ -12,6 +12,18 @@
namespace aos {
namespace events {
+void EpollEvent::DirectEvent(uint32_t events) {
+ if ((events & ~(EPOLLIN | EPOLLPRI | EPOLLERR)) != 0) {
+ LOG(FATAL, "unexpected epoll events set in %x on %d\n", events, fd());
+ }
+ ReadEvent();
+}
+
+void EpollEvent::SetEvents(uint32_t events) {
+ events_ |= events;
+ CHECK(!loop_);
+}
+
EpollLoop::EpollLoop() : epoll_fd_(PCHECK(epoll_create1(0))) {}
void EpollLoop::Add(EpollEvent *event) {
diff --git a/aos/vision/events/epoll_events.h b/aos/vision/events/epoll_events.h
index 19851ed..c7aa1c6 100644
--- a/aos/vision/events/epoll_events.h
+++ b/aos/vision/events/epoll_events.h
@@ -75,20 +75,11 @@
virtual void ReadEvent() = 0;
// Handle Events directly from epoll.
- virtual void DirectEvent(uint32_t events) {
- if ((events & ~(EPOLLIN | EPOLLPRI | EPOLLERR)) != 0) {
- LOG(FATAL, "unexpected epoll events set in %x on %d\n",
- events, fd());
- }
- ReadEvent();
- }
+ virtual void DirectEvent(uint32_t events);
EpollLoop *loop() { return loop_; }
- void SetEvents(uint32_t events) {
- events_ |= events;
- CHECK(!loop_);
- }
+ void SetEvents(uint32_t events);
uint32_t events() const { return events_; }
diff --git a/aos/vision/events/gtk_event.cc b/aos/vision/events/gtk_event.cc
index 0c518e0..4ff9fde 100644
--- a/aos/vision/events/gtk_event.cc
+++ b/aos/vision/events/gtk_event.cc
@@ -6,6 +6,7 @@
#include <thread>
#include "aos/vision/events/epoll_events.h"
+#include "aos/logging/logging.h"
namespace aos {
namespace events {
diff --git a/aos/vision/image/BUILD b/aos/vision/image/BUILD
index be702d7..21dbbb8 100644
--- a/aos/vision/image/BUILD
+++ b/aos/vision/image/BUILD
@@ -5,9 +5,6 @@
cc_library(
name = "image_types",
hdrs = ["image_types.h"],
- deps = [
- "//aos/logging",
- ],
)
cc_proto_library(
@@ -52,8 +49,10 @@
cc_library(
name = "image_stream",
+ srcs = ["image_stream.cc"],
hdrs = ["image_stream.h"],
deps = [
+ "//aos/logging",
"//aos/vision/events:epoll_events",
"//aos/vision/image:reader",
],
diff --git a/aos/vision/image/image_stream.cc b/aos/vision/image/image_stream.cc
new file mode 100644
index 0000000..1dba674
--- /dev/null
+++ b/aos/vision/image/image_stream.cc
@@ -0,0 +1,18 @@
+#include "aos/vision/image/image_stream.h"
+
+#include "aos/logging/logging.h"
+
+namespace aos {
+namespace vision {
+
+void ImageStreamEvent::ProcessHelper(
+ DataRef data, aos::monotonic_clock::time_point timestamp) {
+ if (data.size() < 300) {
+ LOG(INFO, "got bad img of size(%d)\n", static_cast<int>(data.size()));
+ return;
+ }
+ ProcessImage(data, timestamp);
+}
+
+} // namespace vision
+} // namespace aos
diff --git a/aos/vision/image/image_stream.h b/aos/vision/image/image_stream.h
index 308d3ec..5d88d32 100644
--- a/aos/vision/image/image_stream.h
+++ b/aos/vision/image/image_stream.h
@@ -1,5 +1,5 @@
-#ifndef _AOS_VISION_IMAGE_IMAGE_STREAM_H_
-#define _AOS_VISION_IMAGE_IMAGE_STREAM_H_
+#ifndef AOS_VISION_IMAGE_IMAGE_STREAM_H_
+#define AOS_VISION_IMAGE_IMAGE_STREAM_H_
#include "aos/vision/events/epoll_events.h"
#include "aos/vision/image/camera_params.pb.h"
@@ -32,23 +32,20 @@
aos::vision::CameraParams params)
: ImageStreamEvent(GetCamera(fname, this, params)) {}
- void ProcessHelper(DataRef data, aos::monotonic_clock::time_point timestamp) {
- if (data.size() < 300) {
- LOG(INFO, "got bad img of size(%d)\n", static_cast<int>(data.size()));
- return;
- }
- ProcessImage(data, timestamp);
- }
virtual void ProcessImage(DataRef data,
aos::monotonic_clock::time_point timestamp) = 0;
void ReadEvent() override { reader_->HandleFrame(); }
+ bool SetExposure(int abs_exp) { return reader_->SetExposure(abs_exp); }
+
private:
+ void ProcessHelper(DataRef data, aos::monotonic_clock::time_point timestamp);
+
std::unique_ptr<::camera::Reader> reader_;
};
} // namespace vision
} // namespace aos
-#endif // _AOS_VISION_DEBUG_IMAGE_STREAM_H_
+#endif // AOS_VISION_IMAGE_IMAGE_STREAM_H_
diff --git a/aos/vision/image/image_types.h b/aos/vision/image/image_types.h
index c50400a..a620d8a 100644
--- a/aos/vision/image/image_types.h
+++ b/aos/vision/image/image_types.h
@@ -7,7 +7,6 @@
#include <sstream>
#include <experimental/string_view>
-#include "aos/logging/logging.h"
namespace aos {
namespace vision {
@@ -65,7 +64,7 @@
ImageType &get_px(int x, int y) const {
#ifndef NDEBUG
if (x < 0 || x >= fmt_.w || y < 0 || y >= fmt_.h) {
- LOG(FATAL, "%d, %d out of range [%dx %d]\n", x, y, fmt_.w, fmt_.h);
+ __builtin_trap();
}
#endif // NBOUNDSCHECK
return data_[(x + y * fmt_.w)];
diff --git a/aos/vision/image/reader.cc b/aos/vision/image/reader.cc
index aaf9a10..991339b 100644
--- a/aos/vision/image/reader.cc
+++ b/aos/vision/image/reader.cc
@@ -56,6 +56,8 @@
Init();
InitMMap();
+
+ SetExposure(params.exposure());
LOG(INFO, "Bat Vision Successfully Initialized.\n");
}
@@ -85,17 +87,6 @@
}
--queued_;
- if (tick_id_ % 10 == 0) {
- if (!SetCameraControl(V4L2_CID_EXPOSURE_AUTO, "V4L2_CID_EXPOSURE_AUTO",
- V4L2_EXPOSURE_MANUAL)) {
- LOG(FATAL, "Failed to set exposure\n");
- }
-
- if (!SetCameraControl(V4L2_CID_EXPOSURE_ABSOLUTE,
- "V4L2_CID_EXPOSURE_ABSOLUTE", params_.exposure())) {
- LOG(FATAL, "Failed to set exposure\n");
- }
- }
++tick_id_;
// Get a timestamp now as proxy for when the image was taken
// TODO(ben): the image should come with a timestamp, parker
@@ -171,8 +162,6 @@
struct v4l2_control setArg = {id, value};
r = xioctl(fd_, VIDIOC_S_CTRL, &setArg);
if (r == 0) {
- LOG(DEBUG, "Set camera control %s from %d to %d\n", name, getArg.value,
- value);
return true;
}
@@ -181,6 +170,11 @@
return false;
}
+bool Reader::SetExposure(int abs_exp) {
+ return SetCameraControl(V4L2_CID_EXPOSURE_ABSOLUTE,
+ "V4L2_CID_EXPOSURE_ABSOLUTE", abs_exp);
+}
+
void Reader::Init() {
v4l2_capability cap;
if (xioctl(fd_, VIDIOC_QUERYCAP, &cap) == -1) {
diff --git a/aos/vision/image/reader.h b/aos/vision/image/reader.h
index adb3a3c..4283224 100644
--- a/aos/vision/image/reader.h
+++ b/aos/vision/image/reader.h
@@ -32,10 +32,12 @@
}
int fd() { return fd_; }
+ bool SetCameraControl(uint32_t id, const char *name, int value);
+ bool SetExposure(int abs_exp);
+
private:
void QueueBuffer(v4l2_buffer *buf);
void InitMMap();
- bool SetCameraControl(uint32_t id, const char *name, int value);
void Init();
void Start();
void MMapBuffers();
diff --git a/aos/vision/math/BUILD b/aos/vision/math/BUILD
index 3233bc9..0fbdf7a 100644
--- a/aos/vision/math/BUILD
+++ b/aos/vision/math/BUILD
@@ -13,6 +13,7 @@
],
deps = [
"//third_party/eigen",
+ "@com_google_ceres_solver//:ceres",
],
)
diff --git a/aos/vision/tools/jpeg_vision_test.cc b/aos/vision/tools/jpeg_vision_test.cc
index 806fd80..5267041 100644
--- a/aos/vision/tools/jpeg_vision_test.cc
+++ b/aos/vision/tools/jpeg_vision_test.cc
@@ -74,7 +74,7 @@
prev_data_ = data.to_string();
// Threshold the image with the given lambda.
- RangeImage rimg = ThresholdImageWithFunction(img_ptr, [](PixelRef &px) {
+ RangeImage rimg = ThresholdImageWithFunction(img_ptr, [](PixelRef px) {
if (px.g > 88) {
uint8_t min = std::min(px.b, px.r);
uint8_t max = std::max(px.b, px.r);
diff --git a/frc971/autonomous/base_autonomous_actor.cc b/frc971/autonomous/base_autonomous_actor.cc
index ac1b3b7..a71ee7d 100644
--- a/frc971/autonomous/base_autonomous_actor.cc
+++ b/frc971/autonomous/base_autonomous_actor.cc
@@ -28,6 +28,7 @@
void BaseAutonomousActor::ResetDrivetrain() {
LOG(INFO, "resetting the drivetrain\n");
max_drivetrain_voltage_ = 12.0;
+ goal_spline_handle_ = 0;
drivetrain_queue.goal.MakeWithBuilder()
.controller_type(0)
.highgear(true)
@@ -66,7 +67,7 @@
drivetrain_message->linear = linear;
drivetrain_message->angular = angular;
- LOG_STRUCT(DEBUG, "drivetrain_goal", *drivetrain_message);
+ LOG_STRUCT(DEBUG, "dtg", *drivetrain_message);
drivetrain_message.Send();
}
@@ -349,6 +350,141 @@
}
}
+bool BaseAutonomousActor::SplineHandle::SplineDistanceRemaining(
+ double distance) {
+ drivetrain_queue.status.FetchLatest();
+ if (drivetrain_queue.status.get()) {
+ return drivetrain_queue.status->trajectory_logging.is_executing &&
+ drivetrain_queue.status->trajectory_logging.distance_remaining <
+ distance;
+ }
+ return false;
+}
+bool BaseAutonomousActor::SplineHandle::WaitForSplineDistanceRemaining(
+ double distance) {
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
+ while (true) {
+ if (base_autonomous_actor_->ShouldCancel()) {
+ return false;
+ }
+ phased_loop.SleepUntilNext();
+ if (SplineDistanceRemaining(distance)) {
+ return true;
+ }
+ }
+}
+
+void BaseAutonomousActor::LineFollowAtVelocity(double velocity) {
+ auto drivetrain_message = drivetrain_queue.goal.MakeMessage();
+ drivetrain_message->controller_type = 3;
+ // TODO(james): Currently the 4.0 is copied from the
+ // line_follow_drivetrain.cc, but it is somewhat year-specific, so we should
+ // factor it out in some way.
+ drivetrain_message->throttle = velocity / 4.0;
+ drivetrain_message.Send();
+}
+
+BaseAutonomousActor::SplineHandle BaseAutonomousActor::PlanSpline(
+ const ::frc971::MultiSpline &spline, SplineDirection direction) {
+ LOG(INFO, "Planning spline\n");
+
+ int32_t spline_handle = (++spline_handle_) | ((getpid() & 0xFFFF) << 15);
+
+ drivetrain_queue.goal.FetchLatest();
+
+ auto drivetrain_message = drivetrain_queue.goal.MakeMessage();
+ drivetrain_message->controller_type = 2;
+
+ drivetrain_message->spline = spline;
+ drivetrain_message->spline.spline_idx = spline_handle;
+ drivetrain_message->spline_handle = goal_spline_handle_;
+ drivetrain_message->spline.drive_spline_backwards =
+ direction == SplineDirection::kBackward;
+
+ LOG_STRUCT(DEBUG, "dtg", *drivetrain_message);
+
+ drivetrain_message.Send();
+
+ return BaseAutonomousActor::SplineHandle(spline_handle, this);
+}
+
+bool BaseAutonomousActor::SplineHandle::IsPlanned() {
+ drivetrain_queue.status.FetchLatest();
+ LOG_STRUCT(INFO, "dts", *drivetrain_queue.status.get());
+ if (drivetrain_queue.status.get() &&
+ ((drivetrain_queue.status->trajectory_logging.planning_spline_idx ==
+ spline_handle_ &&
+ drivetrain_queue.status->trajectory_logging.planning_state == 3) ||
+ drivetrain_queue.status->trajectory_logging.current_spline_idx ==
+ spline_handle_)) {
+ return true;
+ }
+ return false;
+}
+
+bool BaseAutonomousActor::SplineHandle::WaitForPlan() {
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
+ while (true) {
+ if (base_autonomous_actor_->ShouldCancel()) {
+ return false;
+ }
+ phased_loop.SleepUntilNext();
+ if (IsPlanned()) {
+ return true;
+ }
+ }
+}
+
+void BaseAutonomousActor::SplineHandle::Start() {
+ auto drivetrain_message = drivetrain_queue.goal.MakeMessage();
+ drivetrain_message->controller_type = 2;
+
+ LOG(INFO, "Starting spline\n");
+
+ drivetrain_message->spline_handle = spline_handle_;
+ base_autonomous_actor_->goal_spline_handle_ = spline_handle_;
+
+ LOG_STRUCT(DEBUG, "dtg", *drivetrain_message);
+
+ drivetrain_message.Send();
+}
+
+bool BaseAutonomousActor::SplineHandle::IsDone() {
+ drivetrain_queue.status.FetchLatest();
+ LOG_STRUCT(INFO, "dts", *drivetrain_queue.status.get());
+
+ // We check that the spline we are waiting on is neither currently planning
+ // nor executing (we check is_executed because it is possible to receive
+ // status messages with is_executing false before the execution has started).
+ // We check for planning so that the user can go straight from starting the
+ // planner to executing without a WaitForPlan in between.
+ if (drivetrain_queue.status.get() &&
+ ((!drivetrain_queue.status->trajectory_logging.is_executed &&
+ drivetrain_queue.status->trajectory_logging.current_spline_idx ==
+ spline_handle_) ||
+ drivetrain_queue.status->trajectory_logging.planning_spline_idx ==
+ spline_handle_)) {
+ return false;
+ }
+ return true;
+}
+
+bool BaseAutonomousActor::SplineHandle::WaitForDone() {
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
+ while (true) {
+ if (base_autonomous_actor_->ShouldCancel()) {
+ return false;
+ }
+ phased_loop.SleepUntilNext();
+ if (IsDone()) {
+ return true;
+ }
+ }
+}
+
::std::unique_ptr<AutonomousAction> MakeAutonomousAction(
const AutonomousActionParams ¶ms) {
return ::std::unique_ptr<AutonomousAction>(
diff --git a/frc971/autonomous/base_autonomous_actor.h b/frc971/autonomous/base_autonomous_actor.h
index dd53a7d..e060a2c 100644
--- a/frc971/autonomous/base_autonomous_actor.h
+++ b/frc971/autonomous/base_autonomous_actor.h
@@ -20,6 +20,42 @@
const control_loops::drivetrain::DrivetrainConfig<double> &dt_config);
protected:
+ class SplineHandle {
+ public:
+ bool IsPlanned();
+ bool WaitForPlan();
+ void Start();
+
+ bool IsDone();
+ bool WaitForDone();
+
+ // Whether there is less than a certain distance, in meters, remaining in
+ // the current spline.
+ bool SplineDistanceRemaining(double distance);
+ bool WaitForSplineDistanceRemaining(double distance);
+
+ private:
+ friend BaseAutonomousActor;
+ SplineHandle(int32_t spline_handle,
+ BaseAutonomousActor *base_autonomous_actor)
+ : spline_handle_(spline_handle),
+ base_autonomous_actor_(base_autonomous_actor) {}
+
+ int32_t spline_handle_;
+ BaseAutonomousActor *base_autonomous_actor_;
+ };
+
+ // Represents the direction that we will drive along a spline.
+ enum class SplineDirection {
+ kForward,
+ kBackward,
+ };
+
+ // Starts planning the spline, and returns a handle to be used to manipulate
+ // it.
+ SplineHandle PlanSpline(const ::frc971::MultiSpline &spline,
+ SplineDirection direction);
+
void ResetDrivetrain();
void InitializeEncoders();
void StartDrive(double distance, double angle, ProfileParameters linear,
@@ -34,6 +70,8 @@
// Returns true if the drive has finished.
bool IsDriveDone();
+ void LineFollowAtVelocity(double velocity);
+
// Waits until the robot is pitched up above the specified angle, or the move
// finishes. Returns true on success, and false if it cancels.
bool WaitForAboveAngle(double angle);
@@ -67,7 +105,14 @@
}
private:
+ friend class SplineHandle;
+
double max_drivetrain_voltage_ = 12.0;
+
+ // Unique counter so we get unique spline handles.
+ int spline_handle_ = 0;
+ // Last goal spline handle;
+ int32_t goal_spline_handle_ = 0;
};
using AutonomousAction =
diff --git a/frc971/control_loops/control_loops.q b/frc971/control_loops/control_loops.q
index a8e6b8c..2359bcd 100644
--- a/frc971/control_loops/control_loops.q
+++ b/frc971/control_loops/control_loops.q
@@ -216,5 +216,8 @@
float[36] spline_x;
float[36] spline_y;
+ // Whether to follow the spline driving forwards or backwards.
+ bool drive_spline_backwards;
+
Constraint[6] constraints;
};
diff --git a/frc971/control_loops/drivetrain/BUILD b/frc971/control_loops/drivetrain/BUILD
index d3ed728..a1b96be 100644
--- a/frc971/control_loops/drivetrain/BUILD
+++ b/frc971/control_loops/drivetrain/BUILD
@@ -106,6 +106,7 @@
":spline",
":trajectory",
"//aos:init",
+ "//aos/util:math",
],
)
@@ -499,7 +500,7 @@
"//aos/network:team_number",
"//third_party/eigen",
"//third_party/matplotlib-cpp",
- "//y2016/control_loops/drivetrain:drivetrain_base",
+ "//y2019/control_loops/drivetrain:drivetrain_base",
"@com_github_gflags_gflags//:gflags",
],
)
diff --git a/frc971/control_loops/drivetrain/drivetrain.cc b/frc971/control_loops/drivetrain/drivetrain.cc
index 6a2ea76..4e13a40 100644
--- a/frc971/control_loops/drivetrain/drivetrain.cc
+++ b/frc971/control_loops/drivetrain/drivetrain.cc
@@ -243,9 +243,11 @@
// simulation.
if (localizer_control_fetcher_.Fetch()) {
LOG_STRUCT(DEBUG, "localizer_control", *localizer_control_fetcher_);
- localizer_->ResetPosition(monotonic_now, localizer_control_fetcher_->x,
- localizer_control_fetcher_->y,
- localizer_control_fetcher_->theta);
+ localizer_->ResetPosition(
+ monotonic_now, localizer_control_fetcher_->x,
+ localizer_control_fetcher_->y, localizer_control_fetcher_->theta,
+ localizer_control_fetcher_->theta_uncertainty,
+ !localizer_control_fetcher_->keep_current_theta);
}
localizer_->Update({last_last_left_voltage_, last_last_right_voltage_},
monotonic_now, position->left_encoder,
@@ -329,7 +331,7 @@
status->x = localizer_->x();
status->y = localizer_->y();
- status->theta = localizer_->theta();
+ status->theta = ::aos::math::NormalizeAngle(localizer_->theta());
status->ground_angle = down_estimator_.X_hat(0) + dt_config_.down_offset;
diff --git a/frc971/control_loops/drivetrain/drivetrain.q b/frc971/control_loops/drivetrain/drivetrain.q
index 7f778f7..c6af732 100644
--- a/frc971/control_loops/drivetrain/drivetrain.q
+++ b/frc971/control_loops/drivetrain/drivetrain.q
@@ -45,9 +45,17 @@
// State of the spline execution.
bool is_executing;
+ // Whether we have finished the spline specified by current_spline_idx.
+ bool is_executed;
- int32_t current_spline_handle;
+ // The handle of the goal spline. 0 means stop requested.
+ int32_t goal_spline_handle;
+ // Handle of the executing spline. -1 means none requested. If there was no
+ // spline executing when a spline finished optimizing, it will become the
+ // current spline even if we aren't ready to start yet.
int32_t current_spline_idx;
+ // Handle of the spline that is being optimized and staged.
+ int32_t planning_spline_idx;
// Expected position and velocity on the spline
float x;
@@ -55,6 +63,7 @@
float theta;
float left_velocity;
float right_velocity;
+ float distance_remaining;
};
// For logging state of the line follower.
diff --git a/frc971/control_loops/drivetrain/drivetrain_lib_test.cc b/frc971/control_loops/drivetrain/drivetrain_lib_test.cc
index 839f1b8..81506f2 100644
--- a/frc971/control_loops/drivetrain/drivetrain_lib_test.cc
+++ b/frc971/control_loops/drivetrain/drivetrain_lib_test.cc
@@ -106,13 +106,20 @@
drivetrain_motor_plant_.GetRightPosition(), 1e-3);
}
+ void VerifyNearPosition(double x, double y) {
+ my_drivetrain_queue_.status.FetchLatest();
+ auto actual = drivetrain_motor_plant_.GetPosition();
+ EXPECT_NEAR(actual(0), x, 1e-2);
+ EXPECT_NEAR(actual(1), y, 1e-2);
+ }
+
void VerifyNearSplineGoal() {
my_drivetrain_queue_.status.FetchLatest();
double expected_x = my_drivetrain_queue_.status->trajectory_logging.x;
double expected_y = my_drivetrain_queue_.status->trajectory_logging.y;
auto actual = drivetrain_motor_plant_.GetPosition();
- EXPECT_NEAR(actual(0), expected_x, 3e-3);
- EXPECT_NEAR(actual(1), expected_y, 3e-3);
+ EXPECT_NEAR(actual(0), expected_x, 2e-2);
+ EXPECT_NEAR(actual(1), expected_y, 2e-2);
}
void WaitForTrajectoryPlan() {
@@ -129,7 +136,7 @@
do {
RunIteration();
my_drivetrain_queue_.status.FetchLatest();
- } while (my_drivetrain_queue_.status->trajectory_logging.is_executing);
+ } while (!my_drivetrain_queue_.status->trajectory_logging.is_executed);
}
virtual ~DrivetrainTest() { ::frc971::sensors::gyro_reading.Clear(); }
@@ -428,6 +435,48 @@
VerifyNearSplineGoal();
}
+// Tests that we can drive a spline backwards.
+TEST_F(DrivetrainTest, SplineSimpleBackwards) {
+ ::aos::ScopedMessagePtr<::frc971::control_loops::DrivetrainQueue::Goal> goal =
+ my_drivetrain_queue_.goal.MakeMessage();
+ goal->controller_type = 2;
+ goal->spline.spline_idx = 1;
+ goal->spline.spline_count = 1;
+ goal->spline.drive_spline_backwards = true;
+ goal->spline.spline_x = {{0.0, -0.25, -0.5, -0.5, -0.75, -1.0}};
+ goal->spline.spline_y = {{0.0, 0.0, -0.25 ,-0.75, -1.0, -1.0}};
+ goal.Send();
+ RunIteration();
+
+ ::aos::ScopedMessagePtr<::frc971::control_loops::DrivetrainQueue::Goal>
+ start_goal = my_drivetrain_queue_.goal.MakeMessage();
+ start_goal->controller_type = 2;
+ start_goal->spline_handle = 1;
+ start_goal.Send();
+ WaitForTrajectoryPlan();
+
+ // Check that we are right on the spline at the start (otherwise the feedback
+ // will tend to correct for going the wrong direction).
+ for (int ii = 0; ii < 10; ++ii) {
+ RunForTime(chrono::milliseconds(100));
+ VerifyNearSplineGoal();
+ }
+
+ WaitForTrajectoryExecution();
+
+ VerifyNearSplineGoal();
+ // Check that we are pointed the right direction:
+ my_drivetrain_queue_.status.FetchLatest();
+ auto actual = drivetrain_motor_plant_.state();
+ const double expected_theta =
+ my_drivetrain_queue_.status->trajectory_logging.theta;
+ // As a sanity check, compare both against absolute angle and the spline's
+ // goal angle.
+ EXPECT_NEAR(0.0, ::aos::math::DiffAngle(actual(2), 0.0), 2e-2);
+ EXPECT_NEAR(0.0, ::aos::math::DiffAngle(actual(2), expected_theta),
+ 2e-2);
+}
+
// Tests that simple spline with a single goal message.
TEST_F(DrivetrainTest, SplineSingleGoal) {
::aos::ScopedMessagePtr<::frc971::control_loops::DrivetrainQueue::Goal> goal =
@@ -521,8 +570,8 @@
goal->controller_type = 2;
goal->spline.spline_idx = 1;
goal->spline.spline_count = 1;
- goal->spline.spline_x = {{0.5, 0.25, 0.5, 0.5, 0.75, 1.0}};
- goal->spline.spline_y = {{0.0, 0.0, 0.25 ,0.75, 1.0, 1.0}};
+ goal->spline.spline_x = {{0.2, 0.25, 0.5, 0.5, 0.75, 1.0}};
+ goal->spline.spline_y = {{0.2, 0.0, 0.25 ,0.75, 1.0, 1.0}};
goal.Send();
RunIteration();
@@ -666,6 +715,46 @@
VerifyNearSplineGoal();
}
+// Tests that we can run a second spline after having planned but never executed
+// the first spline.
+TEST_F(DrivetrainTest, CancelSplineBeforeExecuting) {
+ ::aos::ScopedMessagePtr<::frc971::control_loops::DrivetrainQueue::Goal> goal =
+ my_drivetrain_queue_.goal.MakeMessage();
+ goal->controller_type = 2;
+ goal->spline.spline_idx = 1;
+ goal->spline.spline_count = 1;
+ goal->spline.spline_x = {{0.0, 0.25, 0.5, 0.5, 0.75, 1.0}};
+ goal->spline.spline_y = {{0.0, 0.0, 0.25 ,0.75, 1.0, 1.0}};
+ // Don't start running the splane.
+ goal->spline_handle = 0;
+ goal.Send();
+ WaitForTrajectoryPlan();
+
+ RunForTime(chrono::milliseconds(1000));
+
+ // Plan another spline, but don't start it yet:
+ ::aos::ScopedMessagePtr<::frc971::control_loops::DrivetrainQueue::Goal>
+ second_spline_goal = my_drivetrain_queue_.goal.MakeMessage();
+ second_spline_goal->controller_type = 2;
+ second_spline_goal->spline.spline_idx = 2;
+ second_spline_goal->spline.spline_count = 1;
+ second_spline_goal->spline.spline_x = {{0.0, 0.75, 1.25, 1.5, 1.25, 1.0}};
+ second_spline_goal->spline.spline_y = {{0.0, 0.75, 1.25, 1.5, 1.75, 2.0}};
+ second_spline_goal->spline_handle = 0;
+ second_spline_goal.Send();
+ WaitForTrajectoryPlan();
+
+ ::aos::ScopedMessagePtr<::frc971::control_loops::DrivetrainQueue::Goal>
+ execute_goal = my_drivetrain_queue_.goal.MakeMessage();
+ execute_goal->controller_type = 2;
+ execute_goal->spline_handle = 2;
+ execute_goal.Send();
+
+ WaitForTrajectoryExecution();
+ VerifyNearSplineGoal();
+ VerifyNearPosition(1.0, 2.0);
+}
+
// Tests that splines can excecute and plan at the same time.
TEST_F(DrivetrainTest, ParallelSplines) {
::aos::ScopedMessagePtr<::frc971::control_loops::DrivetrainQueue::Goal> goal =
@@ -720,6 +809,29 @@
VerifyNearSplineGoal();
}
+//Tests that a trajectory can be executed after it is planned.
+TEST_F(DrivetrainTest, SplineExecuteAfterPlan) {
+ ::aos::ScopedMessagePtr<::frc971::control_loops::DrivetrainQueue::Goal> goal =
+ my_drivetrain_queue_.goal.MakeMessage();
+ goal->controller_type = 2;
+ goal->spline.spline_idx = 1;
+ goal->spline.spline_count = 1;
+ goal->spline.spline_x = {{0.0, 0.25, 0.5, 0.5, 0.75, 1.0}};
+ goal->spline.spline_y = {{0.0, 0.0, 0.25, 0.75, 1.0, 1.0}};
+ goal.Send();
+ WaitForTrajectoryPlan();
+ RunForTime(chrono::milliseconds(2000));
+
+ ::aos::ScopedMessagePtr<::frc971::control_loops::DrivetrainQueue::Goal>
+ start_goal = my_drivetrain_queue_.goal.MakeMessage();
+ start_goal->controller_type = 2;
+ start_goal->spline_handle = 1;
+ start_goal.Send();
+ RunForTime(chrono::milliseconds(2000));
+
+ VerifyNearPosition(1.0, 1.0);
+}
+
// The LineFollowDrivetrain logic is tested in line_follow_drivetrain_test. This
// tests that the integration with drivetrain_lib worked properly.
TEST_F(DrivetrainTest, BasicLineFollow) {
diff --git a/frc971/control_loops/drivetrain/hybrid_ekf.h b/frc971/control_loops/drivetrain/hybrid_ekf.h
index 42dc67a..ae92069 100644
--- a/frc971/control_loops/drivetrain/hybrid_ekf.h
+++ b/frc971/control_loops/drivetrain/hybrid_ekf.h
@@ -459,7 +459,7 @@
// since the wheels aren't likely to slip much stopped.
Q_continuous_(kX, kX) = 0.002;
Q_continuous_(kY, kY) = 0.002;
- Q_continuous_(kTheta, kTheta) = 0.0002;
+ Q_continuous_(kTheta, kTheta) = 0.0001;
Q_continuous_(kLeftEncoder, kLeftEncoder) = ::std::pow(0.15, 2.0);
Q_continuous_(kRightEncoder, kRightEncoder) = ::std::pow(0.15, 2.0);
Q_continuous_(kLeftVelocity, kLeftVelocity) = ::std::pow(0.5, 2.0);
@@ -484,7 +484,7 @@
dt_config_.make_kf_drivetrain_loop().observer().coefficients().R;
// TODO(james): The multipliers here are hand-waving things that I put in when
// tuning things. I haven't yet tried messing with these values again.
- encoder_noise_ = 0.05 * R_kf_drivetrain(0, 0);
+ encoder_noise_ = 0.5 * R_kf_drivetrain(0, 0);
gyro_noise_ = 0.1 * R_kf_drivetrain(2, 2);
}
diff --git a/frc971/control_loops/drivetrain/localizer.h b/frc971/control_loops/drivetrain/localizer.h
index 9866803..23a978c 100644
--- a/frc971/control_loops/drivetrain/localizer.h
+++ b/frc971/control_loops/drivetrain/localizer.h
@@ -50,7 +50,8 @@
double gyro_rate, double longitudinal_accelerometer) = 0;
// Reset the absolute position of the estimator.
virtual void ResetPosition(::aos::monotonic_clock::time_point t, double x,
- double y, double theta) = 0;
+ double y, double theta, double theta_uncertainty,
+ bool reset_theta) = 0;
// There are several subtly different norms floating around for state
// matrices. In order to avoid that mess, we jus tprovide direct accessors for
// the values that most people care about.
@@ -109,7 +110,8 @@
}
void ResetPosition(::aos::monotonic_clock::time_point t, double x, double y,
- double theta) override {
+ double theta, double /*theta_override*/,
+ bool /*reset_theta*/) override {
const double left_encoder = ekf_.X_hat(StateIdx::kLeftEncoder);
const double right_encoder = ekf_.X_hat(StateIdx::kRightEncoder);
ekf_.ResetInitialState(t, (Ekf::State() << x, y, theta, left_encoder, 0,
diff --git a/frc971/control_loops/drivetrain/localizer.q b/frc971/control_loops/drivetrain/localizer.q
index 1ae0adc..b1169a9 100644
--- a/frc971/control_loops/drivetrain/localizer.q
+++ b/frc971/control_loops/drivetrain/localizer.q
@@ -6,6 +6,8 @@
float x; // X position, meters
float y; // Y position, meters
float theta; // heading, radians
+ double theta_uncertainty; // Uncertainty in theta.
+ bool keep_current_theta; // Whether to keep the current theta value.
};
queue LocalizerControl localizer_control;
diff --git a/frc971/control_loops/drivetrain/splinedrivetrain.cc b/frc971/control_loops/drivetrain/splinedrivetrain.cc
index 2621007..1f7e2b0 100644
--- a/frc971/control_loops/drivetrain/splinedrivetrain.cc
+++ b/frc971/control_loops/drivetrain/splinedrivetrain.cc
@@ -3,6 +3,7 @@
#include "Eigen/Dense"
#include "aos/init.h"
+#include "aos/util/math.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
#include "frc971/control_loops/drivetrain/drivetrain_config.h"
@@ -41,6 +42,7 @@
plan_state_ = PlanState::kBuildingTrajectory;
const ::frc971::MultiSpline &multispline = goal_.spline;
future_spline_idx_ = multispline.spline_idx;
+ planning_spline_idx_ = future_spline_idx_;
auto x = multispline.spline_x;
auto y = multispline.spline_y;
::std::vector<Spline> splines = ::std::vector<Spline>();
@@ -54,6 +56,8 @@
splines.emplace_back(Spline(points));
}
+ future_drive_spline_backwards_ = goal_.spline.drive_spline_backwards;
+
future_distance_spline_ = ::std::unique_ptr<DistanceSpline>(
new DistanceSpline(::std::move(splines)));
@@ -91,8 +95,10 @@
void SplineDrivetrain::SetGoal(
const ::frc971::control_loops::DrivetrainQueue::Goal &goal) {
current_spline_handle_ = goal.spline_handle;
- // If told to stop, set the executing spline to an invalid index.
- if (current_spline_handle_ == 0) {
+ // If told to stop, set the executing spline to an invalid index and clear out
+ // its plan:
+ if (current_spline_handle_ == 0 &&
+ current_spline_idx_ != goal.spline.spline_idx) {
current_spline_idx_ = -1;
}
@@ -101,7 +107,14 @@
if (goal.spline.spline_idx && future_spline_idx_ != goal.spline.spline_idx) {
goal_ = goal;
new_goal_.Broadcast();
+ if (current_spline_handle_ != current_spline_idx_) {
+ // If we aren't going to actively execute the current spline, evict it's
+ // plan.
+ past_trajectory_ = std::move(current_trajectory_);
+ past_distance_spline_ = std::move(current_distance_spline_);
+ }
}
+ // If you never started executing the previous spline, you're screwed.
if (future_trajectory_ &&
(!current_trajectory_ ||
current_trajectory_->is_at_end(current_xva_.block<2, 1>(0, 0)) ||
@@ -113,11 +126,13 @@
// Move the computed data to be executed.
current_trajectory_ = std::move(future_trajectory_);
current_distance_spline_ = std::move(future_distance_spline_);
+ current_drive_spline_backwards_ = future_drive_spline_backwards_;
current_spline_idx_ = future_spline_idx_;
// Reset internal state to a trajectory start position.
current_xva_ = current_trajectory_->FFAcceleration(0);
current_xva_(1) = 0.0;
+ has_started_execution_ = false;
}
mutex_.Unlock();
}
@@ -132,6 +147,7 @@
::Eigen::Matrix<double, 2, 1> U_ff = ::Eigen::Matrix<double, 2, 1>::Zero();
if (!IsAtEnd() &&
current_spline_handle_ == current_spline_idx_) {
+ has_started_execution_ = true;
// TODO(alex): It takes about a cycle for the outputs to propagate to the
// motors. Consider delaying the output by a cycle.
U_ff = current_trajectory_->FFVoltage(current_xva_(0));
@@ -140,7 +156,17 @@
::Eigen::Matrix<double, 2, 5> K =
current_trajectory_->KForState(state, dt_config_.dt, Q, R);
::Eigen::Matrix<double, 5, 1> goal_state = CurrentGoalState();
+ if (current_drive_spline_backwards_) {
+ ::Eigen::Matrix<double, 2, 1> swapU(U_ff(1, 0), U_ff(0, 0));
+ U_ff = -swapU;
+ goal_state(2, 0) += M_PI;
+ double left_goal = goal_state(3, 0);
+ double right_goal = goal_state(4, 0);
+ goal_state(3, 0) = -right_goal;
+ goal_state(4, 0) = -left_goal;
+ }
::Eigen::Matrix<double, 5, 1> state_error = goal_state - state;
+ state_error(2, 0) = ::aos::math::NormalizeAngle(state_error(2, 0));
::Eigen::Matrix<double, 2, 1> U_fb = K * state_error;
::Eigen::Matrix<double, 2, 1> xv_state = current_xva_.block<2,1>(0,0);
@@ -181,14 +207,27 @@
::Eigen::Matrix<double, 5, 1> goal_state = CurrentGoalState();
status->trajectory_logging.x = goal_state(0);
status->trajectory_logging.y = goal_state(1);
- status->trajectory_logging.theta = goal_state(2);
+ status->trajectory_logging.theta = ::aos::math::NormalizeAngle(
+ goal_state(2) + (current_drive_spline_backwards_ ? M_PI : 0.0));
status->trajectory_logging.left_velocity = goal_state(3);
status->trajectory_logging.right_velocity = goal_state(4);
}
status->trajectory_logging.planning_state = static_cast<int8_t>(plan_state_.load());
- status->trajectory_logging.is_executing = !IsAtEnd();
- status->trajectory_logging.current_spline_handle = current_spline_handle_;
+ status->trajectory_logging.is_executing = !IsAtEnd() && has_started_execution_;
+ status->trajectory_logging.is_executed =
+ (current_spline_idx_ != -1) && IsAtEnd();
+ status->trajectory_logging.goal_spline_handle = current_spline_handle_;
status->trajectory_logging.current_spline_idx = current_spline_idx_;
+ status->trajectory_logging.distance_remaining =
+ current_trajectory_ ? current_trajectory_->length() - current_xva_.x()
+ : 0.0;
+
+ int32_t planning_spline_idx = planning_spline_idx_;
+ if (current_spline_idx_ == planning_spline_idx) {
+ status->trajectory_logging.planning_spline_idx = 0;
+ } else {
+ status->trajectory_logging.planning_spline_idx = planning_spline_idx_;
+ }
}
}
diff --git a/frc971/control_loops/drivetrain/splinedrivetrain.h b/frc971/control_loops/drivetrain/splinedrivetrain.h
index c9ebbe4..98c4e74 100644
--- a/frc971/control_loops/drivetrain/splinedrivetrain.h
+++ b/frc971/control_loops/drivetrain/splinedrivetrain.h
@@ -70,9 +70,11 @@
int32_t current_spline_handle_ = 0; // Current spline told to excecute.
int32_t current_spline_idx_ = 0; // Current executing spline.
+ bool has_started_execution_ = false;
::std::unique_ptr<DistanceSpline> current_distance_spline_;
::std::unique_ptr<Trajectory> current_trajectory_;
+ bool current_drive_spline_backwards_ = false;
// State required to compute the next iteration's output.
::Eigen::Matrix<double, 3, 1> current_xva_, next_xva_;
@@ -98,14 +100,16 @@
::std::unique_ptr<DistanceSpline> future_distance_spline_;
::std::unique_ptr<Trajectory> past_trajectory_;
::std::unique_ptr<Trajectory> future_trajectory_;
+ bool future_drive_spline_backwards_ = false;
int32_t future_spline_idx_ = 0; // Current spline being computed.
+ ::std::atomic<int32_t> planning_spline_idx_{-1};
// TODO(alex): pull this out of dt_config.
const ::Eigen::DiagonalMatrix<double, 5> Q =
(::Eigen::DiagonalMatrix<double, 5>().diagonal()
- << 1.0 / ::std::pow(0.05, 2),
- 1.0 / ::std::pow(0.05, 2), 1.0 / ::std::pow(0.2, 2),
- 1.0 / ::std::pow(0.5, 2), 1.0 / ::std::pow(0.5, 2))
+ << 1.0 / ::std::pow(0.12, 2),
+ 1.0 / ::std::pow(0.12, 2), 1.0 / ::std::pow(0.1, 2),
+ 1.0 / ::std::pow(1.5, 2), 1.0 / ::std::pow(1.5, 2))
.finished()
.asDiagonal();
const ::Eigen::DiagonalMatrix<double, 2> R =
diff --git a/frc971/control_loops/drivetrain/trajectory_plot.cc b/frc971/control_loops/drivetrain/trajectory_plot.cc
index fec90f1..8508099 100644
--- a/frc971/control_loops/drivetrain/trajectory_plot.cc
+++ b/frc971/control_loops/drivetrain/trajectory_plot.cc
@@ -9,7 +9,7 @@
#include "frc971/control_loops/dlqr.h"
#include "gflags/gflags.h"
#include "third_party/matplotlib-cpp/matplotlibcpp.h"
-#include "y2016/control_loops/drivetrain/drivetrain_base.h"
+#include "y2019/control_loops/drivetrain/drivetrain_base.h"
// Notes:
// Basic ideas from spline following are from Jared Russell and
@@ -55,7 +55,7 @@
.finished())));
Trajectory trajectory(
&distance_spline,
- ::y2016::control_loops::drivetrain::GetDrivetrainConfig());
+ ::y2019::control_loops::drivetrain::GetDrivetrainConfig());
trajectory.set_lateral_acceleration(2.0);
trajectory.set_longitudal_acceleration(1.0);
diff --git a/frc971/control_loops/profiled_subsystem.h b/frc971/control_loops/profiled_subsystem.h
index d98b5c9..ef5ffde 100644
--- a/frc971/control_loops/profiled_subsystem.h
+++ b/frc971/control_loops/profiled_subsystem.h
@@ -10,12 +10,12 @@
#include "aos/controls/control_loop.h"
#include "aos/util/trapezoid_profile.h"
+#include "frc971/constants.h"
#include "frc971/control_loops/control_loops.q.h"
#include "frc971/control_loops/profiled_subsystem.q.h"
#include "frc971/control_loops/simple_capped_state_feedback_loop.h"
#include "frc971/control_loops/state_feedback_loop.h"
#include "frc971/zeroing/zeroing.h"
-#include "frc971/constants.h"
namespace frc971 {
namespace control_loops {
@@ -59,13 +59,15 @@
}
// Returns the controller.
- const StateFeedbackLoop<number_of_states, number_of_inputs, number_of_outputs> &
- controller() const {
+ const StateFeedbackLoop<number_of_states, number_of_inputs, number_of_outputs>
+ &controller() const {
return *loop_;
}
int controller_index() const { return loop_->index(); }
+ void set_controller_index(int index) { loop_->set_index(index); }
+
// Returns whether the estimators have been initialized and zeroed.
bool initialized() const { return initialized_; }
@@ -140,7 +142,8 @@
template <typename ZeroingEstimator =
::frc971::zeroing::PotAndIndexPulseZeroingEstimator>
class SingleDOFProfiledSubsystem
- : public ::frc971::control_loops::ProfiledSubsystem<3, 1, ZeroingEstimator> {
+ : public ::frc971::control_loops::ProfiledSubsystem<3, 1,
+ ZeroingEstimator> {
public:
SingleDOFProfiledSubsystem(
::std::unique_ptr<SimpleCappedStateFeedbackLoop<3, 1, 1>> loop,
diff --git a/frc971/control_loops/python/angular_system.py b/frc971/control_loops/python/angular_system.py
index a0a07d6..36da41a 100755
--- a/frc971/control_loops/python/angular_system.py
+++ b/frc971/control_loops/python/angular_system.py
@@ -375,26 +375,42 @@
"""Writes out the constants for a angular system to a file.
Args:
- params: AngularSystemParams, the parameters defining the system.
+ params: list of AngularSystemParams or AngularSystemParams, the
+ parameters defining the system.
plant_files: list of strings, the cc and h files for the plant.
controller_files: list of strings, the cc and h files for the integral
controller.
year_namespaces: list of strings, the namespace list to use.
"""
# Write the generated constants out to a file.
- angular_system = AngularSystem(params, params.name)
+ angular_systems = []
+ integral_angular_systems = []
+
+ if type(params) is list:
+ name = params[0].name
+ for index, param in enumerate(params):
+ angular_systems.append(
+ AngularSystem(param, param.name + str(index)))
+ integral_angular_systems.append(
+ IntegralAngularSystem(param, 'Integral' + param.name + str(
+ index)))
+ else:
+ name = params.name
+ angular_systems.append(AngularSystem(params, params.name))
+ integral_angular_systems.append(
+ IntegralAngularSystem(params, 'Integral' + params.name))
+
loop_writer = control_loop.ControlLoopWriter(
- angular_system.name, [angular_system], namespaces=year_namespaces)
+ name, angular_systems, namespaces=year_namespaces)
loop_writer.AddConstant(
- control_loop.Constant('kOutputRatio', '%f', angular_system.G))
+ control_loop.Constant('kOutputRatio', '%f', angular_systems[0].G))
loop_writer.AddConstant(
- control_loop.Constant('kFreeSpeed', '%f',
- angular_system.motor.free_speed))
+ control_loop.Constant('kFreeSpeed', '%f', angular_systems[0]
+ .motor.free_speed))
loop_writer.Write(plant_files[0], plant_files[1])
- integral_angular_system = IntegralAngularSystem(params,
- 'Integral' + params.name)
integral_loop_writer = control_loop.ControlLoopWriter(
- integral_angular_system.name, [integral_angular_system],
+ 'Integral' + name,
+ integral_angular_systems,
namespaces=year_namespaces)
integral_loop_writer.Write(controller_files[0], controller_files[1])
diff --git a/frc971/control_loops/python/linear_system.py b/frc971/control_loops/python/linear_system.py
index fe8dd85..105093b 100755
--- a/frc971/control_loops/python/linear_system.py
+++ b/frc971/control_loops/python/linear_system.py
@@ -381,29 +381,45 @@
"""Writes out the constants for a linear system to a file.
Args:
- params: LinearSystemParams, the parameters defining the system.
+ params: list of LinearSystemParams or LinearSystemParams, the
+ parameters defining the system.
plant_files: list of strings, the cc and h files for the plant.
controller_files: list of strings, the cc and h files for the integral
controller.
year_namespaces: list of strings, the namespace list to use.
"""
# Write the generated constants out to a file.
- linear_system = LinearSystem(params, params.name)
+ linear_systems = []
+ integral_linear_systems = []
+
+ if type(params) is list:
+ name = params[0].name
+ for index, param in enumerate(params):
+ linear_systems.append(
+ LinearSystem(param, param.name + str(index)))
+ integral_linear_systems.append(
+ IntegralLinearSystem(param, 'Integral' + param.name + str(
+ index)))
+ else:
+ name = params.name
+ linear_systems.append(LinearSystem(params, params.name))
+ integral_linear_systems.append(
+ IntegralLinearSystem(params, 'Integral' + params.name))
+
loop_writer = control_loop.ControlLoopWriter(
- linear_system.name, [linear_system], namespaces=year_namespaces)
+ name, linear_systems, namespaces=year_namespaces)
loop_writer.AddConstant(
- control_loop.Constant('kFreeSpeed', '%f',
- linear_system.motor.free_speed))
+ control_loop.Constant('kFreeSpeed', '%f', linear_systems[0]
+ .motor.free_speed))
loop_writer.AddConstant(
- control_loop.Constant('kOutputRatio', '%f',
- linear_system.G * linear_system.radius))
+ control_loop.Constant('kOutputRatio', '%f', linear_systems[0].G *
+ linear_systems[0].radius))
loop_writer.AddConstant(
- control_loop.Constant('kRadius', '%f', linear_system.radius))
+ control_loop.Constant('kRadius', '%f', linear_systems[0].radius))
loop_writer.Write(plant_files[0], plant_files[1])
- integral_linear_system = IntegralLinearSystem(params,
- 'Integral' + params.name)
integral_loop_writer = control_loop.ControlLoopWriter(
- integral_linear_system.name, [integral_linear_system],
+ 'Integral' + name,
+ integral_linear_systems,
namespaces=year_namespaces)
integral_loop_writer.Write(controller_files[0], controller_files[1])
diff --git a/frc971/control_loops/static_zeroing_single_dof_profiled_subsystem.h b/frc971/control_loops/static_zeroing_single_dof_profiled_subsystem.h
index 2951f1a..7e8f4a7 100644
--- a/frc971/control_loops/static_zeroing_single_dof_profiled_subsystem.h
+++ b/frc971/control_loops/static_zeroing_single_dof_profiled_subsystem.h
@@ -74,6 +74,10 @@
void TriggerEstimatorError() { profiled_subsystem_.TriggerEstimatorError(); }
+ void set_controller_index(int index) {
+ profiled_subsystem_.set_controller_index(index);
+ }
+
enum class State : int32_t {
UNINITIALIZED,
DISABLED_INITIALIZED,
diff --git a/frc971/wpilib/ADIS16448.h b/frc971/wpilib/ADIS16448.h
index 1846723..49c4fb2 100644
--- a/frc971/wpilib/ADIS16448.h
+++ b/frc971/wpilib/ADIS16448.h
@@ -45,6 +45,8 @@
// readings.
void operator()();
+ // Sets a function to be called immediately after each time this class uses
+ // the SPI bus. This is a good place to do other things on the bus.
void set_spi_idle_callback(std::function<void()> spi_idle_callback) {
spi_idle_callback_ = std::move(spi_idle_callback);
}
diff --git a/motors/BUILD b/motors/BUILD
index 9fe638c..ac65f37 100644
--- a/motors/BUILD
+++ b/motors/BUILD
@@ -144,6 +144,27 @@
)
hex_from_elf(
+ name = "simpler_receiver",
+ restricted_to = mcu_cpus,
+)
+
+cc_binary(
+ name = "simpler_receiver.elf",
+ srcs = [
+ "simpler_receiver.cc",
+ ],
+ restricted_to = mcu_cpus,
+ deps = [
+ ":util",
+ "//motors/core",
+ "//motors/peripheral:can",
+ "//motors/peripheral:configuration",
+ "//motors/print:usb",
+ "//motors/seems_reasonable:drivetrain_lib",
+ ],
+)
+
+hex_from_elf(
name = "simple_receiver",
restricted_to = mcu_cpus,
)
diff --git a/motors/big/medium_salsa.cc b/motors/big/medium_salsa.cc
index 7e01869..6c3f339 100644
--- a/motors/big/medium_salsa.cc
+++ b/motors/big/medium_salsa.cc
@@ -133,7 +133,7 @@
}
const BalancedReadings balanced = BalanceReadings(to_balance);
- global_motor.load(::std::memory_order_relaxed)->HandleInterrupt(
+ global_motor.load(::std::memory_order_relaxed)->CurrentInterrupt(
balanced,
global_motor.load(::std::memory_order_relaxed)->wrapped_encoder());
}
diff --git a/motors/fet12/fet12v2.cc b/motors/fet12/fet12v2.cc
index c52f72a..3380631 100644
--- a/motors/fet12/fet12v2.cc
+++ b/motors/fet12/fet12v2.cc
@@ -257,7 +257,7 @@
global_motor.load(::std::memory_order_relaxed)
->SetGoalCurrent(goal_current);
global_motor.load(::std::memory_order_relaxed)
- ->HandleInterrupt(balanced, wrapped_encoder);
+ ->CurrentInterrupt(balanced, wrapped_encoder);
global_debug_buffer.count.fetch_add(1);
diff --git a/motors/motor.cc b/motors/motor.cc
index ebeec22..33113a1 100644
--- a/motors/motor.cc
+++ b/motors/motor.cc
@@ -103,10 +103,8 @@
#define USE_ABSOLUTE_CUTOFF 0
#define DO_CONTROLS 1
-#define DO_FIXED_PULSE 0
#define USE_CUTOFF 1
-#define PRINT_READINGS 0
#define PRINT_ALL_READINGS 0
#define TAKE_SAMPLE 0
#define SAMPLE_UNTIL_DONE 0
@@ -114,8 +112,58 @@
#define DO_PULSE_SWEEP 0
#define PRINT_TIMING 0
-void Motor::HandleInterrupt(const BalancedReadings &balanced,
- uint32_t captured_wrapped_encoder) {
+// An on-width of 60 with 30V in means about 50A through the motor and about
+// 30W total power dumped by the motor for the big one.
+// For the small one, an on-width of 120/3000 with 14V in means about 2A
+// through the motor.
+void Motor::CycleFixedPhaseInterupt(int period) {
+ pwm_ftm_->SC &= ~FTM_SC_TOF;
+ // Step through all the phases one by one in a loop. This should slowly move
+ // the trigger.
+ // If we fire phase 1, we should go to PI radians.
+ // If we fire phase 2, we should go to 1.0 * PI / 3.0 radians.
+ // If we fire phase 3, we should go to -1.0 * PI / 3.0 radians.
+ // These numbers were confirmed by the python motor simulation.
+ static int phase_to_fire_count = -300000;
+ static int phase_to_fire = 0;
+ ++phase_to_fire_count;
+ if (phase_to_fire_count > 500000) {
+ phase_to_fire_count = 0;
+ ++phase_to_fire;
+ if (phase_to_fire > 2) {
+ phase_to_fire = 0;
+ }
+ }
+ phase_to_fire = 0;
+
+ output_registers_[0][0] = 0;
+ output_registers_[0][2] = phase_to_fire == 0 ? period : 0;
+
+ const float switching_points_max = static_cast<float>(counts_per_cycle());
+ switching_points_ratio_[0] =
+ static_cast<float>(output_registers_[0][2]) / switching_points_max;
+ output_registers_[1][0] = 0;
+ output_registers_[1][2] = phase_to_fire == 1 ? period : 0;
+ switching_points_ratio_[1] =
+ static_cast<float>(output_registers_[1][2]) / switching_points_max;
+ output_registers_[2][0] = 0;
+ output_registers_[2][2] = phase_to_fire == 2 ? period : 0;
+ switching_points_ratio_[2] =
+ static_cast<float>(output_registers_[2][2]) / switching_points_max;
+
+ // Tell the hardware to use the new switching points.
+ // TODO(Brian): Somehow verify that we consistently hit the first or second
+ // timer-cycle with the new values (if there's two).
+ pwm_ftm_->PWMLOAD = FTM_PWMLOAD_LDOK;
+
+ // If another cycle has already started, turn the light on right now.
+ if (pwm_ftm_->SC & FTM_SC_TOF) {
+ GPIOC_PSOR = 1 << 5;
+ }
+}
+
+void Motor::CurrentInterrupt(const BalancedReadings &balanced,
+ uint32_t captured_wrapped_encoder) {
pwm_ftm_->SC &= ~FTM_SC_TOF;
#if PRINT_TIMING
@@ -193,90 +241,17 @@
output_registers_[2][0] = 0;
output_registers_[2][2] = 0;
}
-#elif DO_FIXED_PULSE // DO_CONTROLS
- // Step through all the phases one by one in a loop. This should slowly move
- // the trigger.
- // If we fire phase 1, we should go to 0 radians.
- // If we fire phase 2, we should go to -2.0 * PI / 3.0 radians.
- // If we fire phase 3, we should go to 2.0 * PI / 3.0 radians.
- // These numbers were confirmed by the python motor simulation.
- static int phase_to_fire_count = -300000;
- static int phase_to_fire = 0;
- ++phase_to_fire_count;
- if (phase_to_fire_count > 200000) {
- phase_to_fire_count = 0;
- ++phase_to_fire;
- if (phase_to_fire > 2) {
- phase_to_fire = 0;
- }
- }
-
- // An on-width of 60 with 30V in means about 50A through the motor and about
- // 30W total power dumped by the motor for the big one.
- // For the small one, an on-width of 120/3000 with 14V in means about 2A
- // through the motor.
- constexpr int kPhaseFireWidth = 90;
- output_registers_[0][0] = 0;
- output_registers_[0][2] =
- phase_to_fire == 0 ? kPhaseFireWidth : 0;
-
- const float switching_points_max = static_cast<float>(counts_per_cycle());
- switching_points_ratio_[0] =
- static_cast<float>(output_registers_[0][2]) / switching_points_max;
- output_registers_[1][0] = 0;
- output_registers_[1][2] = phase_to_fire == 1 ? kPhaseFireWidth : 0;
- switching_points_ratio_[1] =
- static_cast<float>(output_registers_[1][2]) / switching_points_max;
- output_registers_[2][0] = 0;
- output_registers_[2][2] = phase_to_fire == 2 ? kPhaseFireWidth : 0;
- switching_points_ratio_[2] =
- static_cast<float>(output_registers_[2][2]) / switching_points_max;
-#endif // DO_CONTROLS/DO_FIXED_PULSE
+#endif // DO_CONTROLS
(void)balanced;
(void)captured_wrapped_encoder;
-#if PRINT_READINGS
- static int i = 0;
- if (i == 1000) {
- i = 0;
- //SmallInitReadings readings;
- //{
- //DisableInterrupts disable_interrupts;
- //readings = AdcReadSmallInit(disable_interrupts);
- //}
- //printf(
- //"enc %" PRIu32 " %d %d\n", captured_wrapped_encoder,
- //static_cast<int>((1.0f - analog_ratio(readings.motor1_abs)) * 7000.0f),
- //static_cast<int>(captured_wrapped_encoder * 7.0f / 4096.0f * 1000.0f));
- //float wheel_position = absolute_wheel(analog_ratio(readings.wheel_abs));
-
- printf(
- "ecnt %" PRIu32
- //" arev:%d"
- " erev:%d"
- //" %d"
- "\n", captured_wrapped_encoder,
- //static_cast<int>((analog_ratio(readings.motor1_abs)) * 7000.0f),
- static_cast<int>(captured_wrapped_encoder / 4096.0f * 1000.0f)
- //static_cast<int>(wheel_position * 1000.0f)
- );
- } else if (i == 200) {
-#if DO_CONTROLS
- printf("out %" PRIu32 " %" PRIu32 " %" PRIu32 "\n", switching_points[0],
- switching_points[1], switching_points[2]);
-#else // DO_CONTROLS
- printf("out %" PRIu32 " %" PRIu32 " %" PRIu32 "\n", output_registers_[0][2],
- output_registers_[1][2], output_registers_[2][2]);
-#endif // DO_CONTROLS
- }
- ++i;
-#elif PRINT_ALL_READINGS // PRINT_READINGS
+#if PRINT_ALL_READINGS
printf("ref=%" PRIu16 " 0.0=%" PRIu16 " 1.0=%" PRIu16 " 2.0=%" PRIu16
" in=%" PRIu16 " 0.1=%" PRIu16 " 1.1=%" PRIu16 " 2.1=%" PRIu16 "\n",
adc_readings.motor_current_ref, adc_readings.motor_currents[0][0],
adc_readings.motor_currents[1][0], adc_readings.motor_currents[2][0],
adc_readings.input_voltage, adc_readings.motor_currents[0][1],
adc_readings.motor_currents[1][1], adc_readings.motor_currents[2][1]);
-#elif TAKE_SAMPLE // PRINT_READINGS/PRINT_ALL_READINGS
+#elif TAKE_SAMPLE // PRINT_ALL_READINGS
#if 0
constexpr int kStartupWait = 50000;
#elif 0
@@ -422,7 +397,7 @@
}
#endif
}
-#endif // PRINT_READINGS/PRINT_ALL_READINGS/TAKE_SAMPLE
+#endif // PRINT_ALL_READINGS/TAKE_SAMPLE
(void)balanced;
// Tell the hardware to use the new switching points.
diff --git a/motors/motor.h b/motors/motor.h
index 808783e..2896b80 100644
--- a/motors/motor.h
+++ b/motors/motor.h
@@ -130,8 +130,11 @@
// If the global time base is in use, it must be activated after this.
void Start();
- void HandleInterrupt(const BalancedReadings &readings,
- uint32_t captured_wrapped_encoder);
+ void CurrentInterrupt(const BalancedReadings &readings,
+ uint32_t captured_wrapped_encoder);
+
+ // Runs each phase at a fixed duty cycle.
+ void CycleFixedPhaseInterupt(int period = 80);
void SetGoalCurrent(float goal_current) {
DisableInterrupts disable_interrupts;
@@ -164,6 +167,10 @@
return controls_->overall_measured_current();
}
+ ::std::array<volatile uint32_t *, 3> output_registers() const {
+ return output_registers_;
+ }
+
private:
uint32_t CalculateOnTime(uint32_t width) const;
uint32_t CalculateOffTime(uint32_t width) const;
diff --git a/motors/peripheral/can.c b/motors/peripheral/can.c
index ccd8d7d..de593c7 100644
--- a/motors/peripheral/can.c
+++ b/motors/peripheral/can.c
@@ -86,6 +86,7 @@
// more stable than the PLL-based peripheral clock, which matters.
// We're going with a sample point fraction of 0.875 because that's what
// SocketCAN defaults to.
+ // This results in a baud rate of 500 kHz.
CAN0_CTRL1 = CAN_CTRL1_PRESDIV(
1) /* Divide the crystal frequency by 2 to get 8 MHz. */ |
CAN_CTRL1_RJW(0) /* RJW/SJW of 1, which is most common. */ |
diff --git a/motors/pistol_grip/BUILD b/motors/pistol_grip/BUILD
index b86db22..1946c55 100644
--- a/motors/pistol_grip/BUILD
+++ b/motors/pistol_grip/BUILD
@@ -28,8 +28,12 @@
name = "controller.elf",
srcs = [
"controller.cc",
- "vtable_trigger.cc",
- "vtable_wheel.cc",
+ "controller_adc.cc",
+ "controller_adc.h",
+ "vtable_trigger0.cc",
+ "vtable_trigger1.cc",
+ "vtable_wheel0.cc",
+ "vtable_wheel1.cc",
],
restricted_to = mcu_cpus,
deps = [
diff --git a/motors/pistol_grip/controller.cc b/motors/pistol_grip/controller.cc
index 9f292d1..32a0285 100644
--- a/motors/pistol_grip/controller.cc
+++ b/motors/pistol_grip/controller.cc
@@ -10,8 +10,8 @@
#include "frc971/control_loops/drivetrain/integral_haptic_wheel.h"
#include "motors/core/time.h"
#include "motors/motor.h"
-#include "motors/peripheral/adc.h"
#include "motors/peripheral/can.h"
+#include "motors/pistol_grip/controller_adc.h"
#include "motors/pistol_grip/motor_controls.h"
#include "motors/print/print.h"
#include "motors/util.h"
@@ -21,118 +21,57 @@
#define MOTOR1_PWM_FTM FTM0
#define MOTOR1_ENCODER_FTM FTM1
-extern const float kWheelCoggingTorque[4096];
-extern const float kTriggerCoggingTorque[4096];
+extern const float kWheelCoggingTorque0[4096];
+extern const float kWheelCoggingTorque1[4096];
+extern const float kTriggerCoggingTorque0[4096];
+extern const float kTriggerCoggingTorque1[4096];
namespace frc971 {
namespace motors {
namespace {
+::std::atomic<const float *> trigger_cogging_torque{nullptr};
+::std::atomic<const float *> wheel_cogging_torque{nullptr};
+
+float TriggerCoggingTorque(uint32_t index) {
+ return trigger_cogging_torque.load(::std::memory_order_relaxed)[index];
+}
+
+float WheelCoggingTorque(uint32_t index) {
+ return wheel_cogging_torque.load(::std::memory_order_relaxed)[index];
+}
+
using ::frc971::control_loops::drivetrain::MakeIntegralHapticTriggerPlant;
using ::frc971::control_loops::drivetrain::MakeIntegralHapticTriggerObserver;
using ::frc971::control_loops::drivetrain::MakeIntegralHapticWheelPlant;
using ::frc971::control_loops::drivetrain::MakeIntegralHapticWheelObserver;
-struct SmallAdcReadings {
- uint16_t currents[3];
-};
-
-struct SmallInitReadings {
- uint16_t motor0_abs;
- uint16_t motor1_abs;
- uint16_t wheel_abs;
-};
-
-void AdcInitSmall() {
- AdcInitCommon();
-
- // M0_CH0F ADC1_SE17
- PORTA_PCR17 = PORT_PCR_MUX(0);
-
- // M0_CH1F ADC1_SE14
- PORTB_PCR10 = PORT_PCR_MUX(0);
-
- // M0_CH2F ADC1_SE15
- PORTB_PCR11 = PORT_PCR_MUX(0);
-
- // M0_ABS ADC0_SE5b
- PORTD_PCR1 = PORT_PCR_MUX(0);
-
- // M1_CH0F ADC0_SE13
- PORTB_PCR3 = PORT_PCR_MUX(0);
-
- // M1_CH1F ADC0_SE12
- PORTB_PCR2 = PORT_PCR_MUX(0);
-
- // M1_CH2F ADC0_SE14
- PORTC_PCR0 = PORT_PCR_MUX(0);
-
- // M1_ABS ADC0_SE17
- PORTE_PCR24 = PORT_PCR_MUX(0);
-
- // WHEEL_ABS ADC0_SE18
- PORTE_PCR25 = PORT_PCR_MUX(0);
-
- // VIN ADC1_SE5B
- PORTC_PCR9 = PORT_PCR_MUX(0);
-}
-
-SmallAdcReadings AdcReadSmall0(const DisableInterrupts &) {
- SmallAdcReadings r;
-
- ADC1_SC1A = 17;
- while (!(ADC1_SC1A & ADC_SC1_COCO)) {
+// Returns an identifier for the processor we're running on.
+// This isn't guaranteed to be unique, but it should be close enough.
+uint8_t ProcessorIdentifier() {
+ // This XORs together all the bytes of the unique identifier provided by the
+ // hardware.
+ uint8_t r = 0;
+ for (uint8_t uid : {SIM_UIDH, SIM_UIDMH, SIM_UIDML, SIM_UIDL}) {
+ r = r ^ ((uid >> 0) & 0xFF);
+ r = r ^ ((uid >> 8) & 0xFF);
+ r = r ^ ((uid >> 16) & 0xFF);
+ r = r ^ ((uid >> 24) & 0xFF);
}
- ADC1_SC1A = 14;
- r.currents[0] = ADC1_RA;
- while (!(ADC1_SC1A & ADC_SC1_COCO)) {
- }
- ADC1_SC1A = 15;
- r.currents[1] = ADC1_RA;
- while (!(ADC1_SC1A & ADC_SC1_COCO)) {
- }
- r.currents[2] = ADC1_RA;
-
return r;
}
-SmallAdcReadings AdcReadSmall1(const DisableInterrupts &) {
- SmallAdcReadings r;
-
- ADC0_SC1A = 13;
- while (!(ADC0_SC1A & ADC_SC1_COCO)) {
+uint8_t ProcessorIndex() {
+ switch (ProcessorIdentifier()) {
+ case static_cast<uint8_t>(0xaa):
+ return 1;
+ default:
+ return 0;
}
- ADC0_SC1A = 12;
- r.currents[0] = ADC0_RA;
- while (!(ADC0_SC1A & ADC_SC1_COCO)) {
- }
- ADC0_SC1A = 14;
- r.currents[1] = ADC0_RA;
- while (!(ADC0_SC1A & ADC_SC1_COCO)) {
- }
- r.currents[2] = ADC0_RA;
-
- return r;
}
-SmallInitReadings AdcReadSmallInit(const DisableInterrupts &) {
- SmallInitReadings r;
-
- ADC0_SC1A = 5;
- while (!(ADC0_SC1A & ADC_SC1_COCO)) {
- }
- ADC0_SC1A = 17;
- r.motor0_abs = ADC0_RA;
- while (!(ADC0_SC1A & ADC_SC1_COCO)) {
- }
- ADC0_SC1A = 18;
- r.motor1_abs = ADC0_RA;
- while (!(ADC0_SC1A & ADC_SC1_COCO)) {
- }
- r.wheel_abs = ADC0_RA;
-
- return r;
-}
+// Cached version for speed.
+const uint8_t processor_index = ProcessorIndex();
constexpr float kHapticWheelCurrentLimit = static_cast<float>(
::frc971::control_loops::drivetrain::kHapticWheelCurrentLimit);
@@ -157,7 +96,7 @@
// Torques for the current loop to apply.
::std::atomic<float> global_wheel_current{0.0f};
-::std::atomic<float> global_trigger_torque{0.0f};
+::std::atomic<float> global_trigger_current{0.0f};
constexpr int kSwitchingDivisor = 2;
@@ -173,10 +112,15 @@
}
float absolute_wheel(float wheel_position) {
- if (wheel_position < 0.43f) {
+ const float kCenterOffset = (processor_index == 1) ? -0.683f : -0.935f;
+
+ wheel_position += kCenterOffset;
+
+ if (wheel_position > 0.5f) {
+ wheel_position -= 1.0f;
+ } else if (wheel_position < -0.5f) {
wheel_position += 1.0f;
}
- wheel_position -= 0.462f + 0.473f;
return wheel_position;
}
@@ -225,6 +169,51 @@
return goal_current * scalar + friction_goal_current;
}
+float CoggingCurrent1(uint32_t encoder, int32_t absolute_encoder) {
+ constexpr float kP = 0.05f;
+ constexpr float kI = 0.00001f;
+ static int goal = -6700;
+
+ const int error = goal - static_cast<int>(absolute_encoder);
+ static float error_sum = 0.0f;
+ float goal_current = static_cast<float>(error) * kP + error_sum * kI;
+
+ goal_current = ::std::min(1.0f, ::std::max(-1.0f, goal_current));
+
+ static int i = 0;
+ if (error == 0) {
+ ++i;
+ } else {
+ i = 0;
+ }
+ if (i >= 100) {
+ printf("reading1: %d %d a:%d e:%d\n", goal,
+ static_cast<int>(goal_current * 10000.0f),
+ static_cast<int>(encoder),
+ static_cast<int>(error));
+ static int counting_up = 0;
+ if (absolute_encoder <= -6900) {
+ counting_up = 1;
+ } else if (absolute_encoder >= 6900) {
+ counting_up = 0;
+ }
+ if (counting_up) {
+ ++goal;
+ } else {
+ --goal;
+ }
+ i = 0;
+ }
+
+ error_sum += static_cast<float>(error);
+ if (error_sum > 1.0f / kI) {
+ error_sum = 1.0f / kI;
+ } else if (error_sum < -1.0f / kI) {
+ error_sum = -1.0f / kI;
+ }
+ return goal_current;
+}
+
extern "C" void ftm0_isr() {
SmallAdcReadings readings;
{
@@ -237,14 +226,59 @@
->absolute_encoder(encoder);
const float angle = absolute_encoder / static_cast<float>((15320 - 1488) / 2);
- global_wheel_angle.store(angle);
- float goal_current = -global_wheel_current.load(::std::memory_order_relaxed) +
- kWheelCoggingTorque[encoder];
+ (void)CoggingCurrent1;
+ float goal_current = global_wheel_current.load(::std::memory_order_relaxed) +
+ WheelCoggingTorque(encoder);
+ //float goal_current = CoggingCurrent1(encoder, absolute_encoder);
+ // float goal_current = kWheelCoggingTorque[encoder];
+ // float goal_current = 0.0f;
- global_motor1.load(::std::memory_order_relaxed)->SetGoalCurrent(goal_current);
- global_motor1.load(::std::memory_order_relaxed)
- ->HandleInterrupt(BalanceSimpleReadings(readings.currents), encoder);
+ // Controller 0 is mechanical and doesn't need the motor controls.
+ if (processor_index == 0) {
+ global_motor1.load(::std::memory_order_relaxed)->CycleFixedPhaseInterupt(0);
+ } else {
+ global_motor1.load(::std::memory_order_relaxed)
+ ->SetGoalCurrent(goal_current);
+ global_motor1.load(::std::memory_order_relaxed)
+ ->CurrentInterrupt(BalanceSimpleReadings(readings.currents), encoder);
+ global_wheel_angle.store(angle);
+ }
+ //global_motor1.load(::std::memory_order_relaxed)->CycleFixedPhaseInterupt();
+
+
+ /*
+ SmallInitReadings position_readings;
+ {
+ DisableInterrupts disable_interrupts;
+ position_readings = AdcReadSmallInit(disable_interrupts);
+ }
+
+ static int i = 0;
+ if (i == 1000) {
+ i = 0;
+ float wheel_position =
+ absolute_wheel(analog_ratio(position_readings.wheel_abs));
+ printf(
+ "ecnt %" PRIu32 " arev:%d erev:%d abs:%d awp:%d uncalwheel:%d\n",
+ encoder,
+ static_cast<int>((1.0f - analog_ratio(position_readings.motor1_abs)) *
+ 7000.0f),
+ static_cast<int>(encoder * 7.0f / 4096.0f * 1000.0f),
+ static_cast<int>(absolute_encoder),
+ static_cast<int>(wheel_position * 1000.0f),
+ static_cast<int>(analog_ratio(position_readings.wheel_abs) * 1000.0f));
+ } else if (i == 200) {
+ printf("out %" PRIu32 " %" PRIu32 " %" PRIu32 "\n",
+ global_motor1.load(::std::memory_order_relaxed)
+ ->output_registers()[0][2],
+ global_motor1.load(::std::memory_order_relaxed)
+ ->output_registers()[1][2],
+ global_motor1.load(::std::memory_order_relaxed)
+ ->output_registers()[2][2]);
+ }
+ ++i;
+ */
}
constexpr float kTriggerMaxExtension = -0.70f;
@@ -275,28 +309,112 @@
return goal_current;
}
+float CoggingCurrent0(uint32_t encoder, int32_t absolute_encoder) {
+ constexpr float kP = 0.05f;
+ constexpr float kI = 0.00001f;
+ static int goal = 0;
+
+ const int error = goal - static_cast<int>(absolute_encoder);
+ static float error_sum = 0.0f;
+ float goal_current = static_cast<float>(error) * kP + error_sum * kI;
+
+ goal_current = ::std::min(1.0f, ::std::max(-1.0f, goal_current));
+
+ static int i = 0;
+ if (error == 0) {
+ ++i;
+ } else {
+ i = 0;
+ }
+
+ if (i >= 100) {
+ printf("reading0: %d %d a:%d e:%d\n", goal,
+ static_cast<int>(goal_current * 10000.0f),
+ static_cast<int>(encoder),
+ static_cast<int>(error));
+ static int counting_up = 0;
+ if (absolute_encoder <= -1390) {
+ counting_up = 1;
+ } else if (absolute_encoder >= 1390) {
+ counting_up = 0;
+ }
+ if (counting_up) {
+ ++goal;
+ } else {
+ --goal;
+ }
+ }
+
+ error_sum += static_cast<float>(error);
+ if (error_sum > 1.0f / kI) {
+ error_sum = 1.0f / kI;
+ } else if (error_sum < -1.0f / kI) {
+ error_sum = -1.0f / kI;
+ }
+ return goal_current;
+}
+
extern "C" void ftm3_isr() {
SmallAdcReadings readings;
{
DisableInterrupts disable_interrupts;
readings = AdcReadSmall0(disable_interrupts);
}
- uint32_t encoder =
+
+ const uint32_t encoder =
global_motor0.load(::std::memory_order_relaxed)->wrapped_encoder();
- int32_t absolute_encoder = global_motor0.load(::std::memory_order_relaxed)
- ->absolute_encoder(encoder);
+ const int32_t absolute_encoder =
+ global_motor0.load(::std::memory_order_relaxed)
+ ->absolute_encoder(encoder);
- float trigger_angle = absolute_encoder / 1370.f;
+ const float trigger_angle = absolute_encoder / 1370.f;
+ (void)CoggingCurrent0;
const float goal_current =
- -global_trigger_torque.load(::std::memory_order_relaxed) +
- kTriggerCoggingTorque[encoder];
+ global_trigger_current.load(::std::memory_order_relaxed) +
+ TriggerCoggingTorque(encoder);
+ //const float goal_current = kTriggerCoggingTorque[encoder];
+ //const float goal_current = 0.0f;
+ //const float goal_current = CoggingCurrent0(encoder, absolute_encoder);
- global_motor0.load(::std::memory_order_relaxed)->SetGoalCurrent(goal_current);
- global_motor0.load(::std::memory_order_relaxed)
- ->HandleInterrupt(BalanceSimpleReadings(readings.currents), encoder);
+ if (processor_index == 0) {
+ global_motor0.load(::std::memory_order_relaxed)->CycleFixedPhaseInterupt(0);
+ } else {
+ global_motor0.load(::std::memory_order_relaxed)
+ ->SetGoalCurrent(goal_current);
+ global_motor0.load(::std::memory_order_relaxed)
+ ->CurrentInterrupt(BalanceSimpleReadings(readings.currents), encoder);
+ global_trigger_angle.store(trigger_angle);
+ }
+ //global_motor0.load(::std::memory_order_relaxed)->CycleFixedPhaseInterupt();
- global_trigger_angle.store(trigger_angle);
+
+ /*
+ SmallInitReadings position_readings;
+ {
+ DisableInterrupts disable_interrupts;
+ position_readings = AdcReadSmallInit(disable_interrupts);
+ }
+
+ static int i = 0;
+ if (i == 1000) {
+ i = 0;
+ printf("ecnt %" PRIu32 " arev:%d erev:%d abs:%d\n", encoder,
+ static_cast<int>((analog_ratio(position_readings.motor0_abs)) *
+ 7000.0f),
+ static_cast<int>(encoder * 7.0f / 4096.0f * 1000.0f),
+ static_cast<int>(absolute_encoder));
+ } else if (i == 200) {
+ printf("out %" PRIu32 " %" PRIu32 " %" PRIu32 "\n",
+ global_motor0.load(::std::memory_order_relaxed)
+ ->output_registers()[0][2],
+ global_motor0.load(::std::memory_order_relaxed)
+ ->output_registers()[1][2],
+ global_motor0.load(::std::memory_order_relaxed)
+ ->output_registers()[2][2]);
+ }
+ ++i;
+ */
}
int ConvertFloat16(float val) {
@@ -320,6 +438,47 @@
extern "C" void pit3_isr() {
PIT_TFLG3 = 1;
+
+ // If we are a mechanical pistol grip, do the encoder angle calculation here
+ // since the high frequency interrupt isn't running.
+ if (processor_index == 0) {
+ const uint32_t trigger_encoder =
+ global_motor0.load(::std::memory_order_relaxed)->wrapped_encoder();
+ const int32_t trigger_absolute_encoder =
+ global_motor0.load(::std::memory_order_relaxed)
+ ->absolute_encoder(trigger_encoder);
+
+ const float trigger_angle =
+ trigger_absolute_encoder /
+ (trigger_absolute_encoder < 0.0 ? 198.0f : 252.0f);
+ global_trigger_angle.store(
+ ::std::max(-1.0f, ::std::min(1.0f, trigger_angle)));
+
+ uint32_t wheel_encoder =
+ global_motor1.load(::std::memory_order_relaxed)->wrapped_encoder();
+ int32_t wheel_absolute_encoder =
+ global_motor1.load(::std::memory_order_relaxed)
+ ->absolute_encoder(wheel_encoder);
+
+ const float wheel_angle = wheel_absolute_encoder / 1787.0f;
+ global_wheel_angle.store(::std::max(-1.0f, ::std::min(1.0f, wheel_angle)));
+
+ /*
+ // Calibration constants
+ static int k = 0;
+ ++k;
+ if (k > 100) {
+ printf("trigger: %d -> %d wheel %d -> %d -> %d\n",
+ static_cast<int>(trigger_encoder),
+ static_cast<int>(global_trigger_angle * 1000.0f),
+ static_cast<int>(wheel_encoder),
+ static_cast<int>(wheel_absolute_encoder),
+ static_cast<int>(global_wheel_angle * 1000.0f));
+ k = 0;
+ }
+ */
+ }
+
const float absolute_trigger_angle =
global_trigger_angle.load(::std::memory_order_relaxed);
const float absolute_wheel_angle =
@@ -327,6 +486,7 @@
// Force a barrier here so we sample everything guaranteed at the beginning.
__asm__("" ::: "memory");
+
const float absolute_wheel_angle_radians =
absolute_wheel_angle * static_cast<float>(M_PI) * (338.16f / 360.0f);
const float absolute_trigger_angle_radians =
@@ -484,7 +644,6 @@
} else if (wheel_goal_current < -kHapticWheelCurrentLimit) {
wheel_goal_current = -kHapticWheelCurrentLimit;
}
- global_wheel_current.store(wheel_goal_current, ::std::memory_order_relaxed);
constexpr float kTriggerP =
static_cast<float>(::frc971::control_loops::drivetrain::kHapticTriggerP);
@@ -506,8 +665,14 @@
} else if (trigger_goal_current < -kHapticTriggerCurrentLimit) {
trigger_goal_current = -kHapticTriggerCurrentLimit;
}
- global_trigger_torque.store(trigger_goal_current,
- ::std::memory_order_relaxed);
+
+ if (processor_index == 0) {
+ wheel_goal_current = 0.0f;
+ trigger_goal_current = 0.0f;
+ }
+ global_wheel_current.store(wheel_goal_current, ::std::memory_order_relaxed);
+ global_trigger_current.store(trigger_goal_current,
+ ::std::memory_order_relaxed);
uint8_t buttons = 0;
if (!PERIPHERAL_BITBAND(GPIOA_PDIR, 14)) {
@@ -658,21 +823,6 @@
return true;
}
-// Returns an identifier for the processor we're running on.
-// This isn't guaranteed to be unique, but it should be close enough.
-uint8_t ProcessorIdentifier() {
- // This XORs together all the bytes of the unique identifier provided by the
- // hardware.
- uint8_t r = 0;
- for (uint8_t uid : {SIM_UIDH, SIM_UIDMH, SIM_UIDML, SIM_UIDL}) {
- r = r ^ ((uid >> 0) & 0xFF);
- r = r ^ ((uid >> 8) & 0xFF);
- r = r ^ ((uid >> 16) & 0xFF);
- r = r ^ ((uid >> 24) & 0xFF);
- }
- return r;
-}
-
} // namespace
extern "C" int main() {
@@ -823,7 +973,13 @@
printf("heap start: %p\n", __heap_start__);
printf("stack start: %p\n", __stack_end__);
- printf("Zeroing motors for %x\n", (unsigned int)ProcessorIdentifier());
+ trigger_cogging_torque.store(processor_index == 0 ? kTriggerCoggingTorque0
+ : kTriggerCoggingTorque1);
+ wheel_cogging_torque.store(processor_index == 0 ? kWheelCoggingTorque0
+ : kWheelCoggingTorque1);
+
+ printf("Zeroing motors for %d:%x\n", static_cast<int>(processor_index),
+ (unsigned int)ProcessorIdentifier());
uint16_t motor0_offset, motor1_offset, wheel_offset;
while (!ZeroMotors(&motor0_offset, &motor1_offset, &wheel_offset)) {
}
@@ -833,15 +989,34 @@
const float motor1_offset_scaled = analog_ratio(motor1_offset);
// Good for the initial trigger.
{
- constexpr float kZeroOffset0 = 0.27f;
+ // Calibrate winding phase error here.
+ const float kZeroOffset0 = processor_index == 1 ? 0.275f : 0.0f;
const int motor0_starting_point = static_cast<int>(
(motor0_offset_scaled + (kZeroOffset0 / 7.0f)) * 4096.0f);
printf("Motor 0 starting at %d\n", motor0_starting_point);
motor0.set_encoder_calibration_offset(motor0_starting_point);
motor0.set_encoder_multiplier(-1);
- // Calibrate neutral here.
- motor0.set_encoder_offset(motor0.encoder_offset() - 2065 + 20);
+ // Calibrate output coordinate neutral here.
+ motor0.set_encoder_offset(
+ motor0.encoder_offset() +
+ (processor_index == 1 ? (-3096 - 430 - 30 - 6) : (-1978)));
+
+ while (true) {
+ const uint32_t encoder =
+ global_motor0.load(::std::memory_order_relaxed)->wrapped_encoder();
+ const int32_t absolute_encoder =
+ global_motor0.load(::std::memory_order_relaxed)
+ ->absolute_encoder(encoder);
+
+ if (absolute_encoder > 2047) {
+ motor0.set_encoder_offset(motor0.encoder_offset() - 4096);
+ } else if (absolute_encoder < -2047) {
+ motor0.set_encoder_offset(motor0.encoder_offset() + 4096);
+ } else {
+ break;
+ }
+ }
uint32_t new_encoder = motor0.wrapped_encoder();
int32_t absolute_encoder = motor0.absolute_encoder(new_encoder);
@@ -850,7 +1025,8 @@
}
{
- constexpr float kZeroOffset1 = 0.26f;
+ const float kZeroOffset1 = processor_index == 1 ? 0.420f : 0.0f;
+
const int motor1_starting_point = static_cast<int>(
(motor1_offset_scaled + (kZeroOffset1 / 7.0f)) * 4096.0f);
printf("Motor 1 starting at %d\n", motor1_starting_point);
@@ -865,18 +1041,22 @@
static_cast<int>(wheel_position * 1000.0f), encoder);
constexpr float kWheelGearRatio = (1.25f + 0.02f) / 0.35f;
- constexpr float kWrappedWheelAtZero = 0.6586310546875f;
+ const float kWrappedWheelAtZero =
+ processor_index == 1 ? (0.934630859375f) : (1809.f / 4096.f);
+ // If we are pistol grip 0, we are the mechanical pistol grip and can't
+ // wrap. People are very very likely to zero it at the zero position too.
const int encoder_wraps =
- static_cast<int>(lround(wheel_position * kWheelGearRatio -
- (encoder / 4096.f) + kWrappedWheelAtZero));
+ processor_index == 0 ? 0
+ : static_cast<int>(lround(
+ wheel_position * kWheelGearRatio -
+ (encoder / 4096.f) + kWrappedWheelAtZero));
printf("Wraps: %d\n", encoder_wraps);
motor1.set_encoder_offset(4096 * encoder_wraps + motor1.encoder_offset() -
- static_cast<int>(kWrappedWheelAtZero * 4096));
+ static_cast<int>(kWrappedWheelAtZero * 4096.0f));
printf("Wheel encoder now at %d\n",
- static_cast<int>(1000.f / 4096.f *
- motor1.absolute_encoder(motor1.wrapped_encoder())));
+ static_cast<int>(motor1.absolute_encoder(motor1.wrapped_encoder())));
}
// Turn an LED on for Austin.
diff --git a/motors/pistol_grip/controller_adc.cc b/motors/pistol_grip/controller_adc.cc
new file mode 100644
index 0000000..498c4e2
--- /dev/null
+++ b/motors/pistol_grip/controller_adc.cc
@@ -0,0 +1,100 @@
+#include "motors/pistol_grip/controller_adc.h"
+
+#include "motors/peripheral/adc.h"
+
+namespace frc971 {
+namespace motors {
+
+void AdcInitSmall() {
+ AdcInitCommon();
+
+ // M0_CH0F ADC1_SE17
+ PORTA_PCR17 = PORT_PCR_MUX(0);
+
+ // M0_CH1F ADC1_SE14
+ PORTB_PCR10 = PORT_PCR_MUX(0);
+
+ // M0_CH2F ADC1_SE15
+ PORTB_PCR11 = PORT_PCR_MUX(0);
+
+ // M0_ABS ADC0_SE5b
+ PORTD_PCR1 = PORT_PCR_MUX(0);
+
+ // M1_CH0F ADC0_SE13
+ PORTB_PCR3 = PORT_PCR_MUX(0);
+
+ // M1_CH1F ADC0_SE12
+ PORTB_PCR2 = PORT_PCR_MUX(0);
+
+ // M1_CH2F ADC0_SE14
+ PORTC_PCR0 = PORT_PCR_MUX(0);
+
+ // M1_ABS ADC0_SE17
+ PORTE_PCR24 = PORT_PCR_MUX(0);
+
+ // WHEEL_ABS ADC0_SE18
+ PORTE_PCR25 = PORT_PCR_MUX(0);
+
+ // VIN ADC1_SE5B
+ PORTC_PCR9 = PORT_PCR_MUX(0);
+}
+
+SmallAdcReadings AdcReadSmall0(const DisableInterrupts &) {
+ SmallAdcReadings r;
+
+ ADC1_SC1A = 17;
+ while (!(ADC1_SC1A & ADC_SC1_COCO)) {
+ }
+ ADC1_SC1A = 14;
+ r.currents[0] = ADC1_RA;
+ while (!(ADC1_SC1A & ADC_SC1_COCO)) {
+ }
+ ADC1_SC1A = 15;
+ r.currents[1] = ADC1_RA;
+ while (!(ADC1_SC1A & ADC_SC1_COCO)) {
+ }
+ r.currents[2] = ADC1_RA;
+
+ return r;
+}
+
+SmallAdcReadings AdcReadSmall1(const DisableInterrupts &) {
+ SmallAdcReadings r;
+
+ ADC0_SC1A = 13;
+ while (!(ADC0_SC1A & ADC_SC1_COCO)) {
+ }
+ ADC0_SC1A = 12;
+ r.currents[0] = ADC0_RA;
+ while (!(ADC0_SC1A & ADC_SC1_COCO)) {
+ }
+ ADC0_SC1A = 14;
+ r.currents[1] = ADC0_RA;
+ while (!(ADC0_SC1A & ADC_SC1_COCO)) {
+ }
+ r.currents[2] = ADC0_RA;
+
+ return r;
+}
+
+SmallInitReadings AdcReadSmallInit(const DisableInterrupts &) {
+ SmallInitReadings r;
+
+ ADC0_SC1A = 5;
+ while (!(ADC0_SC1A & ADC_SC1_COCO)) {
+ }
+ ADC0_SC1A = 17;
+ r.motor0_abs = ADC0_RA;
+ while (!(ADC0_SC1A & ADC_SC1_COCO)) {
+ }
+ ADC0_SC1A = 18;
+ r.motor1_abs = ADC0_RA;
+ while (!(ADC0_SC1A & ADC_SC1_COCO)) {
+ }
+ r.wheel_abs = ADC0_RA;
+
+ return r;
+}
+
+} // namespace motors
+} // namespace frc971
diff --git a/motors/pistol_grip/controller_adc.h b/motors/pistol_grip/controller_adc.h
new file mode 100644
index 0000000..867807c
--- /dev/null
+++ b/motors/pistol_grip/controller_adc.h
@@ -0,0 +1,34 @@
+#ifndef MOTORS_PISTOL_GRIP_CONTROLLER_ADC_H_
+#define MOTORS_PISTOL_GRIP_CONTROLLER_ADC_H_
+
+#include "motors/util.h"
+
+namespace frc971 {
+namespace motors {
+
+struct SmallAdcReadings {
+ uint16_t currents[3];
+};
+
+struct SmallInitReadings {
+ uint16_t motor0_abs;
+ uint16_t motor1_abs;
+ uint16_t wheel_abs;
+};
+
+// Initializes the ADC.
+void AdcInitSmall();
+
+// Reads motor 0.
+SmallAdcReadings AdcReadSmall0(const DisableInterrupts &);
+
+// Reads motor 1.
+SmallAdcReadings AdcReadSmall1(const DisableInterrupts &);
+
+// Reads the absolute encoder values for initialization.
+SmallInitReadings AdcReadSmallInit(const DisableInterrupts &);
+
+} // namespace motors
+} // namespace frc971
+
+#endif // MOTORS_PISTOL_GRIP_CONTROLLER_ADC_H_
diff --git a/motors/pistol_grip/drivers_station.cc b/motors/pistol_grip/drivers_station.cc
index 4b4606f..4ed641c 100644
--- a/motors/pistol_grip/drivers_station.cc
+++ b/motors/pistol_grip/drivers_station.cc
@@ -263,8 +263,16 @@
PORTC_PCR5 = PORT_PCR_DSE | PORT_PCR_MUX(1);
// Set up the CAN pins.
+#if 0
+ // Pistol grip motor controller board.
PORTA_PCR12 = PORT_PCR_DSE | PORT_PCR_MUX(2);
PORTA_PCR13 = PORT_PCR_DSE | PORT_PCR_MUX(2);
+#else
+ // Button board.
+ // TODO(austin): Drive this based off the processor ID.
+ PORTB_PCR18 = PORT_PCR_DSE | PORT_PCR_MUX(2);
+ PORTB_PCR19 = PORT_PCR_DSE | PORT_PCR_MUX(2);
+#endif
delay(100);
diff --git a/motors/pistol_grip/vtable_trigger.cc b/motors/pistol_grip/vtable_trigger0.cc
similarity index 99%
rename from motors/pistol_grip/vtable_trigger.cc
rename to motors/pistol_grip/vtable_trigger0.cc
index 44306f1..938cf13 100644
--- a/motors/pistol_grip/vtable_trigger.cc
+++ b/motors/pistol_grip/vtable_trigger0.cc
@@ -1,5 +1,5 @@
-extern const float kTriggerCoggingTorque[4096];
-const float kTriggerCoggingTorque[4096] = {
+extern const float kTriggerCoggingTorque0[4096];
+const float kTriggerCoggingTorque0[4096] = {
0.095850f,
0.095850f,
0.095850f,
@@ -4096,4 +4096,4 @@
-0.204700f,
-0.204700f,
-0.204700f,
-};
\ No newline at end of file
+};
diff --git a/motors/pistol_grip/vtable_trigger1.cc b/motors/pistol_grip/vtable_trigger1.cc
new file mode 100644
index 0000000..a201bb6
--- /dev/null
+++ b/motors/pistol_grip/vtable_trigger1.cc
@@ -0,0 +1,4099 @@
+extern const float kTriggerCoggingTorque1[4096];
+const float kTriggerCoggingTorque1[4096] = {
+ 0.193878f,
+ 0.172163f,
+ 0.152770f,
+ 0.136207f,
+ 0.116607f,
+ 0.096307f,
+ 0.081459f,
+ 0.056667f,
+ 0.036300f,
+ 0.010174f,
+ -0.003278f,
+ -0.021667f,
+ -0.041063f,
+ -0.063019f,
+ -0.078204f,
+ -0.085552f,
+ -0.087333f,
+ -0.087367f,
+ -0.087011f,
+ -0.085626f,
+ -0.082419f,
+ -0.078330f,
+ -0.071804f,
+ -0.064822f,
+ -0.054604f,
+ -0.040681f,
+ -0.024496f,
+ -0.007285f,
+ 0.010330f,
+ 0.029293f,
+ 0.050967f,
+ 0.071252f,
+ 0.092489f,
+ 0.112267f,
+ 0.132359f,
+ 0.152015f,
+ 0.172030f,
+ 0.190159f,
+ 0.205552f,
+ 0.216552f,
+ 0.225059f,
+ 0.230670f,
+ 0.233974f,
+ 0.236396f,
+ 0.237993f,
+ 0.239367f,
+ 0.240289f,
+ 0.239156f,
+ 0.235896f,
+ 0.229681f,
+ 0.216956f,
+ 0.204267f,
+ 0.185552f,
+ 0.169770f,
+ 0.151967f,
+ 0.137593f,
+ 0.119733f,
+ 0.101319f,
+ 0.081678f,
+ 0.067200f,
+ 0.053333f,
+ 0.032978f,
+ 0.015759f,
+ 0.000415f,
+ -0.001663f,
+ -0.002874f,
+ -0.001711f,
+ -0.000330f,
+ 0.001322f,
+ 0.003400f,
+ 0.005644f,
+ 0.010281f,
+ 0.015596f,
+ 0.025270f,
+ 0.035467f,
+ 0.049419f,
+ 0.064304f,
+ 0.081104f,
+ 0.097141f,
+ 0.115070f,
+ 0.132837f,
+ 0.149881f,
+ 0.166411f,
+ 0.182596f,
+ 0.198719f,
+ 0.210822f,
+ 0.218826f,
+ 0.225174f,
+ 0.229244f,
+ 0.233070f,
+ 0.235226f,
+ 0.237189f,
+ 0.238822f,
+ 0.240096f,
+ 0.239030f,
+ 0.228411f,
+ 0.211693f,
+ 0.190904f,
+ 0.174144f,
+ 0.160126f,
+ 0.142933f,
+ 0.126793f,
+ 0.099363f,
+ 0.074867f,
+ 0.044937f,
+ 0.026604f,
+ 0.001952f,
+ -0.017567f,
+ -0.040919f,
+ -0.055767f,
+ -0.077319f,
+ -0.097311f,
+ -0.113593f,
+ -0.119178f,
+ -0.119170f,
+ -0.118785f,
+ -0.118100f,
+ -0.116919f,
+ -0.115441f,
+ -0.112670f,
+ -0.106548f,
+ -0.100167f,
+ -0.090704f,
+ -0.080093f,
+ -0.066015f,
+ -0.049170f,
+ -0.034874f,
+ -0.016389f,
+ 0.000685f,
+ 0.020852f,
+ 0.040844f,
+ 0.062207f,
+ 0.079844f,
+ 0.093430f,
+ 0.102370f,
+ 0.111941f,
+ 0.119185f,
+ 0.125504f,
+ 0.129589f,
+ 0.132233f,
+ 0.134178f,
+ 0.135904f,
+ 0.137196f,
+ 0.137219f,
+ 0.136200f,
+ 0.131489f,
+ 0.121937f,
+ 0.110304f,
+ 0.090430f,
+ 0.071163f,
+ 0.049270f,
+ 0.031270f,
+ 0.016007f,
+ 0.001526f,
+ -0.017948f,
+ -0.040744f,
+ -0.061041f,
+ -0.074248f,
+ -0.089867f,
+ -0.107430f,
+ -0.119263f,
+ -0.124763f,
+ -0.125804f,
+ -0.126363f,
+ -0.124500f,
+ -0.122378f,
+ -0.118659f,
+ -0.114404f,
+ -0.108996f,
+ -0.103230f,
+ -0.095585f,
+ -0.085496f,
+ -0.073344f,
+ -0.058704f,
+ -0.043381f,
+ -0.024641f,
+ -0.006181f,
+ 0.012767f,
+ 0.029896f,
+ 0.049496f,
+ 0.065326f,
+ 0.078341f,
+ 0.088011f,
+ 0.096800f,
+ 0.104570f,
+ 0.108856f,
+ 0.114085f,
+ 0.117515f,
+ 0.120322f,
+ 0.120604f,
+ 0.118089f,
+ 0.113104f,
+ 0.101941f,
+ 0.092819f,
+ 0.081726f,
+ 0.068978f,
+ 0.044785f,
+ 0.021348f,
+ -0.004037f,
+ -0.019781f,
+ -0.043756f,
+ -0.059685f,
+ -0.087496f,
+ -0.107604f,
+ -0.135137f,
+ -0.149019f,
+ -0.170826f,
+ -0.190900f,
+ -0.214441f,
+ -0.226330f,
+ -0.229889f,
+ -0.229581f,
+ -0.228896f,
+ -0.227930f,
+ -0.226478f,
+ -0.223563f,
+ -0.219496f,
+ -0.213085f,
+ -0.204341f,
+ -0.194530f,
+ -0.183348f,
+ -0.169659f,
+ -0.150278f,
+ -0.129389f,
+ -0.110681f,
+ -0.094704f,
+ -0.080641f,
+ -0.062778f,
+ -0.043404f,
+ -0.025152f,
+ -0.009570f,
+ 0.001778f,
+ 0.012152f,
+ 0.019096f,
+ 0.024519f,
+ 0.029381f,
+ 0.032833f,
+ 0.035641f,
+ 0.037770f,
+ 0.038811f,
+ 0.038159f,
+ 0.032681f,
+ 0.023841f,
+ 0.012767f,
+ -0.001144f,
+ -0.014074f,
+ -0.032659f,
+ -0.047852f,
+ -0.065152f,
+ -0.082722f,
+ -0.102089f,
+ -0.121059f,
+ -0.132985f,
+ -0.145937f,
+ -0.161778f,
+ -0.179074f,
+ -0.189615f,
+ -0.192467f,
+ -0.193022f,
+ -0.193133f,
+ -0.192904f,
+ -0.190456f,
+ -0.187600f,
+ -0.182374f,
+ -0.176411f,
+ -0.167778f,
+ -0.157863f,
+ -0.144481f,
+ -0.128667f,
+ -0.112259f,
+ -0.091067f,
+ -0.070685f,
+ -0.049063f,
+ -0.029937f,
+ -0.007537f,
+ 0.014552f,
+ 0.033415f,
+ 0.049330f,
+ 0.065000f,
+ 0.078548f,
+ 0.090233f,
+ 0.097948f,
+ 0.105100f,
+ 0.109781f,
+ 0.113333f,
+ 0.115970f,
+ 0.117563f,
+ 0.118852f,
+ 0.117800f,
+ 0.114574f,
+ 0.105993f,
+ 0.094889f,
+ 0.078796f,
+ 0.063978f,
+ 0.044633f,
+ 0.024644f,
+ 0.003063f,
+ -0.016867f,
+ -0.034944f,
+ -0.056948f,
+ -0.075533f,
+ -0.098807f,
+ -0.116578f,
+ -0.134659f,
+ -0.153670f,
+ -0.169059f,
+ -0.182426f,
+ -0.184359f,
+ -0.185822f,
+ -0.184737f,
+ -0.183030f,
+ -0.180311f,
+ -0.176763f,
+ -0.172541f,
+ -0.167459f,
+ -0.160148f,
+ -0.151359f,
+ -0.139196f,
+ -0.124878f,
+ -0.107870f,
+ -0.089763f,
+ -0.071978f,
+ -0.053081f,
+ -0.034889f,
+ -0.017148f,
+ 0.001422f,
+ 0.017611f,
+ 0.033456f,
+ 0.042756f,
+ 0.051726f,
+ 0.056756f,
+ 0.061578f,
+ 0.065452f,
+ 0.069070f,
+ 0.072222f,
+ 0.073467f,
+ 0.074544f,
+ 0.074496f,
+ 0.071056f,
+ 0.057489f,
+ 0.041844f,
+ 0.026337f,
+ 0.011870f,
+ -0.006030f,
+ -0.027900f,
+ -0.046393f,
+ -0.065989f,
+ -0.086196f,
+ -0.106078f,
+ -0.127189f,
+ -0.143237f,
+ -0.162637f,
+ -0.179181f,
+ -0.195022f,
+ -0.202230f,
+ -0.203541f,
+ -0.202770f,
+ -0.201678f,
+ -0.199974f,
+ -0.197926f,
+ -0.194600f,
+ -0.190737f,
+ -0.184278f,
+ -0.176778f,
+ -0.164107f,
+ -0.151267f,
+ -0.133400f,
+ -0.114189f,
+ -0.092115f,
+ -0.070563f,
+ -0.049156f,
+ -0.026933f,
+ -0.002911f,
+ 0.016626f,
+ 0.037681f,
+ 0.056015f,
+ 0.077444f,
+ 0.095311f,
+ 0.112970f,
+ 0.127367f,
+ 0.137893f,
+ 0.145333f,
+ 0.150315f,
+ 0.154748f,
+ 0.156796f,
+ 0.158852f,
+ 0.160567f,
+ 0.159804f,
+ 0.158496f,
+ 0.155337f,
+ 0.150007f,
+ 0.133644f,
+ 0.115581f,
+ 0.098744f,
+ 0.084707f,
+ 0.070933f,
+ 0.050263f,
+ 0.032626f,
+ 0.012244f,
+ -0.004948f,
+ -0.019626f,
+ -0.034315f,
+ -0.050770f,
+ -0.067274f,
+ -0.079078f,
+ -0.083356f,
+ -0.084570f,
+ -0.084352f,
+ -0.082941f,
+ -0.081311f,
+ -0.079281f,
+ -0.075607f,
+ -0.071396f,
+ -0.065278f,
+ -0.057607f,
+ -0.046767f,
+ -0.033700f,
+ -0.019267f,
+ -0.005152f,
+ 0.010207f,
+ 0.023900f,
+ 0.038459f,
+ 0.052367f,
+ 0.065596f,
+ 0.079348f,
+ 0.088748f,
+ 0.097767f,
+ 0.102148f,
+ 0.106307f,
+ 0.108689f,
+ 0.110615f,
+ 0.111663f,
+ 0.112274f,
+ 0.112663f,
+ 0.111044f,
+ 0.106107f,
+ 0.090319f,
+ 0.071141f,
+ 0.052333f,
+ 0.035122f,
+ 0.016752f,
+ -0.006578f,
+ -0.025022f,
+ -0.047741f,
+ -0.072637f,
+ -0.096415f,
+ -0.114500f,
+ -0.134696f,
+ -0.158507f,
+ -0.181867f,
+ -0.199674f,
+ -0.218885f,
+ -0.240104f,
+ -0.256093f,
+ -0.263715f,
+ -0.264426f,
+ -0.263422f,
+ -0.261915f,
+ -0.259763f,
+ -0.257096f,
+ -0.253581f,
+ -0.249404f,
+ -0.241041f,
+ -0.229544f,
+ -0.213548f,
+ -0.196507f,
+ -0.176911f,
+ -0.157204f,
+ -0.137589f,
+ -0.117696f,
+ -0.096196f,
+ -0.073204f,
+ -0.050652f,
+ -0.030589f,
+ -0.010781f,
+ 0.007637f,
+ 0.025022f,
+ 0.039404f,
+ 0.049722f,
+ 0.057448f,
+ 0.061656f,
+ 0.064930f,
+ 0.067089f,
+ 0.068889f,
+ 0.070559f,
+ 0.071922f,
+ 0.073019f,
+ 0.069000f,
+ 0.058652f,
+ 0.041811f,
+ 0.024441f,
+ 0.009174f,
+ -0.000056f,
+ -0.011478f,
+ -0.029119f,
+ -0.052107f,
+ -0.068841f,
+ -0.080541f,
+ -0.092785f,
+ -0.107104f,
+ -0.117807f,
+ -0.121959f,
+ -0.122248f,
+ -0.120311f,
+ -0.117789f,
+ -0.115174f,
+ -0.112615f,
+ -0.107596f,
+ -0.101748f,
+ -0.092307f,
+ -0.080848f,
+ -0.067041f,
+ -0.050422f,
+ -0.032774f,
+ -0.012256f,
+ 0.007885f,
+ 0.029337f,
+ 0.051215f,
+ 0.073141f,
+ 0.094300f,
+ 0.113933f,
+ 0.133111f,
+ 0.150070f,
+ 0.167941f,
+ 0.182278f,
+ 0.194567f,
+ 0.201889f,
+ 0.207137f,
+ 0.209981f,
+ 0.211359f,
+ 0.212159f,
+ 0.212600f,
+ 0.212356f,
+ 0.209652f,
+ 0.205870f,
+ 0.193200f,
+ 0.173130f,
+ 0.147459f,
+ 0.125778f,
+ 0.110248f,
+ 0.092263f,
+ 0.071993f,
+ 0.049459f,
+ 0.031037f,
+ 0.006115f,
+ -0.017556f,
+ -0.039174f,
+ -0.049344f,
+ -0.066956f,
+ -0.086437f,
+ -0.105493f,
+ -0.114537f,
+ -0.118374f,
+ -0.119263f,
+ -0.117504f,
+ -0.115348f,
+ -0.112785f,
+ -0.109722f,
+ -0.105667f,
+ -0.099778f,
+ -0.092804f,
+ -0.084081f,
+ -0.071330f,
+ -0.058670f,
+ -0.040478f,
+ -0.025274f,
+ -0.007333f,
+ 0.008930f,
+ 0.027215f,
+ 0.045352f,
+ 0.062581f,
+ 0.078081f,
+ 0.093330f,
+ 0.104319f,
+ 0.112526f,
+ 0.117500f,
+ 0.121189f,
+ 0.124541f,
+ 0.127156f,
+ 0.129248f,
+ 0.129081f,
+ 0.128396f,
+ 0.125848f,
+ 0.120281f,
+ 0.105370f,
+ 0.088570f,
+ 0.069585f,
+ 0.059483f,
+ 0.049037f,
+ 0.036871f,
+ 0.016267f,
+ -0.007263f,
+ -0.028258f,
+ -0.048117f,
+ -0.066454f,
+ -0.082054f,
+ -0.093313f,
+ -0.116471f,
+ -0.136667f,
+ -0.153046f,
+ -0.151783f,
+ -0.150029f,
+ -0.148067f,
+ -0.146183f,
+ -0.144317f,
+ -0.141058f,
+ -0.136533f,
+ -0.130463f,
+ -0.122971f,
+ -0.111671f,
+ -0.097296f,
+ -0.080742f,
+ -0.063517f,
+ -0.045054f,
+ -0.025262f,
+ -0.005175f,
+ 0.014367f,
+ 0.033233f,
+ 0.052296f,
+ 0.072992f,
+ 0.091296f,
+ 0.107113f,
+ 0.121479f,
+ 0.134563f,
+ 0.144496f,
+ 0.149517f,
+ 0.153242f,
+ 0.156558f,
+ 0.159321f,
+ 0.161337f,
+ 0.161492f,
+ 0.160321f,
+ 0.155837f,
+ 0.145392f,
+ 0.134004f,
+ 0.120096f,
+ 0.104746f,
+ 0.087554f,
+ 0.067846f,
+ 0.050463f,
+ 0.027771f,
+ 0.009567f,
+ -0.009992f,
+ -0.028588f,
+ -0.045892f,
+ -0.063488f,
+ -0.079521f,
+ -0.105221f,
+ -0.124021f,
+ -0.136129f,
+ -0.135704f,
+ -0.133667f,
+ -0.131375f,
+ -0.129037f,
+ -0.126296f,
+ -0.122829f,
+ -0.116500f,
+ -0.108083f,
+ -0.096200f,
+ -0.082838f,
+ -0.067067f,
+ -0.050033f,
+ -0.031867f,
+ -0.011408f,
+ 0.009867f,
+ 0.031762f,
+ 0.053292f,
+ 0.074400f,
+ 0.095050f,
+ 0.114475f,
+ 0.132867f,
+ 0.150521f,
+ 0.165646f,
+ 0.177329f,
+ 0.185188f,
+ 0.191892f,
+ 0.197104f,
+ 0.201033f,
+ 0.202817f,
+ 0.204450f,
+ 0.204063f,
+ 0.202087f,
+ 0.189988f,
+ 0.176517f,
+ 0.162467f,
+ 0.146779f,
+ 0.129346f,
+ 0.107063f,
+ 0.089571f,
+ 0.069588f,
+ 0.047767f,
+ 0.023279f,
+ 0.000196f,
+ -0.019179f,
+ -0.034037f,
+ -0.054967f,
+ -0.079596f,
+ -0.100554f,
+ -0.111979f,
+ -0.114521f,
+ -0.115446f,
+ -0.113521f,
+ -0.111408f,
+ -0.108442f,
+ -0.104308f,
+ -0.099183f,
+ -0.092604f,
+ -0.082592f,
+ -0.069650f,
+ -0.054417f,
+ -0.038588f,
+ -0.019358f,
+ 0.001258f,
+ 0.024129f,
+ 0.046021f,
+ 0.069358f,
+ 0.091487f,
+ 0.112800f,
+ 0.132454f,
+ 0.151158f,
+ 0.168754f,
+ 0.185312f,
+ 0.200329f,
+ 0.213421f,
+ 0.223142f,
+ 0.229183f,
+ 0.232767f,
+ 0.234912f,
+ 0.236625f,
+ 0.237879f,
+ 0.238775f,
+ 0.237917f,
+ 0.235550f,
+ 0.218558f,
+ 0.200483f,
+ 0.176925f,
+ 0.164813f,
+ 0.149033f,
+ 0.134008f,
+ 0.116667f,
+ 0.092329f,
+ 0.071433f,
+ 0.047083f,
+ 0.029975f,
+ 0.006342f,
+ -0.013529f,
+ -0.031417f,
+ -0.048229f,
+ -0.061079f,
+ -0.071333f,
+ -0.072996f,
+ -0.073000f,
+ -0.070971f,
+ -0.068783f,
+ -0.065958f,
+ -0.062367f,
+ -0.057850f,
+ -0.051437f,
+ -0.041854f,
+ -0.028063f,
+ -0.012875f,
+ 0.003692f,
+ 0.021171f,
+ 0.038296f,
+ 0.057283f,
+ 0.075171f,
+ 0.093454f,
+ 0.110217f,
+ 0.125629f,
+ 0.141971f,
+ 0.155808f,
+ 0.168338f,
+ 0.176158f,
+ 0.180908f,
+ 0.183325f,
+ 0.185525f,
+ 0.187408f,
+ 0.188883f,
+ 0.187021f,
+ 0.179654f,
+ 0.172113f,
+ 0.158304f,
+ 0.145658f,
+ 0.121292f,
+ 0.101025f,
+ 0.074067f,
+ 0.052346f,
+ 0.024638f,
+ -0.000046f,
+ -0.024521f,
+ -0.044913f,
+ -0.070592f,
+ -0.098650f,
+ -0.120737f,
+ -0.138300f,
+ -0.156804f,
+ -0.174137f,
+ -0.184421f,
+ -0.184571f,
+ -0.184275f,
+ -0.181246f,
+ -0.176904f,
+ -0.171858f,
+ -0.164787f,
+ -0.155758f,
+ -0.143475f,
+ -0.127400f,
+ -0.108087f,
+ -0.085775f,
+ -0.062129f,
+ -0.037875f,
+ -0.012575f,
+ 0.012158f,
+ 0.037600f,
+ 0.062804f,
+ 0.086596f,
+ 0.110592f,
+ 0.132708f,
+ 0.155188f,
+ 0.174821f,
+ 0.191325f,
+ 0.205438f,
+ 0.215879f,
+ 0.224200f,
+ 0.228833f,
+ 0.232162f,
+ 0.234792f,
+ 0.235742f,
+ 0.234038f,
+ 0.231838f,
+ 0.229500f,
+ 0.220650f,
+ 0.202029f,
+ 0.178617f,
+ 0.157675f,
+ 0.141896f,
+ 0.131292f,
+ 0.118896f,
+ 0.099233f,
+ 0.077979f,
+ 0.064763f,
+ 0.059771f,
+ 0.054675f,
+ 0.049708f,
+ 0.048971f,
+ 0.049308f,
+ 0.051375f,
+ 0.052492f,
+ 0.057529f,
+ 0.064421f,
+ 0.076388f,
+ 0.089646f,
+ 0.104667f,
+ 0.122233f,
+ 0.146858f,
+ 0.172438f,
+ 0.190521f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.197400f,
+ 0.016680f,
+ -0.164040f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.344760f,
+ -0.343070f,
+ -0.334270f,
+ -0.314320f,
+ -0.284530f,
+ -0.251020f,
+ -0.219943f,
+ -0.190600f,
+ -0.162303f,
+ -0.133627f,
+ -0.105723f,
+ -0.080613f,
+ -0.056410f,
+ -0.035360f,
+ -0.016353f,
+ -0.002393f,
+ 0.009123f,
+ 0.017820f,
+ 0.024767f,
+ 0.028623f,
+ 0.031227f,
+ 0.033153f,
+ 0.035370f,
+ 0.036177f,
+ 0.036757f,
+ 0.037053f,
+ 0.018450f,
+ -0.005803f,
+ -0.033067f,
+ -0.050263f,
+ -0.071073f,
+ -0.097487f,
+ -0.124947f,
+ -0.146477f,
+ -0.161830f,
+ -0.171903f,
+ -0.193157f,
+ -0.214873f,
+ -0.231150f,
+ -0.233083f,
+ -0.232833f,
+ -0.232393f,
+ -0.231750f,
+ -0.229053f,
+ -0.225483f,
+ -0.221370f,
+ -0.217050f,
+ -0.210877f,
+ -0.201430f,
+ -0.185593f,
+ -0.166410f,
+ -0.144330f,
+ -0.125850f,
+ -0.107980f,
+ -0.088663f,
+ -0.064727f,
+ -0.040013f,
+ -0.017780f,
+ 0.001297f,
+ 0.019540f,
+ 0.036303f,
+ 0.050110f,
+ 0.061083f,
+ 0.068973f,
+ 0.075370f,
+ 0.079997f,
+ 0.083803f,
+ 0.086567f,
+ 0.085953f,
+ 0.084903f,
+ 0.078770f,
+ 0.065850f,
+ 0.047703f,
+ 0.022947f,
+ 0.002463f,
+ -0.020557f,
+ -0.037000f,
+ -0.062023f,
+ -0.087803f,
+ -0.126613f,
+ -0.154720f,
+ -0.177603f,
+ -0.193743f,
+ -0.212400f,
+ -0.235033f,
+ -0.250700f,
+ -0.265277f,
+ -0.274827f,
+ -0.280840f,
+ -0.284800f,
+ -0.286133f,
+ -0.286070f,
+ -0.282973f,
+ -0.279017f,
+ -0.273030f,
+ -0.265330f,
+ -0.254317f,
+ -0.240963f,
+ -0.224503f,
+ -0.206417f,
+ -0.186710f,
+ -0.166253f,
+ -0.145197f,
+ -0.124207f,
+ -0.101993f,
+ -0.080593f,
+ -0.059847f,
+ -0.039897f,
+ -0.020817f,
+ -0.003687f,
+ 0.009373f,
+ 0.019793f,
+ 0.026977f,
+ 0.032270f,
+ 0.035910f,
+ 0.039310f,
+ 0.042173f,
+ 0.044383f,
+ 0.044593f,
+ 0.044427f,
+ 0.036290f,
+ 0.026150f,
+ 0.007893f,
+ -0.014073f,
+ -0.040923f,
+ -0.059710f,
+ -0.070993f,
+ -0.082970f,
+ -0.103010f,
+ -0.123853f,
+ -0.141607f,
+ -0.161420f,
+ -0.178947f,
+ -0.190597f,
+ -0.191910f,
+ -0.190500f,
+ -0.190443f,
+ -0.190110f,
+ -0.189113f,
+ -0.185957f,
+ -0.181660f,
+ -0.176987f,
+ -0.168097f,
+ -0.156253f,
+ -0.139797f,
+ -0.122577f,
+ -0.103423f,
+ -0.083000f,
+ -0.061397f,
+ -0.038503f,
+ -0.014923f,
+ 0.009297f,
+ 0.033143f,
+ 0.056333f,
+ 0.078820f,
+ 0.101327f,
+ 0.121100f,
+ 0.140030f,
+ 0.154433f,
+ 0.166563f,
+ 0.174710f,
+ 0.180957f,
+ 0.185917f,
+ 0.189210f,
+ 0.191197f,
+ 0.192007f,
+ 0.192453f,
+ 0.191920f,
+ 0.174567f,
+ 0.150207f,
+ 0.127123f,
+ 0.114867f,
+ 0.100477f,
+ 0.085917f,
+ 0.054597f,
+ 0.023580f,
+ -0.007383f,
+ -0.025853f,
+ -0.038023f,
+ -0.052940f,
+ -0.061967f,
+ -0.084890f,
+ -0.107443f,
+ -0.125373f,
+ -0.128317f,
+ -0.128613f,
+ -0.132203f,
+ -0.133950f,
+ -0.134970f,
+ -0.131800f,
+ -0.127640f,
+ -0.120840f,
+ -0.112083f,
+ -0.099720f,
+ -0.085733f,
+ -0.069973f,
+ -0.052427f,
+ -0.033450f,
+ -0.013043f,
+ 0.006737f,
+ 0.026493f,
+ 0.046050f,
+ 0.066073f,
+ 0.084317f,
+ 0.101923f,
+ 0.117030f,
+ 0.129597f,
+ 0.139523f,
+ 0.146797f,
+ 0.152807f,
+ 0.156800f,
+ 0.156787f,
+ 0.155983f,
+ 0.154840f,
+ 0.156173f,
+ 0.157330f,
+ 0.146343f,
+ 0.128337f,
+ 0.103803f,
+ 0.086610f,
+ 0.075050f,
+ 0.057363f,
+ 0.035157f,
+ 0.008783f,
+ -0.011530f,
+ -0.032217f,
+ -0.054423f,
+ -0.077447f,
+ -0.093503f,
+ -0.108857f,
+ -0.122713f,
+ -0.137947f,
+ -0.146713f,
+ -0.149290f,
+ -0.147590f,
+ -0.145567f,
+ -0.142960f,
+ -0.139377f,
+ -0.134757f,
+ -0.128413f,
+ -0.118863f,
+ -0.105183f,
+ -0.088013f,
+ -0.069543f,
+ -0.049477f,
+ -0.028427f,
+ -0.006097f,
+ 0.016580f,
+ 0.040373f,
+ 0.063693f,
+ 0.087433f,
+ 0.109673f,
+ 0.131890f,
+ 0.152397f,
+ 0.172023f,
+ 0.190077f,
+ 0.206597f,
+ 0.220310f,
+ 0.232083f,
+ 0.240107f,
+ 0.247453f,
+ 0.252967f,
+ 0.257870f,
+ 0.258010f,
+ 0.253383f,
+ 0.248497f,
+ 0.243050f,
+ 0.236050f,
+ 0.219163f,
+ 0.202917f,
+ 0.187700f,
+ 0.178020f,
+ 0.158913f,
+ 0.134237f,
+ 0.109480f,
+ 0.092880f,
+ 0.079747f,
+ 0.061847f,
+ 0.041647f,
+ 0.026230f,
+ 0.011213f,
+ 0.001027f,
+ -0.008977f,
+ -0.012470f,
+ -0.014587f,
+ -0.015267f,
+ -0.013323f,
+ -0.010233f,
+ -0.006133f,
+ -0.001750f,
+ 0.004530f,
+ 0.011247f,
+ 0.022300f,
+ 0.033310f,
+ 0.048323f,
+ 0.061987f,
+ 0.078030f,
+ 0.093030f,
+ 0.108597f,
+ 0.123313f,
+ 0.137127f,
+ 0.150250f,
+ 0.160807f,
+ 0.168963f,
+ 0.174587f,
+ 0.179343f,
+ 0.183197f,
+ 0.186420f,
+ 0.188790f,
+ 0.191177f,
+ 0.193490f,
+ 0.195307f,
+ 0.182913f,
+ 0.161617f,
+ 0.138233f,
+ 0.120073f,
+ 0.107333f,
+ 0.086323f,
+ 0.064377f,
+ 0.040657f,
+ 0.015940f,
+ -0.007763f,
+ -0.034127f,
+ -0.057190f,
+ -0.080523f,
+ -0.102780f,
+ -0.123013f,
+ -0.142913f,
+ -0.160363f,
+ -0.182720f,
+ -0.201500f,
+ -0.216170f,
+ -0.219707f,
+ -0.218200f,
+ -0.216447f,
+ -0.214313f,
+ -0.211937f,
+ -0.207707f,
+ -0.203327f,
+ -0.196497f,
+ -0.187427f,
+ -0.174407f,
+ -0.159110f,
+ -0.141770f,
+ -0.122737f,
+ -0.102657f,
+ -0.081833f,
+ -0.061400f,
+ -0.039617f,
+ -0.018130f,
+ 0.002693f,
+ 0.021680f,
+ 0.039823f,
+ 0.056363f,
+ 0.068897f,
+ 0.078000f,
+ 0.084303f,
+ 0.090420f,
+ 0.094940f,
+ 0.098980f,
+ 0.101733f,
+ 0.103033f,
+ 0.103710f,
+ 0.100530f,
+ 0.095713f,
+ 0.081157f,
+ 0.063230f,
+ 0.043437f,
+ 0.031573f,
+ 0.018110f,
+ 0.000307f,
+ -0.019567f,
+ -0.037650f,
+ -0.052083f,
+ -0.066313f,
+ -0.079493f,
+ -0.095883f,
+ -0.109270f,
+ -0.116810f,
+ -0.116237f,
+ -0.115720f,
+ -0.115057f,
+ -0.114380f,
+ -0.110240f,
+ -0.105840f,
+ -0.098747f,
+ -0.092200f,
+ -0.081353f,
+ -0.069297f,
+ -0.053467f,
+ -0.035950f,
+ -0.016617f,
+ 0.003680f,
+ 0.023697f,
+ 0.044483f,
+ 0.064877f,
+ 0.085070f,
+ 0.103847f,
+ 0.122567f,
+ 0.139437f,
+ 0.155753f,
+ 0.168897f,
+ 0.179127f,
+ 0.186627f,
+ 0.191790f,
+ 0.196087f,
+ 0.198677f,
+ 0.200843f,
+ 0.201320f,
+ 0.200210f,
+ 0.195623f,
+ 0.180320f,
+ 0.159827f,
+ 0.134933f,
+ 0.117457f,
+ 0.101413f,
+ 0.081493f,
+ 0.060027f,
+ 0.033307f,
+ 0.014270f,
+ -0.011350f,
+ -0.031600f,
+ -0.057363f,
+ -0.073480f,
+ -0.089933f,
+ -0.101747f,
+ -0.126243f,
+ -0.147400f,
+ -0.163767f,
+ -0.165763f,
+ -0.166520f,
+ -0.167027f,
+ -0.165707f,
+ -0.163290f,
+ -0.160853f,
+ -0.157203f,
+ -0.151933f,
+ -0.145337f,
+ -0.136603f,
+ -0.125967f,
+ -0.112330f,
+ -0.098487f,
+ -0.082533f,
+ -0.066513f,
+ -0.050280f,
+ -0.034537f,
+ -0.018200f,
+ -0.003090f,
+ 0.011227f,
+ 0.021857f,
+ 0.031957f,
+ 0.038750f,
+ 0.044723f,
+ 0.048860f,
+ 0.051567f,
+ 0.051930f,
+ 0.051773f,
+ 0.048057f,
+ 0.045683f,
+ 0.040353f,
+ 0.026573f,
+ 0.011463f,
+ -0.006137f,
+ -0.021510f,
+ -0.040957f,
+ -0.062693f,
+ -0.080757f,
+ -0.099330f,
+ -0.118027f,
+ -0.138647f,
+ -0.160343f,
+ -0.179023f,
+ -0.198583f,
+ -0.213887f,
+ -0.233223f,
+ -0.245813f,
+ -0.257190f,
+ -0.259667f,
+ -0.259887f,
+ -0.258180f,
+ -0.257287f,
+ -0.255493f,
+ -0.252377f,
+ -0.248023f,
+ -0.241683f,
+ -0.234930f,
+ -0.223363f,
+ -0.208773f,
+ -0.191363f,
+ -0.172980f,
+ -0.157160f,
+ -0.138720f,
+ -0.120087f,
+ -0.099857f,
+ -0.081073f,
+ -0.062783f,
+ -0.044690f,
+ -0.028763f,
+ -0.014057f,
+ -0.002027f,
+ 0.008400f,
+ 0.015593f,
+ 0.021123f,
+ 0.025077f,
+ 0.027797f,
+ 0.030177f,
+ 0.032103f,
+ 0.031723f,
+ 0.030440f,
+ 0.024530f,
+ 0.008147f,
+ -0.012347f,
+ -0.030883f,
+ -0.045593f,
+ -0.059190f,
+ -0.077623f,
+ -0.097893f,
+ -0.122543f,
+ -0.144777f,
+ -0.162593f,
+ -0.176007f,
+ -0.188247f,
+ -0.203933f,
+ -0.221967f,
+ -0.242863f,
+ -0.254347f,
+ -0.259697f,
+ -0.258117f,
+ -0.256110f,
+ -0.253837f,
+ -0.251203f,
+ -0.247567f,
+ -0.243480f,
+ -0.236293f,
+ -0.226930f,
+ -0.213993f,
+ -0.199923f,
+ -0.183650f,
+ -0.165663f,
+ -0.146753f,
+ -0.126177f,
+ -0.105420f,
+ -0.083637f,
+ -0.064017f,
+ -0.044257f,
+ -0.026597f,
+ -0.007540f,
+ 0.008013f,
+ 0.022890f,
+ 0.032380f,
+ 0.040720f,
+ 0.045547f,
+ 0.049563f,
+ 0.052290f,
+ 0.054650f,
+ 0.056737f,
+ 0.058377f,
+ 0.059800f,
+ 0.057503f,
+ 0.041973f,
+ 0.021397f,
+ 0.002640f,
+ -0.012280f,
+ -0.029587f,
+ -0.049200f,
+ -0.067223f,
+ -0.091630f,
+ -0.113607f,
+ -0.133657f,
+ -0.146300f,
+ -0.163280f,
+ -0.178763f,
+ -0.197653f,
+ -0.212650f,
+ -0.223260f,
+ -0.226017f,
+ -0.226493f,
+ -0.226800f,
+ -0.224750f,
+ -0.222667f,
+ -0.218503f,
+ -0.213740f,
+ -0.206710f,
+ -0.198850f,
+ -0.187620f,
+ -0.172660f,
+ -0.156700f,
+ -0.138083f,
+ -0.118960f,
+ -0.097527f,
+ -0.076340f,
+ -0.055000f,
+ -0.034457f,
+ -0.013977f,
+ 0.007147f,
+ 0.026707f,
+ 0.045197f,
+ 0.059710f,
+ 0.074260f,
+ 0.085180f,
+ 0.093520f,
+ 0.099483f,
+ 0.103960f,
+ 0.107907f,
+ 0.110487f,
+ 0.112777f,
+ 0.114843f,
+ 0.113230f,
+ 0.106633f,
+ 0.091727f,
+ 0.076593f,
+ 0.061570f,
+ 0.047160f,
+ 0.029090f,
+ 0.009707f,
+ -0.006827f,
+ -0.021907f,
+ -0.042533f,
+ -0.066243f,
+ -0.085710f,
+ -0.100290f,
+ -0.108260f,
+ -0.125890f,
+ -0.139587f,
+ -0.152727f,
+ -0.154593f,
+ -0.153643f,
+ -0.151913f,
+ -0.149940f,
+ -0.147737f,
+ -0.144763f,
+ -0.141037f,
+ -0.135437f,
+ -0.128350f,
+ -0.116220f,
+ -0.103900f,
+ -0.087847f,
+ -0.072517f,
+ -0.054017f,
+ -0.036623f,
+ -0.018397f,
+ -0.000547f,
+ 0.017140f,
+ 0.033670f,
+ 0.048970f,
+ 0.061770f,
+ 0.071220f,
+ 0.079240f,
+ 0.085597f,
+ 0.090923f,
+ 0.094233f,
+ 0.097060f,
+ 0.099250f,
+ 0.099263f,
+ 0.097387f,
+ 0.094057f,
+ 0.085227f,
+ 0.068190f,
+ 0.049547f,
+ 0.029667f,
+ 0.012463f,
+ -0.006293f,
+ -0.029143f,
+ -0.052553f,
+ -0.078117f,
+ -0.099007f,
+ -0.114067f,
+ -0.126690f,
+ -0.146427f,
+ -0.172027f,
+ -0.200137f,
+ -0.214487f,
+ -0.221133f,
+ -0.220807f,
+ -0.219040f,
+ -0.216987f,
+ -0.214693f,
+ -0.211880f,
+ -0.207703f,
+ -0.202193f,
+ -0.193717f,
+ -0.181327f,
+ -0.165293f,
+ -0.146743f,
+ -0.126593f,
+ -0.104430f,
+ -0.081583f,
+ -0.057457f,
+ -0.033070f,
+ -0.008590f,
+ 0.015273f,
+ 0.038800f,
+ 0.062193f,
+ 0.084170f,
+ 0.104950f,
+ 0.123967f,
+ 0.140580f,
+ 0.153567f,
+ 0.164170f,
+ 0.173353f,
+ 0.180770f,
+ 0.186103f,
+ 0.189540f,
+ 0.192487f,
+ 0.192830f,
+ 0.188180f,
+ 0.183080f,
+ 0.177713f,
+ 0.172247f,
+ 0.158007f,
+ 0.140183f,
+ 0.117780f,
+ 0.101753f,
+ 0.087447f,
+ 0.079440f,
+ 0.067090f,
+ 0.057417f,
+ 0.033930f,
+ 0.014533f,
+ -0.005327f,
+ -0.010057f,
+ -0.011907f,
+ -0.012997f,
+ -0.012407f,
+ -0.011417f,
+ -0.008907f,
+ -0.004720f,
+ 0.000033f,
+ 0.006930f,
+ 0.015720f,
+ 0.027400f,
+ 0.042023f,
+ 0.058933f,
+ 0.078540f,
+ 0.097157f,
+ 0.115987f,
+ 0.134953f,
+ 0.155087f,
+ 0.174877f,
+ 0.192607f,
+ 0.211137f,
+ 0.228410f,
+ 0.243330f,
+ 0.254023f,
+ 0.260873f,
+ 0.266893f,
+ 0.271277f,
+ 0.274913f,
+ 0.277250f,
+ 0.279047f,
+ 0.279887f,
+ 0.280390f,
+ 0.276893f,
+ 0.265580f,
+ 0.250283f,
+ 0.227807f,
+ 0.203713f,
+ 0.178540f,
+ 0.155480f,
+ 0.134243f,
+ 0.109440f,
+ 0.084940f,
+ 0.062677f,
+ 0.042733f,
+ 0.019733f,
+ -0.009813f,
+ -0.039253f,
+ -0.063333f,
+ -0.076780f,
+ -0.089383f,
+ -0.106437f,
+ -0.123787f,
+ -0.135700f,
+ -0.137773f,
+ -0.137343f,
+ -0.136577f,
+ -0.134150f,
+ -0.130950f,
+ -0.127477f,
+ -0.123397f,
+ -0.118067f,
+ -0.110113f,
+ -0.100493f,
+ -0.088753f,
+ -0.075743f,
+ -0.060853f,
+ -0.044600f,
+ -0.028550f,
+ -0.012307f,
+ 0.002657f,
+ 0.016450f,
+ 0.028977f,
+ 0.038847f,
+ 0.046673f,
+ 0.052237f,
+ 0.056990f,
+ 0.060893f,
+ 0.063513f,
+ 0.065190f,
+ 0.066133f,
+ 0.066017f,
+ 0.065670f,
+ 0.063920f,
+ 0.057993f,
+ 0.041740f,
+ 0.020830f,
+ 0.001113f,
+ -0.011460f,
+ -0.029090f,
+ -0.046467f,
+ -0.069320f,
+ -0.083150f,
+ -0.100300f,
+ -0.120930f,
+ -0.140777f,
+ -0.154850f,
+ -0.170423f,
+ -0.186193f,
+ -0.201177f,
+ -0.203153f,
+ -0.203043f,
+ -0.202420f,
+ -0.200740f,
+ -0.198777f,
+ -0.196500f,
+ -0.193333f,
+ -0.188423f,
+ -0.181823f,
+ -0.171630f,
+ -0.158497f,
+ -0.142057f,
+ -0.123433f,
+ -0.103773f,
+ -0.082453f,
+ -0.063350f,
+ -0.041697f,
+ -0.020657f,
+ 0.002243f,
+ 0.022453f,
+ 0.041987f,
+ 0.059600f,
+ 0.077603f,
+ 0.093577f,
+ 0.106797f,
+ 0.116113f,
+ 0.122323f,
+ 0.127327f,
+ 0.130310f,
+ 0.132930f,
+ 0.135147f,
+ 0.134410f,
+ 0.133207f,
+ 0.128810f,
+ 0.120907f,
+ 0.107897f,
+ 0.092807f,
+ 0.078820f,
+ 0.060377f,
+ 0.040210f,
+ 0.016747f,
+ -0.002623f,
+ -0.023280f,
+ -0.041253f,
+ -0.057640f,
+ -0.076213f,
+ -0.091107f,
+ -0.110053f,
+ -0.123513f,
+ -0.138883f,
+ -0.147740f,
+ -0.152723f,
+ -0.153587f,
+ -0.152633f,
+ -0.150467f,
+ -0.148183f,
+ -0.144197f,
+ -0.139467f,
+ -0.131193f,
+ -0.122387f,
+ -0.109257f,
+ -0.094943f,
+ -0.078120f,
+ -0.062123f,
+ -0.044990f,
+ -0.027013f,
+ -0.008763f,
+ 0.009937f,
+ 0.028330f,
+ 0.046563f,
+ 0.061920f,
+ 0.073950f,
+ 0.083677f,
+ 0.090743f,
+ 0.096660f,
+ 0.100920f,
+ 0.104373f,
+ 0.107017f,
+ 0.109133f,
+ 0.109947f,
+ 0.110320f,
+ 0.107527f,
+ 0.095537f,
+ 0.081050f,
+ 0.057153f,
+ 0.038147f,
+ 0.016957f,
+ -0.001020f,
+ -0.019327f,
+ -0.043290f,
+ -0.062450f,
+ -0.086730f,
+ -0.107130f,
+ -0.128097f,
+ -0.143533f,
+ -0.160427f,
+ -0.179107f,
+ -0.196577f,
+ -0.207710f,
+ -0.212357f,
+ -0.213143f,
+ -0.212133f,
+ -0.211880f,
+ -0.210717f,
+ -0.208100f,
+ -0.204063f,
+ -0.197427f,
+ -0.190713f,
+ -0.178340f,
+ -0.164043f,
+ -0.145790f,
+ -0.126800f,
+ -0.106393f,
+ -0.084107f,
+ -0.062160f,
+ -0.039587f,
+ -0.017657f,
+ 0.004810f,
+ 0.026360f,
+ 0.046913f,
+ 0.066680f,
+ 0.085140f,
+ 0.101280f,
+ 0.113883f,
+ 0.121843f,
+ 0.128520f,
+ 0.133087f,
+ 0.137483f,
+ 0.140053f,
+ 0.142093f,
+ 0.144067f,
+ 0.145767f,
+ 0.142817f,
+ 0.133690f,
+ 0.117690f,
+ 0.100667f,
+ 0.085707f,
+ 0.069240f,
+ 0.055860f,
+ 0.034393f,
+ 0.016487f,
+ -0.003410f,
+ -0.018723f,
+ -0.030713f,
+ -0.048943f,
+ -0.062223f,
+ -0.075550f,
+ -0.078557f,
+ -0.079063f,
+ -0.078003f,
+ -0.076343f,
+ -0.074503f,
+ -0.071390f,
+ -0.067613f,
+ -0.062140f,
+ -0.056073f,
+ -0.047580f,
+ -0.036530f,
+ -0.023093f,
+ -0.005623f,
+ 0.012537f,
+ 0.031250f,
+ 0.048193f,
+ 0.066323f,
+ 0.085580f,
+ 0.104740f,
+ 0.122127f,
+ 0.138423f,
+ 0.153227f,
+ 0.165960f,
+ 0.175567f,
+ 0.182053f,
+ 0.186427f,
+ 0.190267f,
+ 0.193630f,
+ 0.196107f,
+ 0.196130f,
+ 0.195757f,
+ 0.195513f,
+ 0.186457f,
+ 0.171373f,
+ 0.154773f,
+ 0.139127f,
+ 0.123320f,
+ 0.101680f,
+ 0.079057f,
+ 0.059193f,
+ 0.034350f,
+ 0.016823f,
+ -0.008830f,
+ -0.027817f,
+ -0.051687f,
+ -0.066327f,
+ -0.081517f,
+ -0.096053f,
+ -0.111803f,
+ -0.121230f,
+ -0.124967f,
+ -0.126893f,
+ -0.128317f,
+ -0.127820f,
+ -0.124890f,
+ -0.121713f,
+ -0.116147f,
+ -0.109153f,
+ -0.097627f,
+ -0.084977f,
+ -0.069753f,
+ -0.051773f,
+ -0.031620f,
+ -0.010547f,
+ 0.010503f,
+ 0.031243f,
+ 0.052160f,
+ 0.071500f,
+ 0.090250f,
+ 0.109143f,
+ 0.126230f,
+ 0.141227f,
+ 0.152507f,
+ 0.160777f,
+ 0.167183f,
+ 0.172547f,
+ 0.176980f,
+ 0.180013f,
+ 0.181910f,
+ 0.183383f,
+ 0.184813f,
+ 0.184683f,
+ 0.180580f,
+ 0.171123f,
+ 0.151180f,
+ 0.131123f,
+ 0.105727f,
+ 0.089247f,
+ 0.069227f,
+ 0.054697f,
+ 0.034903f,
+ 0.015277f,
+ -0.004053f,
+ -0.024230f,
+ -0.042860f,
+ -0.059283f,
+ -0.074333f,
+ -0.083817f,
+ -0.093010f,
+ -0.095257f,
+ -0.097090f,
+ -0.096287f,
+ -0.093737f,
+ -0.090477f,
+ -0.086497f,
+ -0.082020f,
+ -0.075537f,
+ -0.068227f,
+ -0.058670f,
+ -0.047200f,
+ -0.033320f,
+ -0.018413f,
+ -0.000620f,
+ 0.015817f,
+ 0.031770f,
+ 0.045743f,
+ 0.060423f,
+ 0.075593f,
+ 0.087863f,
+ 0.097123f,
+ 0.102753f,
+ 0.108280f,
+ 0.113730f,
+ 0.118567f,
+ 0.121000f,
+ 0.122293f,
+ 0.123180f,
+ 0.123530f,
+ 0.121240f,
+ 0.107877f,
+ 0.090797f,
+ 0.071443f,
+ 0.055393f,
+ 0.036550f,
+ 0.016157f,
+ -0.006457f,
+ -0.029683f,
+ -0.052640f,
+ -0.077903f,
+ -0.102043f,
+ -0.128977f,
+ -0.147530f,
+ -0.168220f,
+ -0.182360f,
+ -0.202020f,
+ -0.223403f,
+ -0.245877f,
+ -0.259307f,
+ -0.262927f,
+ -0.262627f,
+ -0.262017f,
+ -0.261123f,
+ -0.259900f,
+ -0.257670f,
+ -0.254223f,
+ -0.250640f,
+ -0.244883f,
+ -0.238017f,
+ -0.226147f,
+ -0.212567f,
+ -0.195643f,
+ -0.178697f,
+ -0.162050f,
+ -0.145967f,
+ -0.129280f,
+ -0.112150f,
+ -0.095090f,
+ -0.081637f,
+ -0.069360f,
+ -0.061427f,
+ -0.053753f,
+ -0.048780f,
+ -0.044143f,
+ -0.041287f,
+ -0.039280f,
+ -0.037413f,
+ -0.036160f,
+ -0.035147f,
+ -0.035560f,
+ -0.042337f,
+ -0.051733f,
+ -0.068103f,
+ -0.089127f,
+ -0.108170f,
+ -0.123843f,
+ -0.135450f,
+ -0.159263f,
+ -0.181880f,
+ -0.203767f,
+ -0.217237f,
+ -0.232250f,
+ -0.250683f,
+ -0.270730f,
+ -0.287237f,
+ -0.294127f,
+ -0.295777f,
+ -0.295747f,
+ -0.295177f,
+ -0.293227f,
+ -0.290860f,
+ -0.288440f,
+ -0.284640f,
+ -0.279860f,
+ -0.273137f,
+ -0.265137f,
+ -0.253890f,
+ -0.239050f,
+ -0.220417f,
+ -0.200223f,
+ -0.180607f,
+ -0.161523f,
+ -0.142550f,
+ -0.123507f,
+ -0.104443f,
+ -0.085240f,
+ -0.067373f,
+ -0.050673f,
+ -0.038433f,
+ -0.028137f,
+ -0.021113f,
+ -0.015133f,
+ -0.010700f,
+ -0.007913f,
+ -0.005650f,
+ -0.004373f,
+ -0.004103f,
+ -0.006327f,
+ -0.009973f,
+ -0.022733f,
+ -0.036303f,
+ -0.051563f,
+ -0.068343f,
+ -0.089593f,
+ -0.111040f,
+ -0.128573f,
+ -0.146987f,
+ -0.167090f,
+ -0.189740f,
+ -0.205757f,
+ -0.226450f,
+ -0.240073f,
+ -0.258190f,
+ -0.271883f,
+ -0.285203f,
+ -0.293207f,
+ -0.295583f,
+ -0.295463f,
+ -0.294023f,
+ -0.291997f,
+ -0.288297f,
+ -0.284690f,
+ -0.278187f,
+ -0.271757f,
+ -0.259793f,
+ -0.246917f,
+ -0.229647f,
+ -0.212483f,
+ -0.192393f,
+ -0.171410f,
+ -0.148473f,
+ -0.126597f,
+ -0.105657f,
+ -0.085187f,
+ -0.065380f,
+ -0.044520f,
+ -0.027420f,
+ -0.011580f,
+ -0.000237f,
+ 0.009470f,
+ 0.015397f,
+ 0.020023f,
+ 0.023390f,
+ 0.026627f,
+ 0.028753f,
+ 0.029237f,
+ 0.028270f,
+ 0.021000f,
+ 0.008507f,
+ -0.009657f,
+ -0.028530f,
+ -0.045453f,
+ -0.059727f,
+ -0.074720f,
+ -0.094130f,
+ -0.117177f,
+ -0.136480f,
+ -0.150630f,
+ -0.161073f,
+ -0.178120f,
+ -0.196623f,
+ -0.212013f,
+ -0.216957f,
+ -0.216677f,
+ -0.215017f,
+ -0.212510f,
+ -0.209333f,
+ -0.205677f,
+ -0.200233f,
+ -0.193820f,
+ -0.181820f,
+ -0.168377f,
+ -0.151017f,
+ -0.132647f,
+ -0.111557f,
+ -0.088333f,
+ -0.064573f,
+ -0.039727f,
+ -0.015257f,
+ 0.009123f,
+ 0.033887f,
+ 0.058423f,
+ 0.082203f,
+ 0.105420f,
+ 0.127100f,
+ 0.148123f,
+ 0.167667f,
+ 0.186803f,
+ 0.203190f,
+ 0.215193f,
+ 0.223217f,
+ 0.227910f,
+ 0.231097f,
+ 0.233113f,
+ 0.234713f,
+ 0.235860f,
+ 0.236537f,
+ 0.236783f,
+ 0.233277f,
+ 0.219250f,
+ 0.199683f,
+ 0.179770f,
+ 0.169920f,
+ 0.154943f,
+ 0.139287f,
+ 0.120903f,
+ 0.107867f,
+ 0.096640f,
+ 0.084250f,
+ 0.066853f,
+ 0.051913f,
+ 0.041177f,
+ 0.040860f,
+ 0.039967f,
+ 0.039490f,
+ 0.039433f,
+ 0.041207f,
+ 0.043763f,
+ 0.047407f,
+ 0.051083f,
+ 0.058217f,
+ 0.066663f,
+ 0.080253f,
+ 0.093383f,
+ 0.109567f,
+ 0.124780f,
+ 0.142590f,
+ 0.160907f,
+ 0.181627f,
+ 0.198693f,
+ 0.216070f,
+ 0.230803f,
+ 0.246217f,
+ 0.259357f,
+ 0.268843f,
+ 0.277413f,
+ 0.282300f,
+ 0.286617f,
+ 0.288880f,
+ 0.290950f,
+ 0.292683f,
+ 0.293650f,
+ 0.292063f,
+ 0.285883f,
+ 0.274383f,
+ 0.258240f,
+ 0.239103f,
+ 0.217913f,
+ 0.194003f,
+ 0.173553f,
+ 0.150797f,
+ 0.128517f,
+ 0.106183f,
+ 0.083107f,
+ 0.058880f,
+ 0.034907f,
+ 0.015463f,
+ 0.000887f,
+ -0.022593f,
+ -0.044397f,
+ -0.068010f,
+ -0.080307f,
+ -0.088980f,
+ -0.090427f,
+ -0.090467f,
+ -0.089417f,
+ -0.087430f,
+ -0.084787f,
+ -0.081880f,
+ -0.075977f,
+ -0.069443f,
+ -0.058517f,
+ -0.045920f,
+ -0.030710f,
+ -0.013057f,
+ 0.004690f,
+ 0.025130f,
+ 0.044600f,
+ 0.064000f,
+ 0.083277f,
+ 0.103520f,
+ 0.122063f,
+ 0.139390f,
+ 0.154033f,
+ 0.168493f,
+ 0.180433f,
+ 0.188407f,
+ 0.194597f,
+ 0.198617f,
+ 0.202360f,
+ 0.204437f,
+ 0.205040f,
+ 0.205283f,
+ 0.205110f,
+ 0.201407f,
+ 0.188497f,
+ 0.172893f,
+ 0.158530f,
+ 0.144243f,
+ 0.126993f,
+ 0.109783f,
+ 0.095283f,
+ 0.079907f,
+ 0.058283f,
+ 0.040807f,
+ 0.025027f,
+ 0.010370f,
+ -0.008517f,
+ -0.026510f,
+ -0.037103f,
+ -0.041883f,
+ -0.043010f,
+ -0.043177f,
+ -0.042257f,
+ -0.040047f,
+ -0.036843f,
+ -0.033490f,
+ -0.027607f,
+ -0.021100f,
+ -0.009250f,
+ 0.003890f,
+ 0.020667f,
+ 0.037330f,
+ 0.057197f,
+ 0.076263f,
+ 0.095353f,
+ 0.114580f,
+ 0.133090f,
+ 0.151327f,
+ 0.166327f,
+ 0.183000f,
+ 0.196573f,
+ 0.209323f,
+ 0.217430f,
+ 0.225027f,
+ 0.229493f,
+ 0.233567f,
+ 0.236077f,
+ 0.238043f,
+ 0.238710f,
+ 0.237287f,
+ 0.226617f,
+ 0.209537f,
+ 0.187887f,
+ 0.171260f,
+ 0.158650f,
+ 0.134263f,
+ 0.110527f,
+ 0.086530f,
+ 0.071240f,
+ 0.043853f,
+ 0.016377f,
+ -0.007900f,
+ -0.028977f,
+ -0.049900f,
+ -0.073670f,
+ -0.088597f,
+ -0.106023f,
+ -0.125453f,
+ -0.144333f,
+ -0.158470f,
+ -0.163877f,
+ -0.166340f,
+ -0.167373f,
+ -0.165490f,
+ -0.163010f,
+ -0.160293f,
+ -0.155850f,
+ -0.150573f,
+ -0.143197f,
+ -0.132637f,
+ -0.119263f,
+ -0.104527f,
+ -0.090903f,
+ -0.077160f,
+ -0.062883f,
+ -0.048123f,
+ -0.034083f,
+ -0.020950f,
+ -0.008430f,
+ 0.001640f,
+ 0.010437f,
+ 0.016240f,
+ 0.021257f,
+ 0.024373f,
+ 0.026467f,
+ 0.028300f,
+ 0.029857f,
+ 0.030030f,
+ 0.027917f,
+ 0.019133f,
+ 0.007030f,
+ -0.010893f,
+ -0.026833f,
+ -0.044520f,
+ -0.060547f,
+ -0.078027f,
+ -0.099043f,
+ -0.117513f,
+ -0.139307f,
+ -0.158073f,
+ -0.180960f,
+ -0.202443f,
+ -0.219567f,
+ -0.234137f,
+ -0.248547f,
+ -0.265250f,
+ -0.278563f,
+ -0.285217f,
+ -0.287183f,
+ -0.287107f,
+ -0.285707f,
+ -0.283803f,
+ -0.280970f,
+ -0.276437f,
+ -0.270370f,
+ -0.260817f,
+ -0.248487f,
+ -0.233943f,
+ -0.217807f,
+ -0.199700f,
+ -0.179263f,
+ -0.158453f,
+ -0.137433f,
+ -0.116277f,
+ -0.095537f,
+ -0.075700f,
+ -0.056813f,
+ -0.037270f,
+ -0.020967f,
+ -0.006553f,
+ 0.005163f,
+ 0.015007f,
+ 0.023013f,
+ 0.027217f,
+ 0.030917f,
+ 0.032800f,
+ 0.034490f,
+ 0.034837f,
+ 0.032613f,
+ 0.026113f,
+ 0.013357f,
+ -0.000983f,
+ -0.013840f,
+ -0.028287f,
+ -0.045787f,
+ -0.067257f,
+ -0.083670f,
+ -0.100263f,
+ -0.114220f,
+ -0.133913f,
+ -0.153157f,
+ -0.172963f,
+ -0.188487f,
+ -0.202330f,
+ -0.211890f,
+ -0.217443f,
+ -0.217907f,
+ -0.217643f,
+ -0.215687f,
+ -0.213353f,
+ -0.210207f,
+ -0.205800f,
+ -0.198837f,
+ -0.188950f,
+ -0.174537f,
+ -0.157527f,
+ -0.138737f,
+ -0.119577f,
+ -0.098307f,
+ -0.075870f,
+ -0.053320f,
+ -0.030840f,
+ -0.008210f,
+ 0.014667f,
+ 0.036927f,
+ 0.057343f,
+ 0.076113f,
+ 0.093350f,
+ 0.106850f,
+ 0.118353f,
+ 0.125933f,
+ 0.132373f,
+ 0.136197f,
+ 0.138963f,
+ 0.141560f,
+ 0.141997f,
+ 0.140203f,
+ 0.137933f,
+ 0.135010f,
+ 0.120843f,
+ 0.104660f,
+ 0.086580f,
+ 0.078077f,
+ 0.060540f,
+ 0.039630f,
+ 0.016773f,
+ -0.001407f,
+ -0.019333f,
+ -0.034693f,
+ -0.047500f,
+ -0.063857f,
+ -0.081737f,
+ -0.097033f,
+ -0.102033f,
+ -0.105117f,
+ -0.106803f,
+ -0.107950f,
+ -0.106377f,
+ -0.104103f,
+ -0.100840f,
+ -0.095493f,
+ -0.088217f,
+ -0.077577f,
+ -0.063353f,
+ -0.046790f,
+ -0.027747f,
+ -0.009540f,
+ 0.011370f,
+ 0.032780f,
+ 0.054760f,
+ 0.076143f,
+ 0.096480f,
+ 0.118167f,
+ 0.139557f,
+ 0.159670f,
+ 0.178220f,
+ 0.194360f,
+ 0.208917f,
+ 0.220783f,
+ 0.228953f,
+ 0.235023f,
+ 0.238753f,
+ 0.241880f,
+ 0.243607f,
+ 0.243903f,
+ 0.243833f,
+ 0.243270f,
+ 0.237357f,
+ 0.225627f,
+ 0.210283f,
+ 0.196597f,
+ 0.178467f,
+ 0.157933f,
+ 0.136793f,
+ 0.121073f,
+ 0.100793f,
+ 0.080867f,
+ 0.060147f,
+ 0.042383f,
+ 0.023537f,
+ 0.007863f,
+ -0.008353f,
+ -0.024130f,
+ -0.038363f,
+ -0.044217f,
+ -0.045540f,
+ -0.045527f,
+ -0.044923f,
+ -0.042887f,
+ -0.040517f,
+ -0.038080f,
+ -0.033853f,
+ -0.028547f,
+ -0.019540f,
+ -0.010450f,
+ 0.003167f,
+ 0.017077f,
+ 0.033517f,
+ 0.048653f,
+ 0.064207f,
+ 0.079780f,
+ 0.093640f,
+ 0.108813f,
+ 0.121253f,
+ 0.132797f,
+ 0.140513f,
+ 0.146873f,
+ 0.151380f,
+ 0.153940f,
+ 0.155927f,
+ 0.157573f,
+ 0.156703f,
+ 0.153320f,
+ 0.148713f,
+ 0.139820f,
+ 0.121800f,
+ 0.102983f,
+ 0.085090f,
+ 0.074047f,
+ 0.048717f,
+ 0.023403f,
+ 0.000060f,
+ -0.016453f,
+ -0.039160f,
+ -0.065740f,
+ -0.092107f,
+ -0.112257f,
+ -0.131147f,
+ -0.144617f,
+ -0.163487f,
+ -0.183847f,
+ -0.202633f,
+ -0.211560f,
+ -0.213607f,
+ -0.213083f,
+ -0.211100f,
+ -0.208810f,
+ -0.206277f,
+ -0.202220f,
+ -0.196177f,
+ -0.186183f,
+ -0.174433f,
+ -0.159197f,
+ -0.144203f,
+ -0.125800f,
+ -0.106740f,
+ -0.085343f,
+ -0.063717f,
+ -0.042780f,
+ -0.021357f,
+ -0.000100f,
+ 0.020440f,
+ 0.039783f,
+ 0.057400f,
+ 0.073070f,
+ 0.087330f,
+ 0.097290f,
+ 0.105877f,
+ 0.110357f,
+ 0.114010f,
+ 0.116023f,
+ 0.117753f,
+ 0.118460f,
+ 0.117307f,
+ 0.115490f,
+ 0.107570f,
+ 0.095470f,
+ 0.079383f,
+ 0.064747f,
+ 0.049373f,
+ 0.030203f,
+ 0.009413f,
+ -0.009283f,
+ -0.026133f,
+ -0.043460f,
+ -0.058747f,
+ -0.072673f,
+ -0.089237f,
+ -0.107953f,
+ -0.122497f,
+ -0.127280f,
+ -0.127580f,
+ -0.126723f,
+ -0.125340f,
+ -0.123380f,
+ -0.121127f,
+ -0.117493f,
+ -0.116797f,
+ -0.113946f,
+ -0.109359f,
+ -0.095870f,
+ -0.081500f,
+ -0.064744f,
+ -0.050322f,
+ -0.033748f,
+ -0.017393f,
+ -0.000215f,
+ 0.016944f,
+ 0.033548f,
+ 0.049326f,
+ 0.061507f,
+ 0.070959f,
+ 0.077911f,
+ 0.083448f,
+ 0.087244f,
+ 0.089800f,
+ 0.092163f,
+ 0.094219f,
+ 0.095856f,
+ 0.094726f,
+ 0.088989f,
+ 0.074230f,
+ 0.058793f,
+ 0.040415f,
+ 0.025330f,
+ 0.005748f,
+ -0.018330f,
+ -0.041778f,
+ -0.063681f,
+ -0.087796f,
+ -0.114000f,
+ -0.140437f,
+ -0.164389f,
+ -0.187463f,
+ -0.211219f,
+ -0.231304f,
+ -0.251863f,
+ -0.267911f,
+ -0.286311f,
+ -0.298496f,
+ -0.309370f,
+ -0.310007f,
+ -0.309893f,
+ -0.308411f,
+ -0.306526f,
+ -0.303419f,
+ -0.300263f,
+ -0.295063f,
+ -0.287881f,
+ -0.278396f,
+ -0.265767f,
+ -0.252300f,
+ -0.236207f,
+ -0.219096f,
+ -0.201778f,
+ -0.183737f,
+ -0.166619f,
+ -0.149678f,
+ -0.135019f,
+ -0.119885f,
+ -0.106937f,
+ -0.094137f,
+ -0.086937f,
+ -0.080700f,
+ -0.076922f,
+ -0.073078f,
+ -0.070074f,
+ -0.068070f,
+ -0.068389f,
+ -0.070104f,
+ -0.074922f,
+ -0.081974f,
+ -0.096530f,
+ -0.112296f,
+ -0.129389f,
+ -0.144789f,
+ -0.162137f,
+ -0.178367f,
+ -0.191015f,
+ -0.205174f,
+ -0.227144f,
+ -0.247641f,
+ -0.268493f,
+ -0.281493f,
+ -0.294837f,
+ -0.300189f,
+ -0.301296f,
+ -0.299822f,
+ -0.297863f,
+ -0.295159f,
+ -0.291759f,
+ -0.287622f,
+ -0.282585f,
+ -0.275541f,
+ -0.265770f,
+ -0.252293f,
+ -0.236607f,
+ -0.217007f,
+ -0.196100f,
+ -0.173311f,
+ -0.150300f,
+ -0.126630f,
+ -0.102411f,
+ -0.078159f,
+ -0.054541f,
+ -0.031970f,
+ -0.011396f,
+ 0.010304f,
+ 0.030693f,
+ 0.051130f,
+ 0.066615f,
+ 0.079937f,
+ 0.087656f,
+ 0.093770f,
+ 0.098159f,
+ 0.102256f,
+ 0.105252f,
+ 0.106852f,
+ 0.108104f,
+ 0.106667f,
+ 0.103526f,
+ 0.094381f,
+ 0.082433f,
+ 0.068759f,
+ 0.054333f,
+ 0.036844f,
+ 0.019219f,
+ 0.003444f,
+ -0.011348f,
+ -0.027407f,
+ -0.046467f,
+ -0.060933f,
+ -0.080293f,
+ -0.093781f,
+ -0.105170f,
+ -0.106878f,
+ -0.106300f,
+ -0.104885f,
+ -0.103959f,
+ -0.102189f,
+ -0.099067f,
+ -0.094693f,
+ -0.089048f,
+ -0.082511f,
+ -0.072922f,
+ -0.060356f,
+ -0.043922f,
+ -0.025778f,
+ -0.006859f,
+ 0.012889f,
+ 0.034330f,
+ 0.057085f,
+ 0.079489f,
+ 0.100481f,
+ 0.119241f,
+ 0.138393f,
+ 0.157319f,
+ 0.174074f,
+ 0.188104f,
+ 0.197493f,
+ 0.205637f,
+ 0.209585f,
+ 0.212956f,
+ 0.214904f,
+ 0.216648f,
+ 0.216522f,
+ 0.214859f,
+ 0.210667f,
+ 0.205544f,
+};
diff --git a/motors/pistol_grip/vtable_wheel.cc b/motors/pistol_grip/vtable_wheel0.cc
similarity index 99%
rename from motors/pistol_grip/vtable_wheel.cc
rename to motors/pistol_grip/vtable_wheel0.cc
index 92e9a19..a840128 100644
--- a/motors/pistol_grip/vtable_wheel.cc
+++ b/motors/pistol_grip/vtable_wheel0.cc
@@ -1,5 +1,5 @@
-extern const float kWheelCoggingTorque[4096];
-const float kWheelCoggingTorque[4096] = {
+extern const float kWheelCoggingTorque0[4096];
+const float kWheelCoggingTorque0[4096] = {
-0.161690f,
-0.114243f,
-0.106662f,
@@ -4096,4 +4096,4 @@
-0.182433f,
-0.178810f,
-0.177962f,
-};
\ No newline at end of file
+};
diff --git a/motors/pistol_grip/vtable_wheel1.cc b/motors/pistol_grip/vtable_wheel1.cc
new file mode 100644
index 0000000..4acc47d
--- /dev/null
+++ b/motors/pistol_grip/vtable_wheel1.cc
@@ -0,0 +1,4099 @@
+extern const float kWheelCoggingTorque1[4096];
+const float kWheelCoggingTorque1[4096] = {
+ 0.011700f,
+ -0.001603f,
+ -0.018247f,
+ -0.037706f,
+ -0.054961f,
+ -0.072047f,
+ -0.093239f,
+ -0.115331f,
+ -0.135525f,
+ -0.150347f,
+ -0.164678f,
+ -0.178894f,
+ -0.196842f,
+ -0.213825f,
+ -0.226228f,
+ -0.229914f,
+ -0.229261f,
+ -0.228567f,
+ -0.227528f,
+ -0.226397f,
+ -0.224744f,
+ -0.222606f,
+ -0.219642f,
+ -0.215575f,
+ -0.210458f,
+ -0.203842f,
+ -0.195603f,
+ -0.185269f,
+ -0.173719f,
+ -0.161231f,
+ -0.148767f,
+ -0.135597f,
+ -0.123231f,
+ -0.111097f,
+ -0.101164f,
+ -0.091931f,
+ -0.084619f,
+ -0.078572f,
+ -0.074083f,
+ -0.070275f,
+ -0.066842f,
+ -0.064008f,
+ -0.061917f,
+ -0.060222f,
+ -0.059292f,
+ -0.058761f,
+ -0.058844f,
+ -0.062264f,
+ -0.070742f,
+ -0.086806f,
+ -0.102575f,
+ -0.116581f,
+ -0.126978f,
+ -0.139322f,
+ -0.155300f,
+ -0.169944f,
+ -0.188528f,
+ -0.202392f,
+ -0.217075f,
+ -0.231586f,
+ -0.245431f,
+ -0.256967f,
+ -0.259567f,
+ -0.261381f,
+ -0.262586f,
+ -0.263406f,
+ -0.262975f,
+ -0.261150f,
+ -0.258692f,
+ -0.255356f,
+ -0.250789f,
+ -0.245592f,
+ -0.238856f,
+ -0.231253f,
+ -0.220608f,
+ -0.208008f,
+ -0.193442f,
+ -0.178842f,
+ -0.163836f,
+ -0.148625f,
+ -0.133172f,
+ -0.119831f,
+ -0.107242f,
+ -0.096314f,
+ -0.086144f,
+ -0.077964f,
+ -0.071894f,
+ -0.067106f,
+ -0.063411f,
+ -0.060197f,
+ -0.057428f,
+ -0.055169f,
+ -0.053314f,
+ -0.051864f,
+ -0.050778f,
+ -0.054239f,
+ -0.057978f,
+ -0.070047f,
+ -0.082778f,
+ -0.102903f,
+ -0.116517f,
+ -0.130300f,
+ -0.138842f,
+ -0.151658f,
+ -0.166664f,
+ -0.182117f,
+ -0.200028f,
+ -0.218436f,
+ -0.234208f,
+ -0.241400f,
+ -0.240569f,
+ -0.241322f,
+ -0.241731f,
+ -0.241775f,
+ -0.239514f,
+ -0.236439f,
+ -0.232883f,
+ -0.228461f,
+ -0.223311f,
+ -0.216456f,
+ -0.207969f,
+ -0.195650f,
+ -0.181069f,
+ -0.164533f,
+ -0.147236f,
+ -0.128419f,
+ -0.109119f,
+ -0.090133f,
+ -0.070836f,
+ -0.050967f,
+ -0.031761f,
+ -0.013514f,
+ 0.003872f,
+ 0.019967f,
+ 0.033761f,
+ 0.043900f,
+ 0.051825f,
+ 0.057861f,
+ 0.063183f,
+ 0.067350f,
+ 0.070394f,
+ 0.072803f,
+ 0.074569f,
+ 0.075356f,
+ 0.074903f,
+ 0.072428f,
+ 0.069964f,
+ 0.063219f,
+ 0.049406f,
+ 0.030511f,
+ 0.012597f,
+ 0.001367f,
+ -0.008947f,
+ -0.017811f,
+ -0.027800f,
+ -0.045169f,
+ -0.063511f,
+ -0.080450f,
+ -0.086544f,
+ -0.088886f,
+ -0.090094f,
+ -0.089942f,
+ -0.089494f,
+ -0.087903f,
+ -0.085817f,
+ -0.083125f,
+ -0.079600f,
+ -0.075453f,
+ -0.069936f,
+ -0.063403f,
+ -0.054603f,
+ -0.044314f,
+ -0.032094f,
+ -0.017633f,
+ -0.001544f,
+ 0.015225f,
+ 0.031306f,
+ 0.047381f,
+ 0.063372f,
+ 0.078544f,
+ 0.091633f,
+ 0.102669f,
+ 0.111394f,
+ 0.118653f,
+ 0.124581f,
+ 0.129903f,
+ 0.134067f,
+ 0.137450f,
+ 0.139692f,
+ 0.141489f,
+ 0.142911f,
+ 0.144108f,
+ 0.145083f,
+ 0.142922f,
+ 0.138325f,
+ 0.127086f,
+ 0.109531f,
+ 0.093211f,
+ 0.080714f,
+ 0.067225f,
+ 0.048814f,
+ 0.028100f,
+ 0.013219f,
+ -0.001458f,
+ -0.012644f,
+ -0.026575f,
+ -0.038333f,
+ -0.051072f,
+ -0.056767f,
+ -0.059997f,
+ -0.060956f,
+ -0.061525f,
+ -0.060469f,
+ -0.058506f,
+ -0.056231f,
+ -0.053094f,
+ -0.049289f,
+ -0.044731f,
+ -0.038811f,
+ -0.031658f,
+ -0.022533f,
+ -0.012664f,
+ -0.001419f,
+ 0.011428f,
+ 0.026322f,
+ 0.041850f,
+ 0.056197f,
+ 0.068964f,
+ 0.081700f,
+ 0.093144f,
+ 0.102997f,
+ 0.110800f,
+ 0.117869f,
+ 0.123703f,
+ 0.128350f,
+ 0.131911f,
+ 0.135175f,
+ 0.137639f,
+ 0.139850f,
+ 0.140756f,
+ 0.141425f,
+ 0.139578f,
+ 0.137314f,
+ 0.131508f,
+ 0.122006f,
+ 0.107142f,
+ 0.091067f,
+ 0.077753f,
+ 0.064094f,
+ 0.052750f,
+ 0.039600f,
+ 0.025225f,
+ 0.008014f,
+ -0.007597f,
+ -0.018475f,
+ -0.025317f,
+ -0.030200f,
+ -0.031883f,
+ -0.032458f,
+ -0.031592f,
+ -0.030433f,
+ -0.028850f,
+ -0.026403f,
+ -0.023728f,
+ -0.020169f,
+ -0.015881f,
+ -0.010064f,
+ -0.001794f,
+ 0.009233f,
+ 0.022628f,
+ 0.038350f,
+ 0.055017f,
+ 0.073522f,
+ 0.091597f,
+ 0.109728f,
+ 0.127814f,
+ 0.146778f,
+ 0.165678f,
+ 0.182425f,
+ 0.196697f,
+ 0.208536f,
+ 0.218658f,
+ 0.226206f,
+ 0.232206f,
+ 0.237206f,
+ 0.241344f,
+ 0.244669f,
+ 0.246886f,
+ 0.248539f,
+ 0.249592f,
+ 0.248947f,
+ 0.247811f,
+ 0.245831f,
+ 0.241731f,
+ 0.229944f,
+ 0.213753f,
+ 0.196744f,
+ 0.183678f,
+ 0.172967f,
+ 0.161500f,
+ 0.148306f,
+ 0.131367f,
+ 0.117878f,
+ 0.100292f,
+ 0.085094f,
+ 0.070261f,
+ 0.063861f,
+ 0.059797f,
+ 0.057239f,
+ 0.055808f,
+ 0.056719f,
+ 0.057903f,
+ 0.060153f,
+ 0.062669f,
+ 0.066039f,
+ 0.070097f,
+ 0.075311f,
+ 0.080833f,
+ 0.087194f,
+ 0.094256f,
+ 0.103500f,
+ 0.113747f,
+ 0.124733f,
+ 0.135692f,
+ 0.146758f,
+ 0.157267f,
+ 0.165547f,
+ 0.172575f,
+ 0.178853f,
+ 0.184283f,
+ 0.188364f,
+ 0.191033f,
+ 0.193894f,
+ 0.196494f,
+ 0.198878f,
+ 0.200675f,
+ 0.202197f,
+ 0.200969f,
+ 0.196986f,
+ 0.187150f,
+ 0.176322f,
+ 0.158942f,
+ 0.144858f,
+ 0.128431f,
+ 0.119086f,
+ 0.105094f,
+ 0.088719f,
+ 0.066156f,
+ 0.048406f,
+ 0.035078f,
+ 0.024444f,
+ 0.009108f,
+ -0.009619f,
+ -0.024347f,
+ -0.032739f,
+ -0.034058f,
+ -0.033836f,
+ -0.032903f,
+ -0.031717f,
+ -0.030283f,
+ -0.028281f,
+ -0.025800f,
+ -0.022025f,
+ -0.017156f,
+ -0.011256f,
+ -0.003936f,
+ 0.005686f,
+ 0.017658f,
+ 0.031431f,
+ 0.045672f,
+ 0.060947f,
+ 0.075700f,
+ 0.091289f,
+ 0.105747f,
+ 0.120053f,
+ 0.132714f,
+ 0.144072f,
+ 0.153222f,
+ 0.160542f,
+ 0.166428f,
+ 0.171022f,
+ 0.174444f,
+ 0.177336f,
+ 0.180042f,
+ 0.182411f,
+ 0.184253f,
+ 0.184711f,
+ 0.182211f,
+ 0.178369f,
+ 0.168389f,
+ 0.153033f,
+ 0.135322f,
+ 0.122011f,
+ 0.111156f,
+ 0.096722f,
+ 0.076997f,
+ 0.058986f,
+ 0.044525f,
+ 0.034578f,
+ 0.020222f,
+ 0.001806f,
+ -0.016989f,
+ -0.029753f,
+ -0.035972f,
+ -0.038500f,
+ -0.038836f,
+ -0.038011f,
+ -0.036903f,
+ -0.035489f,
+ -0.033506f,
+ -0.030742f,
+ -0.027439f,
+ -0.023047f,
+ -0.018083f,
+ -0.011325f,
+ -0.002739f,
+ 0.007422f,
+ 0.018458f,
+ 0.030119f,
+ 0.041531f,
+ 0.053583f,
+ 0.064600f,
+ 0.074369f,
+ 0.082083f,
+ 0.088092f,
+ 0.093636f,
+ 0.097564f,
+ 0.100692f,
+ 0.103161f,
+ 0.104406f,
+ 0.105108f,
+ 0.105308f,
+ 0.104678f,
+ 0.103592f,
+ 0.099656f,
+ 0.087906f,
+ 0.069575f,
+ 0.049839f,
+ 0.036214f,
+ 0.020122f,
+ 0.005489f,
+ -0.014483f,
+ -0.035092f,
+ -0.055364f,
+ -0.077369f,
+ -0.094306f,
+ -0.112753f,
+ -0.125578f,
+ -0.141133f,
+ -0.161622f,
+ -0.182667f,
+ -0.197647f,
+ -0.203778f,
+ -0.206253f,
+ -0.207075f,
+ -0.208367f,
+ -0.207653f,
+ -0.206161f,
+ -0.203317f,
+ -0.199764f,
+ -0.195469f,
+ -0.189633f,
+ -0.181753f,
+ -0.171469f,
+ -0.158628f,
+ -0.144203f,
+ -0.128603f,
+ -0.113447f,
+ -0.097322f,
+ -0.080772f,
+ -0.063761f,
+ -0.047203f,
+ -0.031303f,
+ -0.016267f,
+ -0.003233f,
+ 0.007592f,
+ 0.015533f,
+ 0.021900f,
+ 0.026703f,
+ 0.031003f,
+ 0.034383f,
+ 0.037142f,
+ 0.039686f,
+ 0.040911f,
+ 0.040378f,
+ 0.037531f,
+ 0.035139f,
+ 0.029594f,
+ 0.010203f,
+ -0.009378f,
+ -0.027667f,
+ -0.033886f,
+ -0.041956f,
+ -0.054275f,
+ -0.067553f,
+ -0.087442f,
+ -0.105744f,
+ -0.123175f,
+ -0.134819f,
+ -0.141169f,
+ -0.143481f,
+ -0.142397f,
+ -0.140336f,
+ -0.138042f,
+ -0.135569f,
+ -0.132494f,
+ -0.128975f,
+ -0.124858f,
+ -0.119925f,
+ -0.114100f,
+ -0.106956f,
+ -0.097556f,
+ -0.085467f,
+ -0.071806f,
+ -0.057325f,
+ -0.042658f,
+ -0.027336f,
+ -0.012200f,
+ 0.002969f,
+ 0.018094f,
+ 0.032572f,
+ 0.046342f,
+ 0.057442f,
+ 0.066444f,
+ 0.072961f,
+ 0.078639f,
+ 0.082886f,
+ 0.086025f,
+ 0.088253f,
+ 0.090042f,
+ 0.091428f,
+ 0.092442f,
+ 0.092550f,
+ 0.090506f,
+ 0.086950f,
+ 0.069708f,
+ 0.051867f,
+ 0.029800f,
+ 0.020864f,
+ 0.005403f,
+ -0.009400f,
+ -0.029278f,
+ -0.045592f,
+ -0.062761f,
+ -0.079750f,
+ -0.094181f,
+ -0.106508f,
+ -0.120842f,
+ -0.138636f,
+ -0.155325f,
+ -0.164131f,
+ -0.167369f,
+ -0.167853f,
+ -0.169250f,
+ -0.169308f,
+ -0.169978f,
+ -0.168739f,
+ -0.167203f,
+ -0.163714f,
+ -0.159853f,
+ -0.154711f,
+ -0.148792f,
+ -0.141194f,
+ -0.132433f,
+ -0.122950f,
+ -0.113256f,
+ -0.103722f,
+ -0.093608f,
+ -0.084000f,
+ -0.075483f,
+ -0.068269f,
+ -0.062056f,
+ -0.056725f,
+ -0.052389f,
+ -0.048786f,
+ -0.046400f,
+ -0.044714f,
+ -0.043525f,
+ -0.043267f,
+ -0.045447f,
+ -0.049933f,
+ -0.054358f,
+ -0.063461f,
+ -0.075153f,
+ -0.087636f,
+ -0.096414f,
+ -0.106700f,
+ -0.127028f,
+ -0.149008f,
+ -0.168572f,
+ -0.181467f,
+ -0.193522f,
+ -0.207803f,
+ -0.220069f,
+ -0.237322f,
+ -0.252542f,
+ -0.268147f,
+ -0.274858f,
+ -0.277450f,
+ -0.276072f,
+ -0.275103f,
+ -0.273897f,
+ -0.272422f,
+ -0.269769f,
+ -0.266436f,
+ -0.262089f,
+ -0.257119f,
+ -0.250814f,
+ -0.242889f,
+ -0.232014f,
+ -0.218886f,
+ -0.203897f,
+ -0.187672f,
+ -0.170781f,
+ -0.153072f,
+ -0.135347f,
+ -0.117061f,
+ -0.098736f,
+ -0.081728f,
+ -0.065492f,
+ -0.050975f,
+ -0.036214f,
+ -0.024067f,
+ -0.014089f,
+ -0.007167f,
+ -0.001761f,
+ 0.002183f,
+ 0.005219f,
+ 0.007517f,
+ 0.009392f,
+ 0.010703f,
+ 0.011186f,
+ 0.011306f,
+ 0.011025f,
+ 0.008239f,
+ -0.003914f,
+ -0.021661f,
+ -0.039831f,
+ -0.053378f,
+ -0.062150f,
+ -0.073389f,
+ -0.082219f,
+ -0.096897f,
+ -0.111950f,
+ -0.126092f,
+ -0.133267f,
+ -0.134031f,
+ -0.133031f,
+ -0.131792f,
+ -0.131603f,
+ -0.131036f,
+ -0.130039f,
+ -0.127214f,
+ -0.123692f,
+ -0.119322f,
+ -0.113061f,
+ -0.106056f,
+ -0.096953f,
+ -0.086567f,
+ -0.073414f,
+ -0.059511f,
+ -0.044422f,
+ -0.029356f,
+ -0.012211f,
+ 0.004058f,
+ 0.019928f,
+ 0.034317f,
+ 0.048442f,
+ 0.061228f,
+ 0.070736f,
+ 0.078319f,
+ 0.084278f,
+ 0.089731f,
+ 0.093856f,
+ 0.097150f,
+ 0.098797f,
+ 0.099922f,
+ 0.100842f,
+ 0.102372f,
+ 0.103633f,
+ 0.101978f,
+ 0.096311f,
+ 0.081794f,
+ 0.062047f,
+ 0.043769f,
+ 0.031633f,
+ 0.023656f,
+ 0.010842f,
+ -0.003156f,
+ -0.017092f,
+ -0.031342f,
+ -0.050533f,
+ -0.071661f,
+ -0.085300f,
+ -0.091439f,
+ -0.091872f,
+ -0.091981f,
+ -0.090528f,
+ -0.088736f,
+ -0.086728f,
+ -0.084361f,
+ -0.081389f,
+ -0.077278f,
+ -0.071753f,
+ -0.065678f,
+ -0.058394f,
+ -0.049767f,
+ -0.039072f,
+ -0.026056f,
+ -0.011864f,
+ 0.004336f,
+ 0.019256f,
+ 0.035047f,
+ 0.048708f,
+ 0.063014f,
+ 0.075339f,
+ 0.087433f,
+ 0.097631f,
+ 0.105844f,
+ 0.112011f,
+ 0.116758f,
+ 0.120683f,
+ 0.123786f,
+ 0.126161f,
+ 0.128125f,
+ 0.129753f,
+ 0.129783f,
+ 0.129397f,
+ 0.128497f,
+ 0.117600f,
+ 0.102547f,
+ 0.082158f,
+ 0.068508f,
+ 0.051522f,
+ 0.038614f,
+ 0.017664f,
+ 0.001775f,
+ -0.018878f,
+ -0.032194f,
+ -0.047400f,
+ -0.058997f,
+ -0.073058f,
+ -0.092103f,
+ -0.112306f,
+ -0.125044f,
+ -0.128300f,
+ -0.127394f,
+ -0.126100f,
+ -0.124439f,
+ -0.122539f,
+ -0.120322f,
+ -0.117633f,
+ -0.113769f,
+ -0.108447f,
+ -0.101847f,
+ -0.093000f,
+ -0.082839f,
+ -0.071250f,
+ -0.059264f,
+ -0.047544f,
+ -0.033642f,
+ -0.021186f,
+ -0.007064f,
+ 0.005133f,
+ 0.017264f,
+ 0.027197f,
+ 0.035786f,
+ 0.042736f,
+ 0.047944f,
+ 0.051256f,
+ 0.054039f,
+ 0.056433f,
+ 0.058622f,
+ 0.059900f,
+ 0.060739f,
+ 0.059064f,
+ 0.054708f,
+ 0.047039f,
+ 0.029789f,
+ 0.011906f,
+ -0.007217f,
+ -0.017900f,
+ -0.032325f,
+ -0.047272f,
+ -0.068714f,
+ -0.086483f,
+ -0.102692f,
+ -0.110811f,
+ -0.125533f,
+ -0.145953f,
+ -0.166008f,
+ -0.177144f,
+ -0.179486f,
+ -0.180122f,
+ -0.178922f,
+ -0.176756f,
+ -0.174308f,
+ -0.171000f,
+ -0.166617f,
+ -0.161711f,
+ -0.155389f,
+ -0.147247f,
+ -0.135344f,
+ -0.120906f,
+ -0.104228f,
+ -0.086025f,
+ -0.066775f,
+ -0.046386f,
+ -0.026200f,
+ -0.005425f,
+ 0.015331f,
+ 0.036331f,
+ 0.056233f,
+ 0.075303f,
+ 0.093047f,
+ 0.109592f,
+ 0.124392f,
+ 0.136822f,
+ 0.146442f,
+ 0.153897f,
+ 0.159414f,
+ 0.163758f,
+ 0.166503f,
+ 0.168736f,
+ 0.170517f,
+ 0.171892f,
+ 0.171831f,
+ 0.169611f,
+ 0.166400f,
+ 0.158575f,
+ 0.145050f,
+ 0.125775f,
+ 0.107383f,
+ 0.093953f,
+ 0.085192f,
+ 0.077208f,
+ 0.066208f,
+ 0.049589f,
+ 0.034231f,
+ 0.023736f,
+ 0.019436f,
+ 0.018278f,
+ 0.018500f,
+ 0.020861f,
+ 0.023572f,
+ 0.026472f,
+ 0.029636f,
+ 0.033128f,
+ 0.037281f,
+ 0.042847f,
+ 0.049253f,
+ 0.057667f,
+ 0.067739f,
+ 0.078881f,
+ 0.091097f,
+ 0.103978f,
+ 0.118792f,
+ 0.133425f,
+ 0.147858f,
+ 0.161522f,
+ 0.174425f,
+ 0.185125f,
+ 0.193583f,
+ 0.200353f,
+ 0.206156f,
+ 0.210767f,
+ 0.214400f,
+ 0.217222f,
+ 0.219664f,
+ 0.221442f,
+ 0.222242f,
+ 0.222717f,
+ 0.222906f,
+ 0.223431f,
+ 0.217681f,
+ 0.202775f,
+ 0.182144f,
+ 0.165119f,
+ 0.150094f,
+ 0.136550f,
+ 0.119581f,
+ 0.103419f,
+ 0.084128f,
+ 0.069442f,
+ 0.053425f,
+ 0.039803f,
+ 0.023039f,
+ 0.009628f,
+ -0.008228f,
+ -0.022219f,
+ -0.032669f,
+ -0.033492f,
+ -0.035617f,
+ -0.036597f,
+ -0.037314f,
+ -0.035500f,
+ -0.033150f,
+ -0.029858f,
+ -0.026114f,
+ -0.022072f,
+ -0.017403f,
+ -0.011739f,
+ -0.005253f,
+ 0.002358f,
+ 0.010981f,
+ 0.021675f,
+ 0.032039f,
+ 0.043394f,
+ 0.053081f,
+ 0.062789f,
+ 0.071264f,
+ 0.079053f,
+ 0.085550f,
+ 0.090536f,
+ 0.094758f,
+ 0.097997f,
+ 0.099239f,
+ 0.099839f,
+ 0.100106f,
+ 0.100164f,
+ 0.099956f,
+ 0.099481f,
+ 0.096525f,
+ 0.087475f,
+ 0.072511f,
+ 0.057597f,
+ 0.047667f,
+ 0.038397f,
+ 0.028350f,
+ 0.008453f,
+ -0.008825f,
+ -0.025644f,
+ -0.033578f,
+ -0.047800f,
+ -0.060000f,
+ -0.071103f,
+ -0.075189f,
+ -0.080339f,
+ -0.084139f,
+ -0.085497f,
+ -0.084364f,
+ -0.082844f,
+ -0.080567f,
+ -0.076769f,
+ -0.072200f,
+ -0.065781f,
+ -0.057675f,
+ -0.046078f,
+ -0.032589f,
+ -0.016664f,
+ -0.000014f,
+ 0.018269f,
+ 0.037786f,
+ 0.058175f,
+ 0.077783f,
+ 0.097506f,
+ 0.117403f,
+ 0.137539f,
+ 0.157392f,
+ 0.176278f,
+ 0.194161f,
+ 0.210125f,
+ 0.223458f,
+ 0.234267f,
+ 0.242750f,
+ 0.249536f,
+ 0.254536f,
+ 0.258592f,
+ 0.261789f,
+ 0.264722f,
+ 0.265964f,
+ 0.266847f,
+ 0.267539f,
+ 0.267492f,
+ 0.267225f,
+ 0.262117f,
+ 0.249392f,
+ 0.225836f,
+ 0.205358f,
+ 0.191158f,
+ 0.185403f,
+ 0.179975f,
+ 0.173350f,
+ 0.158814f,
+ 0.142542f,
+ 0.128661f,
+ 0.121856f,
+ 0.116303f,
+ 0.112400f,
+ 0.112131f,
+ 0.114161f,
+ 0.116497f,
+ 0.118897f,
+ 0.121311f,
+ 0.124614f,
+ 0.128911f,
+ 0.134192f,
+ 0.140678f,
+ 0.147478f,
+ 0.156122f,
+ 0.165514f,
+ 0.177228f,
+ 0.189625f,
+ 0.202397f,
+ 0.214681f,
+ 0.226811f,
+ 0.238636f,
+ 0.249219f,
+ 0.257339f,
+ 0.262928f,
+ 0.266900f,
+ 0.270053f,
+ 0.272675f,
+ 0.274817f,
+ 0.275361f,
+ 0.275553f,
+ 0.275297f,
+ 0.275747f,
+ 0.273944f,
+ 0.262533f,
+ 0.244164f,
+ 0.222722f,
+ 0.208381f,
+ 0.187211f,
+ 0.160849f,
+ 0.130031f,
+ 0.104242f,
+ 0.083865f,
+ 0.066863f,
+ 0.053125f,
+ 0.037048f,
+ 0.019417f,
+ 0.005165f,
+ -0.005112f,
+ -0.021975f,
+ -0.040225f,
+ -0.057023f,
+ -0.062488f,
+ -0.064631f,
+ -0.064535f,
+ -0.063537f,
+ -0.061542f,
+ -0.059140f,
+ -0.056340f,
+ -0.053354f,
+ -0.049506f,
+ -0.043998f,
+ -0.037208f,
+ -0.028525f,
+ -0.018635f,
+ -0.006448f,
+ 0.006215f,
+ 0.019675f,
+ 0.032744f,
+ 0.045698f,
+ 0.057610f,
+ 0.067954f,
+ 0.076665f,
+ 0.083440f,
+ 0.088981f,
+ 0.093440f,
+ 0.097058f,
+ 0.099979f,
+ 0.102138f,
+ 0.102756f,
+ 0.103002f,
+ 0.102831f,
+ 0.102406f,
+ 0.100119f,
+ 0.090021f,
+ 0.074192f,
+ 0.053967f,
+ 0.038683f,
+ 0.026694f,
+ 0.013173f,
+ -0.006675f,
+ -0.027827f,
+ -0.050073f,
+ -0.065308f,
+ -0.082000f,
+ -0.092715f,
+ -0.109356f,
+ -0.127969f,
+ -0.147519f,
+ -0.159006f,
+ -0.163852f,
+ -0.164790f,
+ -0.165340f,
+ -0.163788f,
+ -0.161833f,
+ -0.159458f,
+ -0.156615f,
+ -0.153308f,
+ -0.149229f,
+ -0.144075f,
+ -0.137444f,
+ -0.129410f,
+ -0.119527f,
+ -0.107917f,
+ -0.095196f,
+ -0.082194f,
+ -0.068854f,
+ -0.055935f,
+ -0.043367f,
+ -0.032902f,
+ -0.023819f,
+ -0.017058f,
+ -0.011475f,
+ -0.007142f,
+ -0.003583f,
+ -0.001085f,
+ 0.000723f,
+ 0.002044f,
+ 0.003127f,
+ 0.003919f,
+ 0.003917f,
+ 0.001831f,
+ -0.007202f,
+ -0.026267f,
+ -0.047883f,
+ -0.065204f,
+ -0.078660f,
+ -0.091319f,
+ -0.109300f,
+ -0.125833f,
+ -0.146340f,
+ -0.163985f,
+ -0.180902f,
+ -0.194706f,
+ -0.212198f,
+ -0.231094f,
+ -0.249367f,
+ -0.259573f,
+ -0.263962f,
+ -0.265946f,
+ -0.267092f,
+ -0.267687f,
+ -0.266137f,
+ -0.263683f,
+ -0.260585f,
+ -0.256862f,
+ -0.248701f,
+ -0.239114f,
+ -0.227298f,
+ -0.216858f,
+ -0.203600f,
+ -0.189409f,
+ -0.174480f,
+ -0.158633f,
+ -0.141782f,
+ -0.125282f,
+ -0.108784f,
+ -0.093376f,
+ -0.077760f,
+ -0.064778f,
+ -0.053382f,
+ -0.045009f,
+ -0.038138f,
+ -0.032707f,
+ -0.027973f,
+ -0.024716f,
+ -0.022667f,
+ -0.021651f,
+ -0.022089f,
+ -0.022931f,
+ -0.023589f,
+ -0.023407f,
+ -0.025258f,
+ -0.037200f,
+ -0.053793f,
+ -0.073153f,
+ -0.086280f,
+ -0.099207f,
+ -0.110891f,
+ -0.123678f,
+ -0.138136f,
+ -0.153636f,
+ -0.169611f,
+ -0.182296f,
+ -0.191404f,
+ -0.196589f,
+ -0.198729f,
+ -0.199178f,
+ -0.197858f,
+ -0.196236f,
+ -0.194429f,
+ -0.192367f,
+ -0.189551f,
+ -0.186027f,
+ -0.181560f,
+ -0.176704f,
+ -0.170000f,
+ -0.162409f,
+ -0.153580f,
+ -0.143700f,
+ -0.131989f,
+ -0.118160f,
+ -0.103918f,
+ -0.089671f,
+ -0.076478f,
+ -0.063504f,
+ -0.052296f,
+ -0.042249f,
+ -0.034827f,
+ -0.028813f,
+ -0.024320f,
+ -0.020271f,
+ -0.016367f,
+ -0.013280f,
+ -0.011018f,
+ -0.009418f,
+ -0.008062f,
+ -0.007680f,
+ -0.009149f,
+ -0.012793f,
+ -0.020040f,
+ -0.034598f,
+ -0.049604f,
+ -0.063440f,
+ -0.074789f,
+ -0.087640f,
+ -0.103413f,
+ -0.116820f,
+ -0.132220f,
+ -0.143291f,
+ -0.158342f,
+ -0.173013f,
+ -0.188520f,
+ -0.196244f,
+ -0.199224f,
+ -0.199627f,
+ -0.199816f,
+ -0.198891f,
+ -0.197707f,
+ -0.196049f,
+ -0.193864f,
+ -0.191422f,
+ -0.188444f,
+ -0.184989f,
+ -0.180336f,
+ -0.174051f,
+ -0.166216f,
+ -0.154758f,
+ -0.142642f,
+ -0.128844f,
+ -0.116333f,
+ -0.102762f,
+ -0.089133f,
+ -0.073922f,
+ -0.060129f,
+ -0.048209f,
+ -0.039038f,
+ -0.031436f,
+ -0.024211f,
+ -0.018796f,
+ -0.013129f,
+ -0.008909f,
+ -0.005436f,
+ -0.002936f,
+ -0.000853f,
+ 0.001129f,
+ 0.001264f,
+ 0.000344f,
+ -0.001582f,
+ -0.003849f,
+ -0.007169f,
+ -0.012342f,
+ -0.025256f,
+ -0.038727f,
+ -0.053324f,
+ -0.060558f,
+ -0.072442f,
+ -0.084689f,
+ -0.097384f,
+ -0.104824f,
+ -0.109413f,
+ -0.111644f,
+ -0.113751f,
+ -0.114644f,
+ -0.115691f,
+ -0.114489f,
+ -0.112196f,
+ -0.108767f,
+ -0.104520f,
+ -0.099876f,
+ -0.094356f,
+ -0.087184f,
+ -0.077496f,
+ -0.065589f,
+ -0.051409f,
+ -0.036004f,
+ -0.018222f,
+ 0.000876f,
+ 0.020867f,
+ 0.041227f,
+ 0.062098f,
+ 0.082033f,
+ 0.100467f,
+ 0.118684f,
+ 0.137762f,
+ 0.156438f,
+ 0.171478f,
+ 0.182076f,
+ 0.191478f,
+ 0.199216f,
+ 0.206244f,
+ 0.210796f,
+ 0.214302f,
+ 0.217238f,
+ 0.219244f,
+ 0.220380f,
+ 0.220782f,
+ 0.219862f,
+ 0.218196f,
+ 0.215200f,
+ 0.208149f,
+ 0.192882f,
+ 0.174280f,
+ 0.157929f,
+ 0.145882f,
+ 0.134004f,
+ 0.120409f,
+ 0.107142f,
+ 0.092300f,
+ 0.078522f,
+ 0.061947f,
+ 0.047502f,
+ 0.036502f,
+ 0.032751f,
+ 0.032722f,
+ 0.033031f,
+ 0.033707f,
+ 0.035560f,
+ 0.037798f,
+ 0.040533f,
+ 0.043984f,
+ 0.047736f,
+ 0.052862f,
+ 0.059124f,
+ 0.068627f,
+ 0.079700f,
+ 0.091673f,
+ 0.104318f,
+ 0.118227f,
+ 0.133642f,
+ 0.148418f,
+ 0.161767f,
+ 0.173691f,
+ 0.184022f,
+ 0.192216f,
+ 0.198718f,
+ 0.204062f,
+ 0.209093f,
+ 0.213142f,
+ 0.216400f,
+ 0.218893f,
+ 0.220984f,
+ 0.222609f,
+ 0.223027f,
+ 0.221451f,
+ 0.217642f,
+ 0.206800f,
+ 0.191093f,
+ 0.174087f,
+ 0.158678f,
+ 0.146698f,
+ 0.131858f,
+ 0.116549f,
+ 0.094333f,
+ 0.075151f,
+ 0.060209f,
+ 0.050713f,
+ 0.037356f,
+ 0.021227f,
+ 0.007171f,
+ -0.000751f,
+ -0.004756f,
+ -0.006036f,
+ -0.006153f,
+ -0.004582f,
+ -0.002662f,
+ 0.000211f,
+ 0.003740f,
+ 0.008067f,
+ 0.013151f,
+ 0.019398f,
+ 0.027782f,
+ 0.038389f,
+ 0.052044f,
+ 0.067100f,
+ 0.083093f,
+ 0.099484f,
+ 0.115878f,
+ 0.132676f,
+ 0.148733f,
+ 0.165127f,
+ 0.179658f,
+ 0.193400f,
+ 0.204951f,
+ 0.214851f,
+ 0.222389f,
+ 0.228078f,
+ 0.232709f,
+ 0.236067f,
+ 0.238591f,
+ 0.239289f,
+ 0.239640f,
+ 0.239411f,
+ 0.239011f,
+ 0.237709f,
+ 0.232189f,
+ 0.216707f,
+ 0.198098f,
+ 0.180704f,
+ 0.171249f,
+ 0.156013f,
+ 0.140102f,
+ 0.120756f,
+ 0.105638f,
+ 0.090011f,
+ 0.077020f,
+ 0.066716f,
+ 0.051582f,
+ 0.036769f,
+ 0.022873f,
+ 0.017496f,
+ 0.015324f,
+ 0.015220f,
+ 0.016193f,
+ 0.017838f,
+ 0.019833f,
+ 0.022113f,
+ 0.024638f,
+ 0.028309f,
+ 0.033009f,
+ 0.038356f,
+ 0.044573f,
+ 0.052602f,
+ 0.062500f,
+ 0.074196f,
+ 0.085673f,
+ 0.097180f,
+ 0.107364f,
+ 0.116553f,
+ 0.124244f,
+ 0.131040f,
+ 0.136587f,
+ 0.141258f,
+ 0.144473f,
+ 0.147229f,
+ 0.149533f,
+ 0.151384f,
+ 0.152847f,
+ 0.154049f,
+ 0.154062f,
+ 0.152062f,
+ 0.148720f,
+ 0.128758f,
+ 0.108656f,
+ 0.086584f,
+ 0.075087f,
+ 0.063147f,
+ 0.048316f,
+ 0.030849f,
+ 0.007611f,
+ -0.012178f,
+ -0.029536f,
+ -0.043673f,
+ -0.061544f,
+ -0.075596f,
+ -0.094542f,
+ -0.110169f,
+ -0.122998f,
+ -0.126682f,
+ -0.128873f,
+ -0.130351f,
+ -0.130873f,
+ -0.129233f,
+ -0.127067f,
+ -0.124338f,
+ -0.121047f,
+ -0.116816f,
+ -0.111238f,
+ -0.103776f,
+ -0.093560f,
+ -0.081082f,
+ -0.066158f,
+ -0.050987f,
+ -0.034260f,
+ -0.017896f,
+ -0.000676f,
+ 0.016202f,
+ 0.033053f,
+ 0.048947f,
+ 0.063867f,
+ 0.078102f,
+ 0.090456f,
+ 0.100258f,
+ 0.107229f,
+ 0.112791f,
+ 0.117127f,
+ 0.120496f,
+ 0.123073f,
+ 0.125116f,
+ 0.126827f,
+ 0.127802f,
+ 0.128382f,
+ 0.127164f,
+ 0.124858f,
+ 0.117131f,
+ 0.105307f,
+ 0.093296f,
+ 0.080240f,
+ 0.069860f,
+ 0.058282f,
+ 0.045831f,
+ 0.032753f,
+ 0.014702f,
+ 0.003860f,
+ -0.003956f,
+ -0.004051f,
+ -0.003924f,
+ -0.003087f,
+ -0.002027f,
+ -0.000744f,
+ 0.000742f,
+ 0.002793f,
+ 0.005440f,
+ 0.008642f,
+ 0.012724f,
+ 0.018080f,
+ 0.025393f,
+ 0.034873f,
+ 0.046120f,
+ 0.059684f,
+ 0.073927f,
+ 0.089329f,
+ 0.104580f,
+ 0.120393f,
+ 0.135398f,
+ 0.150844f,
+ 0.165193f,
+ 0.178789f,
+ 0.190402f,
+ 0.200647f,
+ 0.208867f,
+ 0.215098f,
+ 0.220064f,
+ 0.224602f,
+ 0.228253f,
+ 0.231193f,
+ 0.233560f,
+ 0.235700f,
+ 0.237513f,
+ 0.238942f,
+ 0.237424f,
+ 0.232238f,
+ 0.220138f,
+ 0.205131f,
+ 0.188198f,
+ 0.176024f,
+ 0.163293f,
+ 0.151560f,
+ 0.132920f,
+ 0.116736f,
+ 0.102769f,
+ 0.093984f,
+ 0.083876f,
+ 0.065158f,
+ 0.044964f,
+ 0.029484f,
+ 0.023582f,
+ 0.022580f,
+ 0.021444f,
+ 0.021720f,
+ 0.022700f,
+ 0.024316f,
+ 0.026160f,
+ 0.028607f,
+ 0.031416f,
+ 0.035060f,
+ 0.039044f,
+ 0.044649f,
+ 0.051140f,
+ 0.059791f,
+ 0.069584f,
+ 0.080856f,
+ 0.092138f,
+ 0.103842f,
+ 0.115113f,
+ 0.126409f,
+ 0.136442f,
+ 0.144969f,
+ 0.151691f,
+ 0.157071f,
+ 0.161504f,
+ 0.164929f,
+ 0.167680f,
+ 0.169364f,
+ 0.170711f,
+ 0.170920f,
+ 0.170702f,
+ 0.169291f,
+ 0.168222f,
+ 0.166360f,
+ 0.154558f,
+ 0.135118f,
+ 0.111942f,
+ 0.096376f,
+ 0.085978f,
+ 0.074331f,
+ 0.059798f,
+ 0.039300f,
+ 0.020582f,
+ 0.003460f,
+ -0.009124f,
+ -0.023796f,
+ -0.040431f,
+ -0.055144f,
+ -0.064913f,
+ -0.068364f,
+ -0.071331f,
+ -0.072851f,
+ -0.073789f,
+ -0.072420f,
+ -0.070093f,
+ -0.067276f,
+ -0.063371f,
+ -0.058571f,
+ -0.052080f,
+ -0.044351f,
+ -0.033782f,
+ -0.020731f,
+ -0.005196f,
+ 0.011200f,
+ 0.028313f,
+ 0.045856f,
+ 0.063842f,
+ 0.081207f,
+ 0.098624f,
+ 0.115178f,
+ 0.131082f,
+ 0.145778f,
+ 0.158633f,
+ 0.169291f,
+ 0.177133f,
+ 0.183900f,
+ 0.189433f,
+ 0.193896f,
+ 0.197449f,
+ 0.200520f,
+ 0.203300f,
+ 0.205478f,
+ 0.206669f,
+ 0.205240f,
+ 0.201936f,
+ 0.188302f,
+ 0.170102f,
+ 0.149718f,
+ 0.135291f,
+ 0.125096f,
+ 0.112387f,
+ 0.098684f,
+ 0.084293f,
+ 0.068089f,
+ 0.052698f,
+ 0.036380f,
+ 0.019529f,
+ 0.006098f,
+ -0.004731f,
+ -0.008733f,
+ -0.011060f,
+ -0.012731f,
+ -0.012238f,
+ -0.011409f,
+ -0.009260f,
+ -0.006622f,
+ -0.003069f,
+ 0.001040f,
+ 0.006224f,
+ 0.012689f,
+ 0.021736f,
+ 0.032407f,
+ 0.045191f,
+ 0.058020f,
+ 0.072822f,
+ 0.086411f,
+ 0.101389f,
+ 0.114187f,
+ 0.127058f,
+ 0.137527f,
+ 0.147380f,
+ 0.154976f,
+ 0.161651f,
+ 0.166698f,
+ 0.171002f,
+ 0.174031f,
+ 0.176327f,
+ 0.178162f,
+ 0.176358f,
+ 0.173724f,
+ 0.169549f,
+ 0.165833f,
+ 0.150460f,
+ 0.135311f,
+ 0.119547f,
+ 0.108551f,
+ 0.091696f,
+ 0.071989f,
+ 0.051231f,
+ 0.034838f,
+ 0.015849f,
+ -0.001836f,
+ -0.020987f,
+ -0.034429f,
+ -0.045247f,
+ -0.062502f,
+ -0.081680f,
+ -0.097582f,
+ -0.103704f,
+ -0.104940f,
+ -0.105076f,
+ -0.104444f,
+ -0.103562f,
+ -0.102356f,
+ -0.100784f,
+ -0.098396f,
+ -0.095409f,
+ -0.091191f,
+ -0.085984f,
+ -0.079282f,
+ -0.070342f,
+ -0.060104f,
+ -0.048131f,
+ -0.036853f,
+ -0.024253f,
+ -0.012311f,
+ -0.000856f,
+ 0.008744f,
+ 0.016967f,
+ 0.024344f,
+ 0.030340f,
+ 0.035231f,
+ 0.039322f,
+ 0.042704f,
+ 0.045562f,
+ 0.047658f,
+ 0.049407f,
+ 0.049869f,
+ 0.049660f,
+ 0.049004f,
+ 0.039364f,
+ 0.023087f,
+ 0.002198f,
+ -0.009584f,
+ -0.020949f,
+ -0.033480f,
+ -0.052667f,
+ -0.069138f,
+ -0.084720f,
+ -0.101320f,
+ -0.121067f,
+ -0.138296f,
+ -0.153564f,
+ -0.167589f,
+ -0.185556f,
+ -0.203420f,
+ -0.216900f,
+ -0.224758f,
+ -0.227382f,
+ -0.228411f,
+ -0.228591f,
+ -0.227900f,
+ -0.226842f,
+ -0.225053f,
+ -0.222264f,
+ -0.218707f,
+ -0.214473f,
+ -0.209231f,
+ -0.203282f,
+ -0.196238f,
+ -0.188302f,
+ -0.179227f,
+ -0.169622f,
+ -0.158953f,
+ -0.147976f,
+ -0.137638f,
+ -0.128269f,
+ -0.120564f,
+ -0.113920f,
+ -0.108651f,
+ -0.104413f,
+ -0.100913f,
+ -0.098384f,
+ -0.096342f,
+ -0.095964f,
+ -0.095953f,
+ -0.096329f,
+ -0.095780f,
+ -0.097076f,
+ -0.103442f,
+ -0.118789f,
+ -0.135658f,
+ -0.153396f,
+ -0.167698f,
+ -0.183067f,
+ -0.196498f,
+ -0.215736f,
+ -0.233771f,
+ -0.248882f,
+ -0.257851f,
+ -0.267689f,
+ -0.290189f,
+ -0.308236f,
+ -0.323242f,
+ -0.325604f,
+ -0.327400f,
+ -0.327713f,
+ -0.326282f,
+ -0.323780f,
+ -0.321029f,
+ -0.317960f,
+ -0.313678f,
+ -0.307722f,
+ -0.299611f,
+ -0.289164f,
+ -0.276493f,
+ -0.261396f,
+ -0.244676f,
+ -0.226724f,
+ -0.207531f,
+ -0.187287f,
+ -0.166264f,
+ -0.145464f,
+ -0.125167f,
+ -0.105004f,
+ -0.084833f,
+ -0.066033f,
+ -0.047922f,
+ -0.031631f,
+ -0.016907f,
+ -0.005638f,
+ 0.003004f,
+ 0.010007f,
+ 0.016011f,
+ 0.021142f,
+ 0.025151f,
+ 0.028313f,
+ 0.029380f,
+ 0.030051f,
+ 0.029393f,
+ 0.029860f,
+ 0.030033f,
+ 0.030358f,
+ 0.026624f,
+ 0.014467f,
+ -0.000289f,
+ -0.016029f,
+ -0.027389f,
+ -0.040260f,
+ -0.049824f,
+ -0.055569f,
+ -0.057791f,
+ -0.059118f,
+ -0.060169f,
+ -0.060507f,
+ -0.059909f,
+ -0.059056f,
+ -0.056960f,
+ -0.054353f,
+ -0.050880f,
+ -0.047056f,
+ -0.041944f,
+ -0.035738f,
+ -0.027064f,
+ -0.016596f,
+ -0.003676f,
+ 0.009722f,
+ 0.024824f,
+ 0.040027f,
+ 0.056387f,
+ 0.071980f,
+ 0.086922f,
+ 0.101598f,
+ 0.116089f,
+ 0.130420f,
+ 0.143309f,
+ 0.154613f,
+ 0.163556f,
+ 0.170500f,
+ 0.175558f,
+ 0.179642f,
+ 0.182838f,
+ 0.185264f,
+ 0.185911f,
+ 0.186236f,
+ 0.186298f,
+ 0.186776f,
+ 0.185824f,
+ 0.178691f,
+ 0.167647f,
+ 0.149996f,
+ 0.131164f,
+ 0.114133f,
+ 0.100316f,
+ 0.085891f,
+ 0.072044f,
+ 0.051889f,
+ 0.036562f,
+ 0.017644f,
+ 0.008058f,
+ -0.004740f,
+ -0.020333f,
+ -0.037864f,
+ -0.050620f,
+ -0.054882f,
+ -0.055596f,
+ -0.056118f,
+ -0.056384f,
+ -0.056378f,
+ -0.054680f,
+ -0.052384f,
+ -0.049140f,
+ -0.045311f,
+ -0.040411f,
+ -0.034651f,
+ -0.027204f,
+ -0.017920f,
+ -0.007782f,
+ 0.004169f,
+ 0.016636f,
+ 0.030678f,
+ 0.044707f,
+ 0.058007f,
+ 0.070409f,
+ 0.081582f,
+ 0.091358f,
+ 0.099273f,
+ 0.105667f,
+ 0.111307f,
+ 0.116033f,
+ 0.119780f,
+ 0.122744f,
+ 0.125033f,
+ 0.126916f,
+ 0.128589f,
+ 0.129644f,
+ 0.129478f,
+ 0.128831f,
+ 0.120642f,
+ 0.105349f,
+ 0.086482f,
+ 0.072713f,
+ 0.063373f,
+ 0.053324f,
+ 0.041642f,
+ 0.028776f,
+ 0.013787f,
+ -0.002873f,
+ -0.020238f,
+ -0.033142f,
+ -0.040638f,
+ -0.043107f,
+ -0.043356f,
+ -0.043064f,
+ -0.041931f,
+ -0.040031f,
+ -0.037144f,
+ -0.033856f,
+ -0.029396f,
+ -0.023511f,
+ -0.015282f,
+ -0.004729f,
+ 0.009433f,
+ 0.024882f,
+ 0.042278f,
+ 0.060418f,
+ 0.080649f,
+ 0.101369f,
+ 0.122209f,
+ 0.143340f,
+ 0.164682f,
+ 0.185969f,
+ 0.206633f,
+ 0.226498f,
+ 0.245422f,
+ 0.262902f,
+ 0.279036f,
+ 0.293062f,
+ 0.304749f,
+ 0.313276f,
+ 0.319502f,
+ 0.324167f,
+ 0.327680f,
+ 0.330289f,
+ 0.332302f,
+ 0.333933f,
+ 0.335349f,
+ 0.336369f,
+ 0.336651f,
+ 0.332013f,
+ 0.317229f,
+ 0.297487f,
+ 0.274689f,
+ 0.256886f,
+ 0.241113f,
+ 0.228719f,
+ 0.216465f,
+ 0.204327f,
+ 0.189073f,
+ 0.172971f,
+ 0.156092f,
+ 0.144142f,
+ 0.137935f,
+ 0.135746f,
+ 0.135408f,
+ 0.135108f,
+ 0.135290f,
+ 0.136806f,
+ 0.139285f,
+ 0.142283f,
+ 0.146246f,
+ 0.150827f,
+ 0.156610f,
+ 0.163525f,
+ 0.172390f,
+ 0.182125f,
+ 0.194004f,
+ 0.205548f,
+ 0.218650f,
+ 0.229767f,
+ 0.241312f,
+ 0.250969f,
+ 0.260058f,
+ 0.267258f,
+ 0.273344f,
+ 0.278252f,
+ 0.282554f,
+ 0.285948f,
+ 0.288677f,
+ 0.290717f,
+ 0.292275f,
+ 0.291604f,
+ 0.290217f,
+ 0.288450f,
+ 0.284748f,
+ 0.271913f,
+ 0.252560f,
+ 0.232565f,
+ 0.219244f,
+ 0.209415f,
+ 0.195565f,
+ 0.180737f,
+ 0.159085f,
+ 0.137542f,
+ 0.113033f,
+ 0.096710f,
+ 0.083231f,
+ 0.074138f,
+ 0.055846f,
+ 0.036990f,
+ 0.019040f,
+ 0.010356f,
+ 0.007227f,
+ 0.005508f,
+ 0.005792f,
+ 0.006806f,
+ 0.008354f,
+ 0.010121f,
+ 0.012706f,
+ 0.015835f,
+ 0.019765f,
+ 0.024381f,
+ 0.030683f,
+ 0.039138f,
+ 0.049227f,
+ 0.060977f,
+ 0.073448f,
+ 0.086737f,
+ 0.099827f,
+ 0.112119f,
+ 0.123642f,
+ 0.133425f,
+ 0.141902f,
+ 0.148325f,
+ 0.153540f,
+ 0.157427f,
+ 0.160742f,
+ 0.163300f,
+ 0.165521f,
+ 0.167092f,
+ 0.168369f,
+ 0.168800f,
+ 0.168979f,
+ 0.168898f,
+ 0.167698f,
+ 0.161090f,
+ 0.146896f,
+ 0.129098f,
+ 0.108996f,
+ 0.095350f,
+ 0.081327f,
+ 0.067123f,
+ 0.050902f,
+ 0.035744f,
+ 0.025400f,
+ 0.010925f,
+ -0.004717f,
+ -0.022817f,
+ -0.034933f,
+ -0.042008f,
+ -0.044531f,
+ -0.046185f,
+ -0.046802f,
+ -0.045888f,
+ -0.043906f,
+ -0.041594f,
+ -0.038598f,
+ -0.035010f,
+ -0.030331f,
+ -0.024879f,
+ -0.018019f,
+ -0.009302f,
+ 0.001579f,
+ 0.013902f,
+ 0.026473f,
+ 0.039660f,
+ 0.052698f,
+ 0.065935f,
+ 0.077508f,
+ 0.088279f,
+ 0.096442f,
+ 0.103571f,
+ 0.108948f,
+ 0.113794f,
+ 0.117692f,
+ 0.121037f,
+ 0.123835f,
+ 0.125223f,
+ 0.126258f,
+ 0.127131f,
+ 0.126923f,
+ 0.123850f,
+ 0.118258f,
+ 0.108615f,
+ 0.095629f,
+ 0.078385f,
+ 0.063229f,
+ 0.047862f,
+ 0.030673f,
+ 0.012429f,
+ -0.003079f,
+ -0.013092f,
+ -0.025794f,
+ -0.042504f,
+ -0.063777f,
+ -0.080902f,
+ -0.091581f,
+ -0.096348f,
+ -0.098667f,
+ -0.099679f,
+ -0.099750f,
+ -0.098627f,
+ -0.097075f,
+ -0.093831f,
+ -0.089900f,
+ -0.084754f,
+ -0.078852f,
+ -0.071010f,
+ -0.061729f,
+ -0.050367f,
+ -0.036123f,
+ -0.020167f,
+ -0.003046f,
+ 0.013727f,
+ 0.031123f,
+ 0.048760f,
+ 0.066077f,
+ 0.082594f,
+ 0.098540f,
+ 0.113377f,
+ 0.125850f,
+ 0.135323f,
+ 0.142679f,
+ 0.148633f,
+ 0.153665f,
+ 0.157060f,
+ 0.159879f,
+ 0.162200f,
+ 0.164158f,
+ 0.164840f,
+ 0.165283f,
+ 0.164706f,
+ 0.163552f,
+ 0.155023f,
+ 0.141160f,
+ 0.123215f,
+ 0.110198f,
+ 0.096106f,
+ 0.082298f,
+ 0.064638f,
+ 0.048440f,
+ 0.035300f,
+ 0.022754f,
+ 0.006835f,
+ -0.010156f,
+ -0.021771f,
+ -0.026123f,
+ -0.028338f,
+ -0.030206f,
+ -0.030704f,
+ -0.030819f,
+ -0.030646f,
+ -0.029369f,
+ -0.026688f,
+ -0.023558f,
+ -0.019396f,
+ -0.014408f,
+ -0.007629f,
+ -0.000598f,
+ 0.008677f,
+ 0.018690f,
+ 0.031396f,
+ 0.045138f,
+ 0.058550f,
+ 0.071913f,
+ 0.083965f,
+ 0.095460f,
+ 0.104360f,
+ 0.111060f,
+ 0.116933f,
+ 0.121977f,
+ 0.127140f,
+ 0.131398f,
+ 0.135027f,
+ 0.137550f,
+ 0.139698f,
+ 0.141179f,
+ 0.141398f,
+ 0.139967f,
+ 0.136915f,
+ 0.129242f,
+ 0.113294f,
+ 0.093673f,
+ 0.077990f,
+ 0.067004f,
+ 0.055440f,
+ 0.036258f,
+ 0.014829f,
+ -0.006548f,
+ -0.024492f,
+ -0.039221f,
+ -0.052006f,
+ -0.061833f,
+ -0.081844f,
+ -0.101194f,
+ -0.118940f,
+ -0.123979f,
+ -0.127219f,
+ -0.129285f,
+ -0.129752f,
+ -0.128396f,
+ -0.126790f,
+ -0.124679f,
+ -0.121746f,
+ -0.118360f,
+ -0.114323f,
+ -0.109629f,
+ -0.103065f,
+ -0.095467f,
+ -0.086760f,
+ -0.076556f,
+ -0.065606f,
+ -0.053871f,
+ -0.042154f,
+ -0.031344f,
+ -0.020633f,
+ -0.011442f,
+ -0.002675f,
+ 0.004367f,
+ 0.010588f,
+ 0.015746f,
+ 0.020223f,
+ 0.023363f,
+ 0.026210f,
+ 0.028256f,
+ 0.029208f,
+ 0.029067f,
+ 0.027831f,
+ 0.027192f,
+ 0.025338f,
+ 0.023379f,
+ 0.013079f,
+ -0.004717f,
+ -0.026621f,
+ -0.042185f,
+ -0.050844f,
+ -0.058408f,
+ -0.071371f,
+ -0.085594f,
+ -0.101104f,
+ -0.116917f,
+ -0.134375f,
+ -0.148254f,
+ -0.156848f,
+ -0.160181f,
+ -0.161862f,
+ -0.160902f,
+ -0.159663f,
+ -0.158171f,
+ -0.156371f,
+ -0.153390f,
+ -0.149787f,
+ -0.145373f,
+ -0.140463f,
+ -0.134506f,
+ -0.126760f,
+ -0.117371f,
+ -0.105744f,
+ -0.090385f,
+ -0.074429f,
+ -0.056683f,
+ -0.039369f,
+ -0.020840f,
+ -0.004060f,
+ 0.012421f,
+ 0.028002f,
+ 0.042525f,
+ 0.053729f,
+ 0.062708f,
+ 0.070579f,
+ 0.076869f,
+ 0.082004f,
+ 0.086100f,
+ 0.089454f,
+ 0.092100f,
+ 0.093448f,
+ 0.094596f,
+ 0.095190f,
+ 0.094925f,
+ 0.094171f,
+ 0.088446f,
+ 0.076200f,
+ 0.060398f,
+ 0.043615f,
+ 0.029790f,
+ 0.014402f,
+ -0.000100f,
+ -0.016410f,
+ -0.030144f,
+ -0.042867f,
+ -0.051231f,
+ -0.071542f,
+ -0.089127f,
+ -0.107821f,
+ -0.111812f,
+ -0.114223f,
+ -0.113242f,
+ -0.112665f,
+ -0.112933f,
+ -0.112894f,
+ -0.111831f,
+ -0.109294f,
+ -0.106244f,
+ -0.102327f,
+ -0.097390f,
+ -0.091279f,
+ -0.084763f,
+ -0.076671f,
+ -0.067613f,
+ -0.057510f,
+ -0.045706f,
+ -0.033808f,
+ -0.022519f,
+ -0.013494f,
+ -0.006054f,
+ 0.000846f,
+ 0.006513f,
+ 0.011538f,
+ 0.015498f,
+ 0.018471f,
+ 0.020890f,
+ 0.022927f,
+ 0.024048f,
+ 0.024923f,
+ 0.024756f,
+ 0.024390f,
+ 0.022385f,
+ 0.015010f,
+ -0.000929f,
+ -0.020058f,
+ -0.035138f,
+ -0.049040f,
+ -0.063442f,
+ -0.080527f,
+ -0.095790f,
+ -0.111846f,
+ -0.124119f,
+ -0.137869f,
+ -0.154810f,
+ -0.174006f,
+ -0.187954f,
+ -0.192898f,
+ -0.194717f,
+ -0.194002f,
+ -0.193606f,
+ -0.192838f,
+ -0.191906f,
+ -0.189796f,
+ -0.187219f,
+ -0.183352f,
+ -0.178273f,
+ -0.171546f,
+ -0.162892f,
+ -0.151940f,
+ -0.137840f,
+ -0.122652f,
+ -0.106754f,
+ -0.090896f,
+ -0.074506f,
+ -0.057977f,
+ -0.041875f,
+ -0.025856f,
+ -0.009904f,
+ 0.004654f,
+ 0.017038f,
+ 0.026323f,
+ 0.033631f,
+ 0.039354f,
+ 0.043983f,
+ 0.047875f,
+ 0.050869f,
+ 0.053396f,
+ 0.055181f,
+ 0.056808f,
+ 0.058231f,
+ 0.058588f,
+ 0.058102f,
+ 0.055340f,
+ 0.043477f,
+ 0.029631f,
+ 0.012365f,
+ -0.004065f,
+ -0.020729f,
+ -0.035898f,
+ -0.045956f,
+ -0.055442f,
+ -0.067540f,
+ -0.082983f,
+ -0.098429f,
+ -0.107348f,
+ -0.113762f,
+ -0.118212f,
+ -0.122210f,
+ -0.120873f,
+ -0.118656f,
+ -0.115994f,
+ -0.112758f,
+ -0.108758f,
+ -0.103712f,
+ -0.098379f,
+ -0.091629f,
+ -0.083485f,
+ -0.072842f,
+ -0.061054f,
+ -0.047981f,
+ -0.034848f,
+ -0.020579f,
+ -0.006998f,
+ 0.007381f,
+ 0.019550f,
+ 0.030617f,
+ 0.038775f,
+ 0.045425f,
+ 0.050592f,
+ 0.054721f,
+ 0.058144f,
+ 0.060827f,
+ 0.063106f,
+ 0.065060f,
+ 0.066704f,
+ 0.067233f,
+ 0.066296f,
+ 0.064069f,
+ 0.055794f,
+ 0.038463f,
+ 0.017242f,
+ -0.000838f,
+ -0.016260f,
+ -0.031590f,
+ -0.047215f,
+ -0.065594f,
+ -0.088327f,
+ -0.108610f,
+ -0.122673f,
+ -0.130100f,
+ -0.143948f,
+ -0.166542f,
+ -0.190063f,
+ -0.205654f,
+ -0.208160f,
+ -0.206762f,
+ -0.205000f,
+ -0.202956f,
+ -0.200735f,
+ -0.197835f,
+ -0.194198f,
+ -0.189148f,
+ -0.183229f,
+ -0.175448f,
+ -0.165417f,
+ -0.152492f,
+ -0.137487f,
+ -0.120192f,
+ -0.102040f,
+ -0.082050f,
+ -0.062356f,
+ -0.041144f,
+ -0.020358f,
+ 0.000892f,
+ 0.021029f,
+ 0.040292f,
+ 0.058506f,
+ 0.075133f,
+ 0.089719f,
+ 0.101621f,
+ 0.111606f,
+ 0.120237f,
+ 0.127596f,
+ 0.133985f,
+ 0.137450f,
+ 0.140485f,
+ 0.143071f,
+ 0.147804f,
+ 0.152540f,
+ 0.150423f,
+ 0.135937f,
+ 0.113186f,
+ 0.093497f,
+ 0.075458f,
+ 0.060394f,
+ 0.046147f,
+ 0.036789f,
+ 0.022525f,
+ 0.007956f,
+ -0.003939f,
+ -0.007344f,
+ -0.008578f,
+ -0.008761f,
+ -0.009653f,
+ -0.010347f,
+ -0.010086f,
+ -0.008033f,
+ -0.005500f,
+ -0.001631f,
+ 0.002981f,
+ 0.008764f,
+ 0.015400f,
+ 0.023631f,
+ 0.034019f,
+ 0.045961f,
+ 0.059742f,
+ 0.074939f,
+ 0.091878f,
+ 0.109253f,
+ 0.127011f,
+ 0.144511f,
+ 0.161947f,
+ 0.178478f,
+ 0.194497f,
+ 0.209247f,
+ 0.221717f,
+ 0.230969f,
+ 0.238231f,
+ 0.243994f,
+ 0.249075f,
+ 0.252917f,
+ 0.255914f,
+ 0.258011f,
+ 0.259731f,
+ 0.261181f,
+ 0.261567f,
+ 0.258267f,
+ 0.253017f,
+ 0.239442f,
+ 0.224203f,
+ 0.207439f,
+ 0.194406f,
+ 0.178864f,
+ 0.164392f,
+ 0.147450f,
+ 0.132022f,
+ 0.115247f,
+ 0.099542f,
+ 0.084064f,
+ 0.066653f,
+ 0.050431f,
+ 0.036419f,
+ 0.026522f,
+ 0.021703f,
+ 0.020464f,
+ 0.020233f,
+ 0.020619f,
+ 0.021397f,
+ 0.023153f,
+ 0.025228f,
+ 0.027789f,
+ 0.030911f,
+ 0.035478f,
+ 0.040947f,
+ 0.047586f,
+ 0.055889f,
+ 0.065503f,
+ 0.075811f,
+ 0.086247f,
+ 0.097178f,
+ 0.108319f,
+ 0.118614f,
+ 0.128206f,
+ 0.136156f,
+ 0.142783f,
+ 0.148000f,
+ 0.152369f,
+ 0.155853f,
+ 0.158517f,
+ 0.161008f,
+ 0.163208f,
+ 0.164325f,
+ 0.163761f,
+ 0.162789f,
+ 0.161822f,
+ 0.157622f,
+ 0.150861f,
+ 0.131683f,
+ 0.112525f,
+ 0.093733f,
+ 0.083811f,
+ 0.075208f,
+ 0.063250f,
+ 0.049028f,
+ 0.031033f,
+ 0.014383f,
+ -0.002664f,
+ -0.019406f,
+ -0.035203f,
+ -0.046194f,
+ -0.051275f,
+ -0.053328f,
+ -0.053264f,
+ -0.052328f,
+ -0.050839f,
+ -0.048994f,
+ -0.046417f,
+ -0.043078f,
+ -0.039292f,
+ -0.033989f,
+ -0.027369f,
+ -0.017842f,
+ -0.006581f,
+ 0.007625f,
+ 0.023208f,
+ 0.039933f,
+ 0.057044f,
+ 0.074333f,
+ 0.092317f,
+ 0.110247f,
+ 0.127739f,
+ 0.144167f,
+ 0.159375f,
+ 0.174353f,
+ 0.187678f,
+ 0.198369f,
+ 0.206586f,
+ 0.212436f,
+ 0.217767f,
+ 0.221308f,
+ 0.224206f,
+ 0.226164f,
+ 0.227786f,
+ 0.229233f,
+ 0.230386f,
+ 0.230842f,
+ 0.226650f,
+ 0.221106f,
+ 0.208531f,
+ 0.188894f,
+ 0.167756f,
+ 0.153153f,
+ 0.146469f,
+ 0.139311f,
+ 0.127267f,
+ 0.109231f,
+ 0.090847f,
+ 0.074503f,
+ 0.066442f,
+ 0.062200f,
+ 0.061031f,
+ 0.061539f,
+ 0.062247f,
+ 0.064244f,
+ 0.066567f,
+ 0.069253f,
+ 0.072239f,
+ 0.075872f,
+ 0.080519f,
+ 0.086344f,
+ 0.094731f,
+ 0.104569f,
+ 0.116947f,
+ 0.128678f,
+ 0.142956f,
+ 0.157467f,
+ 0.173558f,
+ 0.187992f,
+ 0.202042f,
+ 0.214847f,
+ 0.226214f,
+ 0.235814f,
+ 0.243547f,
+ 0.250244f,
+ 0.255253f,
+ 0.259617f,
+ 0.263261f,
+ 0.266528f,
+ 0.269228f,
+ 0.271519f,
+ 0.273567f,
+ 0.273111f,
+ 0.270289f,
+ 0.256711f,
+ 0.237736f,
+ 0.219611f,
+ 0.207658f,
+ 0.197131f,
+ 0.181914f,
+ 0.167639f,
+ 0.145656f,
+ 0.127956f,
+ 0.111897f,
+ 0.105661f,
+ 0.093169f,
+ 0.070569f,
+ 0.049358f,
+ 0.035025f,
+ 0.032497f,
+ 0.032594f,
+ 0.033694f,
+ 0.033969f,
+ 0.034414f,
+ 0.034986f,
+ 0.037425f,
+ 0.040794f,
+ 0.044433f,
+ 0.048706f,
+ 0.054047f,
+ 0.061228f,
+ 0.070014f,
+ 0.080064f,
+ 0.091886f,
+ 0.105108f,
+ 0.118725f,
+ 0.131825f,
+ 0.144833f,
+ 0.157122f,
+ 0.169147f,
+ 0.179256f,
+ 0.187433f,
+ 0.194047f,
+ 0.199064f,
+ 0.203600f,
+ 0.206972f,
+ 0.209758f,
+ 0.212061f,
+ 0.210994f,
+ 0.208939f,
+ 0.206533f,
+ 0.206178f,
+ 0.201447f,
+ 0.185256f,
+ 0.167178f,
+ 0.146983f,
+ 0.133539f,
+ 0.118258f,
+ 0.104553f,
+ 0.085978f,
+ 0.062297f,
+ 0.042164f,
+ 0.023422f,
+ 0.007600f,
+ -0.011600f,
+ -0.026528f,
+ -0.039069f,
+ -0.055853f,
+ -0.073561f,
+ -0.087314f,
+ -0.091578f,
+ -0.091531f,
+ -0.091047f,
+ -0.090317f,
+ -0.088714f,
+ -0.086872f,
+ -0.084119f,
+ -0.080636f,
+ -0.076547f,
+ -0.072150f,
+ -0.066194f,
+ -0.058817f,
+ -0.050044f,
+ -0.041122f,
+ -0.030858f,
+ -0.019708f,
+ -0.009039f,
+ -0.000158f,
+ 0.007333f,
+ 0.013658f,
+ 0.019586f,
+ 0.023914f,
+ 0.028003f,
+ 0.031178f,
+ 0.034056f,
+ 0.035361f,
+ 0.036364f,
+ 0.037172f,
+ 0.038764f,
+ 0.035614f,
+ 0.026031f,
+ 0.006575f,
+ -0.016569f,
+ -0.035247f,
+ -0.046811f,
+ -0.056842f,
+ -0.072622f,
+ -0.094786f,
+ -0.115744f,
+ -0.136742f,
+ -0.152019f,
+ -0.167950f,
+ -0.181489f,
+ -0.196672f,
+ -0.213819f,
+ -0.231247f,
+ -0.246267f,
+ -0.253869f,
+ -0.255722f,
+ -0.254608f,
+ -0.252497f,
+ -0.250106f,
+ -0.246822f,
+ -0.243092f,
+ -0.238450f,
+ -0.232494f,
+ -0.224069f,
+ -0.213492f,
+ -0.200478f,
+ -0.185603f,
+ -0.168956f,
+ -0.151044f,
+ -0.132628f,
+ -0.113256f,
+ -0.094108f,
+ -0.074814f,
+ -0.056247f,
+ -0.038283f,
+ -0.021367f,
+ -0.005494f,
+ 0.007325f,
+ 0.017964f,
+ 0.025739f,
+ 0.032350f,
+ 0.037275f,
+ 0.041217f,
+ 0.043378f,
+ 0.044736f,
+ 0.045469f,
+ 0.046861f,
+ 0.048028f,
+ 0.048300f,
+ 0.045414f,
+ 0.041303f,
+ 0.023389f,
+ 0.004828f,
+ -0.018892f,
+ -0.030444f,
+ -0.040108f,
+ -0.047003f,
+ -0.055444f,
+ -0.073517f,
+ -0.093406f,
+ -0.113319f,
+ -0.122800f,
+ -0.127992f,
+ -0.129094f,
+ -0.128975f,
+ -0.127408f,
+ -0.126258f,
+ -0.124817f,
+ -0.122972f,
+ -0.119975f,
+ -0.116261f,
+ -0.111111f,
+ -0.104950f,
+ -0.096706f,
+ -0.088014f,
+ -0.077300f,
+ -0.066125f,
+ -0.053281f,
+ -0.040908f,
+ -0.027328f,
+ -0.014228f,
+ -0.001428f,
+ 0.009142f,
+ 0.018933f,
+ 0.026964f,
+ 0.033256f,
+ 0.037831f,
+ 0.041708f,
+ 0.045264f,
+ 0.048083f,
+ 0.050669f,
+ 0.052861f,
+ 0.054753f,
+ 0.052786f,
+ 0.049775f,
+ 0.044925f,
+ 0.031800f,
+ 0.014497f,
+ -0.003956f,
+ -0.017328f,
+ -0.029261f,
+ -0.042964f,
+ -0.060253f,
+ -0.079731f,
+ -0.103908f,
+ -0.122219f,
+ -0.139822f,
+ -0.150408f,
+ -0.161189f,
+ -0.177706f,
+ -0.199969f,
+ -0.220908f,
+ -0.232328f,
+ -0.236753f,
+ -0.237819f,
+ -0.237486f,
+ -0.235839f,
+ -0.234039f,
+ -0.231956f,
+ -0.229444f,
+ -0.226239f,
+ -0.222783f,
+ -0.218286f,
+ -0.212806f,
+ -0.206331f,
+ -0.199089f,
+ -0.191928f,
+ -0.182569f,
+ -0.172314f,
+ -0.160683f,
+ -0.150358f,
+ -0.140681f,
+ -0.132992f,
+ -0.125711f,
+ -0.120111f,
+ -0.114819f,
+ -0.111019f,
+ -0.107897f,
+ -0.105319f,
+ -0.103133f,
+ -0.101153f,
+ -0.099469f,
+ -0.098011f,
+ -0.096803f,
+ -0.095803f,
+ -0.096725f,
+ -0.102194f,
+ -0.123900f,
+ -0.144386f,
+ -0.164197f,
+ -0.169967f,
+ -0.176211f,
+ -0.185042f,
+ -0.194178f,
+ -0.214786f,
+ -0.233878f,
+ -0.253069f,
+ -0.260436f,
+ -0.263592f,
+ -0.264781f,
+ -0.265078f,
+ -0.264378f,
+ -0.262481f,
+ -0.260214f,
+ -0.257433f,
+ -0.253578f,
+ -0.248667f,
+ -0.242367f,
+ -0.234086f,
+ -0.222417f,
+ -0.207922f,
+ -0.191181f,
+ -0.173519f,
+ -0.154258f,
+ -0.134083f,
+ -0.112744f,
+ -0.091586f,
+ -0.069989f,
+ -0.048831f,
+ -0.027114f,
+ -0.005756f,
+ 0.014653f,
+ 0.034025f,
+ 0.051442f,
+ 0.068014f,
+ 0.081617f,
+ 0.092258f,
+ 0.099942f,
+ 0.106164f,
+ 0.111131f,
+ 0.114894f,
+ 0.117642f,
+ 0.120039f,
+ 0.120764f,
+ 0.119075f,
+ 0.117136f,
+ 0.116222f,
+ 0.115728f,
+ 0.111208f,
+ 0.097333f,
+ 0.083117f,
+ 0.068183f,
+ 0.060675f,
+ 0.050347f,
+ 0.040636f,
+ 0.025594f,
+ 0.011139f,
+ -0.000294f,
+ -0.005317f,
+ -0.006594f,
+ -0.006469f,
+ -0.005131f,
+ -0.003683f,
+ -0.001817f,
+ 0.000747f,
+ 0.004464f,
+ 0.009236f,
+ 0.014408f,
+ 0.020800f,
+ 0.028125f,
+ 0.037250f,
+ 0.047964f,
+ 0.061019f,
+ 0.075053f,
+ 0.089844f,
+ 0.103817f,
+ 0.118589f,
+ 0.132636f,
+ 0.146336f,
+ 0.158303f,
+ 0.168106f,
+ 0.175550f,
+ 0.181356f,
+ 0.186314f,
+ 0.190364f,
+ 0.193106f,
+ 0.195444f,
+ 0.197381f,
+ 0.197586f,
+ 0.197358f,
+ 0.195578f,
+ 0.192433f,
+ 0.180286f,
+ 0.161164f,
+ 0.142217f,
+ 0.131189f,
+ 0.116208f,
+ 0.100978f,
+ 0.079447f,
+ 0.065425f,
+ 0.046675f,
+ 0.025094f,
+ 0.005158f,
+ -0.010736f,
+ -0.021242f,
+ -0.036728f,
+ -0.053875f,
+ -0.066917f,
+ -0.072389f,
+ -0.072708f,
+ -0.072142f,
+ -0.070967f,
+ -0.069589f,
+ -0.067722f,
+ -0.065389f,
+ -0.061803f,
+ -0.057408f,
+ -0.051828f,
+ -0.045375f,
+ -0.037094f,
+ -0.026161f,
+ -0.013269f,
+ 0.001253f,
+ 0.016089f,
+ 0.031675f,
+ 0.046967f,
+ 0.061353f,
+ 0.075569f,
+ 0.089169f,
+ 0.101622f,
+ 0.110631f,
+ 0.117683f,
+ 0.123444f,
+ 0.128672f,
+ 0.132753f,
+ 0.136222f,
+ 0.139131f,
+ 0.140744f,
+ 0.140553f,
+ 0.140092f,
+ 0.139156f,
+ 0.138394f,
+ 0.131817f,
+ 0.116044f,
+ 0.096017f,
+ 0.080017f,
+ 0.069161f,
+ 0.058714f,
+ 0.042392f,
+ 0.022383f,
+ 0.004594f,
+ -0.011658f,
+ -0.021231f,
+ -0.039508f,
+ -0.052017f,
+ -0.063483f,
+ -0.067406f,
+ -0.071867f,
+ -0.075219f,
+ -0.074664f,
+ -0.072903f,
+ -0.070592f,
+ -0.067486f,
+ -0.063236f,
+ -0.058425f,
+ -0.052803f,
+ -0.046361f,
+ -0.037769f,
+ -0.027178f,
+ -0.014433f,
+ 0.000042f,
+ 0.015100f,
+ 0.030289f,
+ 0.044542f,
+ 0.059128f,
+ 0.073139f,
+ 0.086708f,
+ 0.098203f,
+ 0.107736f,
+ 0.115192f,
+ 0.120953f,
+ 0.125403f,
+ 0.128764f,
+ 0.131406f,
+ 0.133428f,
+ 0.134914f,
+ 0.135422f,
+ 0.133806f,
+ 0.131728f,
+ 0.125981f,
+ 0.116400f,
+ 0.099486f,
+ 0.079789f,
+ 0.063200f,
+ 0.048353f,
+ 0.031097f,
+ 0.011522f,
+ -0.005383f,
+ -0.019839f,
+ -0.032758f,
+ -0.048839f,
+ -0.067628f,
+ -0.087058f,
+ -0.100936f,
+ -0.105450f,
+ -0.107231f,
+ -0.107914f,
+ -0.107964f,
+ -0.106294f,
+ -0.104056f,
+ -0.101000f,
+ -0.097072f,
+ -0.092175f,
+ -0.086422f,
+ -0.079233f,
+ -0.069828f,
+ -0.057503f,
+ -0.043364f,
+ -0.027533f,
+ -0.011581f,
+ 0.006803f,
+ 0.025069f,
+ 0.043872f,
+ 0.060969f,
+ 0.077694f,
+ 0.093303f,
+ 0.106394f,
+ 0.116161f,
+ 0.124161f,
+ 0.130853f,
+ 0.137058f,
+ 0.141233f,
+ 0.144583f,
+ 0.147053f,
+ 0.148975f,
+ 0.149922f,
+ 0.150625f,
+ 0.151428f,
+ 0.152547f,
+ 0.151358f,
+ 0.149314f,
+ 0.133597f,
+ 0.111436f,
+ 0.086911f,
+ 0.073439f,
+ 0.068269f,
+ 0.061353f,
+ 0.054503f,
+ 0.035503f,
+ 0.012842f,
+ -0.008617f,
+ -0.017806f,
+ -0.019392f,
+ -0.019344f,
+ -0.018994f,
+ -0.017436f,
+ -0.015706f,
+ -0.013500f,
+ -0.010931f,
+ -0.007836f,
+ -0.004400f,
+ -0.000431f,
+ 0.004647f,
+ 0.011225f,
+ 0.018633f,
+ 0.026989f,
+ 0.036647f,
+ 0.048825f,
+ 0.061697f,
+ 0.074656f,
+ 0.088028f,
+ 0.100419f,
+ 0.112322f,
+ 0.121211f,
+ 0.129539f,
+ 0.135656f,
+ 0.141011f,
+ 0.145403f,
+ 0.149342f,
+ 0.152894f,
+ 0.155736f,
+ 0.157575f,
+ 0.158775f,
+ 0.159742f,
+ 0.159753f,
+ 0.157850f,
+ 0.153753f,
+ 0.144453f,
+ 0.134275f,
+ 0.119503f,
+ 0.105386f,
+ 0.088883f,
+ 0.073844f,
+ 0.056783f,
+ 0.041822f,
+ 0.027739f,
+ 0.016069f,
+ 0.006806f,
+ -0.009781f,
+ -0.027239f,
+ -0.044525f,
+ -0.050436f,
+ -0.050092f,
+ -0.049603f,
+ -0.048992f,
+ -0.047903f,
+ -0.046261f,
+ -0.043958f,
+ -0.041564f,
+ -0.037647f,
+ -0.033647f,
+ -0.028464f,
+ -0.023125f,
+ -0.014894f,
+ -0.006142f,
+ 0.003869f,
+ 0.013806f,
+ 0.026603f,
+ 0.039031f,
+ 0.052675f,
+ 0.064389f,
+ 0.076019f,
+ 0.085431f,
+ 0.092753f,
+ 0.098622f,
+ 0.103194f,
+ 0.108294f,
+ 0.112722f,
+ 0.116628f,
+ 0.119533f,
+ 0.122028f,
+ 0.124122f,
+ 0.124350f,
+ 0.123211f,
+ 0.121794f,
+ 0.119861f,
+ 0.118775f,
+ 0.111647f,
+ 0.096981f,
+ 0.080336f,
+ 0.065661f,
+ 0.058553f,
+ 0.051311f,
+ 0.045344f,
+ 0.029961f,
+ 0.010297f,
+ -0.007253f,
+ -0.014400f,
+ -0.016289f,
+ -0.019581f,
+ -0.022017f,
+ -0.022931f,
+ -0.021539f,
+ -0.019992f,
+ -0.017700f,
+ -0.013833f,
+ -0.008578f,
+ -0.003222f,
+ 0.002764f,
+ 0.010389f,
+ 0.018572f,
+ 0.029769f,
+ 0.041939f,
+ 0.058328f,
+ 0.076017f,
+ 0.094836f,
+ 0.113322f,
+ 0.130956f,
+ 0.149436f,
+ 0.168375f,
+ 0.185625f,
+ 0.199575f,
+ 0.210381f,
+ 0.219500f,
+ 0.227425f,
+ 0.234619f,
+ 0.240158f,
+ 0.245169f,
+ 0.248736f,
+ 0.251281f,
+ 0.252894f,
+ 0.253983f,
+ 0.255347f,
+ 0.255103f,
+ 0.254233f,
+ 0.252281f,
+ 0.241461f,
+ 0.222286f,
+ 0.200392f,
+ 0.188272f,
+ 0.177158f,
+ 0.162958f,
+ 0.145222f,
+ 0.128878f,
+ 0.113053f,
+ 0.098914f,
+ 0.080969f,
+ 0.062600f,
+ 0.044894f,
+ 0.037161f,
+ 0.035986f,
+ 0.034394f,
+ 0.033131f,
+ 0.032103f,
+ 0.032664f,
+ 0.033472f,
+ 0.035014f,
+ 0.037753f,
+ 0.041000f,
+ 0.045756f,
+ 0.052072f,
+ 0.059661f,
+ 0.067183f,
+ 0.076136f,
+ 0.087675f,
+ 0.100542f,
+ 0.112025f,
+ 0.122411f,
+ 0.131378f,
+ 0.139736f,
+ 0.146047f,
+ 0.151031f,
+ 0.155850f,
+ 0.159758f,
+ 0.163344f,
+ 0.165744f,
+ 0.167975f,
+ 0.169775f,
+ 0.171261f,
+ 0.170361f,
+ 0.168531f,
+ 0.160636f,
+ 0.141264f,
+ 0.120986f,
+ 0.103869f,
+ 0.097097f,
+ 0.084592f,
+ 0.069836f,
+ 0.042614f,
+ 0.016678f,
+ -0.006822f,
+ -0.016178f,
+ -0.026853f,
+ -0.042978f,
+ -0.067506f,
+ -0.089914f,
+ -0.104489f,
+ -0.110358f,
+ -0.110669f,
+ -0.111217f,
+ -0.110386f,
+ -0.109406f,
+ -0.107533f,
+ -0.105483f,
+ -0.102728f,
+ -0.099211f,
+ -0.094586f,
+ -0.089106f,
+ -0.082497f,
+ -0.074019f,
+ -0.063703f,
+ -0.050961f,
+ -0.037289f,
+ -0.022008f,
+ -0.006747f,
+ 0.007961f,
+ 0.021728f,
+ 0.034747f,
+ 0.045958f,
+ 0.054686f,
+ 0.060683f,
+ 0.065969f,
+ 0.070175f,
+ 0.074139f,
+ 0.077178f,
+ 0.079633f,
+ 0.081256f,
+ 0.082300f,
+ 0.083006f,
+ 0.082914f,
+ 0.079886f,
+ 0.069253f,
+ 0.051550f,
+ 0.034608f,
+ 0.020811f,
+ 0.006133f,
+ -0.014075f,
+ -0.032992f,
+ -0.050303f,
+ -0.064400f,
+ -0.080283f,
+ -0.096581f,
+ -0.112694f,
+ -0.128761f,
+ -0.145428f,
+ -0.162272f,
+ -0.174397f,
+ -0.178881f,
+ -0.178719f,
+ -0.178303f,
+ -0.177556f,
+ -0.176564f,
+ -0.175197f,
+ -0.173322f,
+ -0.170756f,
+ -0.167472f,
+ -0.164042f,
+ -0.159208f,
+ -0.153533f,
+ -0.145097f,
+ -0.135881f,
+ -0.125561f,
+ -0.115656f,
+ -0.106722f,
+ -0.099108f,
+ -0.092378f,
+ -0.086475f,
+ -0.080942f,
+ -0.076717f,
+ -0.073042f,
+ -0.070203f,
+ -0.067758f,
+ -0.065661f,
+ -0.063772f,
+ -0.062919f,
+ -0.062508f,
+ -0.064553f,
+ -0.069481f,
+ -0.083475f,
+ -0.101014f,
+ -0.118306f,
+ -0.133569f,
+ -0.148647f,
+ -0.164883f,
+ -0.183069f,
+ -0.200964f,
+ -0.220908f,
+ -0.237325f,
+ -0.254011f,
+ -0.269417f,
+ -0.283558f,
+ -0.303147f,
+ -0.321553f,
+ -0.335831f,
+ -0.342825f,
+ -0.346650f,
+ -0.351258f,
+ -0.351764f,
+ -0.351053f,
+ -0.348650f,
+ -0.345839f,
+ -0.342464f,
+ -0.337956f,
+ -0.332264f,
+ -0.325164f,
+ -0.316219f,
+ -0.305242f,
+ -0.291650f,
+ -0.276536f,
+ -0.260342f,
+ -0.243481f,
+ -0.226789f,
+ -0.209356f,
+ -0.191964f,
+ -0.174397f,
+ -0.157931f,
+ -0.143311f,
+ -0.130967f,
+ -0.121072f,
+ -0.113803f,
+ -0.107972f,
+ -0.103361f,
+ -0.099392f,
+ -0.096589f,
+ -0.094614f,
+ -0.093292f,
+ -0.092211f,
+ -0.091892f,
+ -0.091608f,
+ -0.092050f,
+ -0.094842f,
+ -0.102242f,
+ -0.119044f,
+ -0.135133f,
+ -0.150986f,
+ -0.158475f,
+ -0.165883f,
+ -0.179239f,
+ -0.195439f,
+ -0.209769f,
+ -0.213783f,
+ -0.213392f,
+ -0.213792f,
+ -0.213878f,
+ -0.213669f,
+ -0.212239f,
+ -0.210611f,
+ -0.208742f,
+ -0.205939f,
+ -0.202256f,
+ -0.197278f,
+ -0.191136f,
+ -0.182614f,
+ -0.171292f,
+ -0.158158f,
+ -0.142750f,
+ -0.126694f,
+ -0.109272f,
+ -0.092153f,
+ -0.075339f,
+ -0.058350f,
+ -0.042103f,
+ -0.025672f,
+ -0.009756f,
+ 0.005531f,
+ 0.019122f,
+ 0.030144f,
+ 0.038753f,
+ 0.045556f,
+ 0.050883f,
+ 0.055172f,
+ 0.058461f,
+ 0.060983f,
+ 0.061544f,
+ 0.061614f,
+ 0.061306f,
+ 0.062153f,
+ 0.062442f,
+ 0.060944f,
+ 0.053539f,
+ 0.037603f,
+ 0.020539f,
+ 0.002006f,
+ -0.011361f,
+ -0.023944f,
+ -0.032208f,
+ -0.041714f,
+ -0.060578f,
+ -0.080658f,
+ -0.099325f,
+ -0.106731f,
+ -0.111744f,
+ -0.113000f,
+ -0.114481f,
+ -0.113686f,
+ -0.114186f,
+ -0.113644f,
+ -0.112694f,
+ -0.109753f,
+ -0.106583f,
+ -0.102211f,
+ -0.096778f,
+ -0.090539f,
+ -0.083128f,
+ -0.074489f,
+ -0.062822f,
+ -0.050553f,
+ -0.037347f,
+ -0.023969f,
+ -0.009700f,
+ 0.003622f,
+ 0.016747f,
+ 0.027728f,
+ 0.038653f,
+ 0.046983f,
+ 0.054411f,
+ 0.059583f,
+ 0.063317f,
+ 0.066086f,
+ 0.068511f,
+ 0.070664f,
+ 0.071606f,
+ 0.072069f,
+ 0.072069f,
+ 0.071297f,
+ 0.069531f,
+ 0.064806f,
+ 0.050889f,
+ 0.032064f,
+ 0.012194f,
+ -0.001956f,
+ -0.015186f,
+ -0.028100f,
+ -0.041953f,
+ -0.054400f,
+ -0.068000f,
+ -0.083428f,
+ -0.106097f,
+ -0.125083f,
+ -0.136769f,
+ -0.137722f,
+ -0.138158f,
+ -0.138247f,
+ -0.138011f,
+ -0.136658f,
+ -0.134936f,
+ -0.132400f,
+ -0.128956f,
+ -0.123475f,
+ -0.116753f,
+ -0.106856f,
+ -0.095283f,
+ -0.080608f,
+ -0.065211f,
+ -0.047711f,
+ -0.029456f,
+ -0.009864f,
+ 0.009894f,
+ 0.030167f,
+ 0.050606f,
+ 0.071408f,
+ 0.091033f,
+ 0.109908f,
+ 0.126536f,
+ 0.142256f,
+ 0.155808f,
+ 0.166828f,
+ 0.175319f,
+ 0.181558f,
+ 0.187217f,
+ 0.191625f,
+ 0.195039f,
+ 0.196631f,
+ 0.197767f,
+ 0.198658f,
+ 0.200078f,
+ 0.200489f,
+ 0.199597f,
+ 0.190308f,
+ 0.174050f,
+ 0.156147f,
+ 0.143075f,
+ 0.134131f,
+ 0.119286f,
+ 0.105683f,
+ 0.092644f,
+ 0.079767f,
+ 0.064461f,
+ 0.051319f,
+ 0.044331f,
+ 0.041792f,
+ 0.039256f,
+ 0.039619f,
+ 0.040889f,
+ 0.043811f,
+ 0.047153f,
+ 0.050914f,
+ 0.055647f,
+ 0.061392f,
+ 0.067786f,
+ 0.075839f,
+ 0.085789f,
+ 0.098178f,
+ 0.111961f,
+ 0.126744f,
+ 0.142378f,
+ 0.158042f,
+ 0.173711f,
+ 0.188783f,
+ 0.203167f,
+ 0.217136f,
+ 0.229911f,
+ 0.241161f,
+ 0.249211f,
+ 0.255239f,
+ 0.259619f,
+ 0.263167f,
+ 0.265825f,
+ 0.267667f,
+ 0.269156f,
+ 0.270331f,
+ 0.270533f,
+ 0.269053f,
+ 0.264278f,
+ 0.251075f,
+ 0.232531f,
+ 0.213611f,
+ 0.198503f,
+ 0.185669f,
+ 0.169375f,
+ 0.152744f,
+ 0.133511f,
+ 0.115664f,
+ 0.098992f,
+ 0.083703f,
+ 0.069919f,
+ 0.053833f,
+ 0.036242f,
+ 0.021128f,
+ 0.012639f,
+ 0.009942f,
+ 0.009047f,
+ 0.008528f,
+ 0.009808f,
+ 0.011514f,
+ 0.013964f,
+ 0.016881f,
+ 0.020519f,
+ 0.024964f,
+ 0.031958f,
+ 0.040483f,
+ 0.052150f,
+ 0.063694f,
+ 0.077044f,
+ 0.089097f,
+ 0.102947f,
+ 0.116072f,
+ 0.129981f,
+ 0.141972f,
+ 0.153231f,
+ 0.162033f,
+ 0.170250f,
+ 0.176650f,
+ 0.182014f,
+ 0.185750f,
+ 0.188722f,
+ 0.191222f,
+ 0.193033f,
+ 0.194331f,
+ 0.195147f,
+ 0.193494f,
+ 0.190547f,
+ 0.181414f,
+ 0.165078f,
+ 0.146872f,
+ 0.132358f,
+ 0.120381f,
+ 0.105967f,
+ 0.088589f,
+ 0.070356f,
+ 0.051006f,
+ 0.033969f,
+ 0.015658f,
+ -0.000272f,
+ -0.015300f,
+ -0.024331f,
+ -0.042378f,
+ -0.060264f,
+ -0.075969f,
+ -0.080178f,
+ -0.082081f,
+ -0.082783f,
+ -0.081200f,
+ -0.079150f,
+ -0.076531f,
+ -0.073606f,
+ -0.070378f,
+ -0.066331f,
+ -0.061158f,
+ -0.055575f,
+ -0.048231f,
+ -0.040947f,
+ -0.031747f,
+ -0.023253f,
+ -0.012572f,
+ -0.001753f,
+ 0.008547f,
+ 0.017811f,
+ 0.025833f,
+ 0.032825f,
+ 0.038094f,
+ 0.042589f,
+ 0.046664f,
+ 0.049806f,
+ 0.051956f,
+ 0.053597f,
+ 0.055094f,
+ 0.054953f,
+ 0.054536f,
+ 0.053236f,
+ 0.048483f,
+ 0.036156f,
+ 0.018722f,
+ 0.003564f,
+ -0.010139f,
+ -0.020547f,
+ -0.036361f,
+ -0.053575f,
+ -0.072783f,
+ -0.088386f,
+ -0.101669f,
+ -0.118144f,
+ -0.137236f,
+ -0.156292f,
+ -0.170289f,
+ -0.179703f,
+ -0.183936f,
+ -0.185453f,
+ -0.184739f,
+ -0.183489f,
+ -0.181767f,
+ -0.179142f,
+ -0.175867f,
+ -0.171797f,
+ -0.166614f,
+ -0.159736f,
+ -0.149639f,
+ -0.136964f,
+ -0.121575f,
+ -0.104889f,
+ -0.086911f,
+ -0.068364f,
+ -0.049711f,
+ -0.031058f,
+ -0.011742f,
+ 0.007886f,
+ 0.026994f,
+ 0.044467f,
+ 0.061475f,
+ 0.077508f,
+ 0.092464f,
+ 0.105056f,
+ 0.114831f,
+ 0.122758f,
+ 0.128375f,
+ 0.133128f,
+ 0.136306f,
+ 0.138939f,
+ 0.141297f,
+ 0.142033f,
+ 0.139922f,
+ 0.133861f,
+ 0.128628f,
+ 0.124781f,
+ 0.121253f,
+ 0.108006f,
+ 0.089550f,
+ 0.072042f,
+ 0.062611f,
+ 0.056019f,
+ 0.043336f,
+ 0.030772f,
+ 0.020464f,
+ 0.013594f,
+ 0.006492f,
+ 0.000289f,
+ -0.000567f,
+ 0.000933f,
+ 0.003014f,
+ 0.005161f,
+ 0.007625f,
+ 0.010947f,
+ 0.014761f,
+ 0.019883f,
+ 0.025242f,
+ 0.032667f,
+ 0.041386f,
+ 0.053186f,
+ 0.065758f,
+ 0.079725f,
+ 0.093661f,
+ 0.108281f,
+ 0.123003f,
+ 0.136431f,
+ 0.149886f,
+ 0.161722f,
+ 0.171975f,
+ 0.180156f,
+ 0.185972f,
+ 0.191156f,
+ 0.194742f,
+ 0.198300f,
+ 0.201389f,
+ 0.204297f,
+ 0.206747f,
+ 0.208925f,
+ 0.209933f,
+ 0.210569f,
+ 0.209133f,
+ 0.196089f,
+ 0.175428f,
+ 0.150378f,
+ 0.132039f,
+ 0.120439f,
+ 0.104792f,
+ 0.088297f,
+ 0.064731f,
+ 0.049775f,
+ 0.029169f,
+ 0.012331f,
+ -0.009383f,
+ -0.023294f,
+ -0.037839f,
+ -0.053422f,
+ -0.071464f,
+ -0.086525f,
+ -0.094125f,
+ -0.095919f,
+ -0.099178f,
+ -0.102114f,
+ -0.103711f,
+ -0.101453f,
+ -0.098717f,
+ -0.095803f,
+ -0.092392f,
+ -0.088286f,
+ -0.083458f,
+ -0.077619f,
+ -0.071183f,
+ -0.063006f,
+ -0.053603f,
+ -0.042717f,
+ -0.031750f,
+ -0.021047f,
+ -0.012031f,
+ -0.004086f,
+ 0.002644f,
+ 0.008869f,
+ 0.013969f,
+ 0.018122f,
+ 0.021736f,
+ 0.023608f,
+ 0.024972f,
+ 0.025731f,
+ 0.027344f,
+ 0.025547f,
+ 0.023436f,
+ 0.019714f,
+ 0.012878f,
+ -0.002053f,
+ -0.018706f,
+ -0.032525f,
+ -0.047217f,
+ -0.063528f,
+ -0.080306f,
+ -0.093347f,
+ -0.106494f,
+ -0.121139f,
+ -0.132347f,
+ -0.153942f,
+ -0.171825f,
+ -0.189536f,
+ -0.191831f,
+ -0.192303f,
+ -0.192072f,
+ -0.191553f,
+ -0.191508f,
+ -0.189961f,
+ -0.187556f,
+ -0.183628f,
+ -0.179133f,
+ -0.173306f,
+ -0.165811f,
+ -0.155897f,
+ -0.143644f,
+ -0.129319f,
+ -0.112467f,
+ -0.093894f,
+ -0.074567f,
+ -0.055278f,
+ -0.036153f,
+ -0.016833f,
+ 0.003111f,
+ 0.022136f,
+ 0.041264f,
+ 0.058967f,
+ 0.076036f,
+ 0.089803f,
+ 0.100858f,
+ 0.109317f,
+ 0.116044f,
+ 0.121389f,
+ 0.125261f,
+ 0.128550f,
+ 0.131117f,
+ 0.133019f,
+ 0.134664f,
+ 0.135339f,
+ 0.135631f,
+ 0.133150f,
+ 0.123258f,
+ 0.103017f,
+ 0.081014f,
+ 0.066128f,
+ 0.055464f,
+ 0.044775f,
+ 0.028425f,
+ 0.015411f,
+ 0.000900f,
+ -0.009431f,
+ -0.027075f,
+ -0.045494f,
+ -0.061839f,
+ -0.068889f,
+ -0.070081f,
+ -0.070819f,
+ -0.070364f,
+ -0.068775f,
+ -0.066811f,
+ -0.064397f,
+ -0.061289f,
+ -0.057678f,
+ -0.053889f,
+ -0.049100f,
+ -0.043122f,
+ -0.035567f,
+ -0.026022f,
+ -0.016117f,
+ -0.004753f,
+ 0.006239f,
+ 0.017864f,
+ 0.028433f,
+ 0.037447f,
+ 0.044747f,
+ 0.051433f,
+ 0.056986f,
+ 0.061697f,
+ 0.064972f,
+ 0.067778f,
+ 0.070411f,
+ 0.071442f,
+ 0.071692f,
+ 0.070225f,
+ 0.069428f,
+ 0.067911f,
+ 0.060211f,
+ 0.045906f,
+ 0.025825f,
+};
diff --git a/motors/simpler_receiver.cc b/motors/simpler_receiver.cc
new file mode 100644
index 0000000..86539bd
--- /dev/null
+++ b/motors/simpler_receiver.cc
@@ -0,0 +1,512 @@
+// This file has the main for the Teensy on the simple receiver board v2 in the
+// new robot.
+
+#include <inttypes.h>
+#include <stdio.h>
+#include <atomic>
+#include <chrono>
+#include <cmath>
+
+#include "frc971/control_loops/drivetrain/polydrivetrain.h"
+#include "motors/core/kinetis.h"
+#include "motors/core/time.h"
+#include "motors/peripheral/can.h"
+#include "motors/peripheral/configuration.h"
+#include "motors/print/print.h"
+#include "motors/seems_reasonable/drivetrain_dog_motor_plant.h"
+#include "motors/seems_reasonable/polydrivetrain_dog_motor_plant.h"
+#include "motors/util.h"
+
+namespace frc971 {
+namespace motors {
+namespace {
+
+using ::frc971::control_loops::drivetrain::DrivetrainConfig;
+using ::frc971::control_loops::drivetrain::PolyDrivetrain;
+using ::frc971::constants::ShifterHallEffect;
+using ::frc971::control_loops::DrivetrainQueue_Goal;
+using ::frc971::control_loops::DrivetrainQueue_Output;
+
+namespace chrono = ::std::chrono;
+
+const ShifterHallEffect kThreeStateDriveShifter{0.0, 0.0, 0.25, 0.75};
+
+const DrivetrainConfig<float> &GetDrivetrainConfig() {
+ static DrivetrainConfig<float> kDrivetrainConfig{
+ ::frc971::control_loops::drivetrain::ShifterType::NO_SHIFTER,
+ ::frc971::control_loops::drivetrain::LoopType::OPEN_LOOP,
+ ::frc971::control_loops::drivetrain::GyroType::SPARTAN_GYRO,
+ ::frc971::control_loops::drivetrain::IMUType::IMU_X,
+
+ ::motors::seems_reasonable::MakeDrivetrainLoop,
+ ::motors::seems_reasonable::MakeVelocityDrivetrainLoop,
+ ::std::function<StateFeedbackLoop<7, 2, 4, float>()>(),
+
+ chrono::duration_cast<chrono::nanoseconds>(
+ chrono::duration<float>(::motors::seems_reasonable::kDt)),
+ ::motors::seems_reasonable::kRobotRadius,
+ ::motors::seems_reasonable::kWheelRadius, ::motors::seems_reasonable::kV,
+
+ ::motors::seems_reasonable::kHighGearRatio,
+ ::motors::seems_reasonable::kLowGearRatio, ::motors::seems_reasonable::kJ,
+ ::motors::seems_reasonable::kMass, kThreeStateDriveShifter,
+ kThreeStateDriveShifter, true /* default_high_gear */,
+ 0 /* down_offset */, 0.8 /* wheel_non_linearity */,
+ 1.2 /* quickturn_wheel_multiplier */, 1.5 /* wheel_multiplier */,
+ };
+
+ return kDrivetrainConfig;
+};
+
+
+::std::atomic<PolyDrivetrain<float> *> global_polydrivetrain{nullptr};
+
+// Last width we received on each channel.
+uint16_t pwm_input_widths[6];
+// When we received a pulse on each channel in milliseconds.
+uint32_t pwm_input_times[6];
+
+constexpr int kChannelTimeout = 100;
+
+bool lost_channel(int channel) {
+ DisableInterrupts disable_interrupts;
+ if (time_after(millis(),
+ time_add(pwm_input_times[channel], kChannelTimeout))) {
+ return true;
+ }
+ return false;
+}
+
+// Returns the most recently captured value for the specified input channel
+// scaled from -1 to 1, or 0 if it was captured over 100ms ago.
+float convert_input_width(int channel) {
+ uint16_t width;
+ {
+ DisableInterrupts disable_interrupts;
+ if (time_after(millis(),
+ time_add(pwm_input_times[channel], kChannelTimeout))) {
+ return 0;
+ }
+
+ width = pwm_input_widths[channel];
+ }
+
+ // Values measured with a channel mapped to a button.
+ static constexpr uint16_t kMinWidth = 4133;
+ static constexpr uint16_t kMaxWidth = 7177;
+ if (width < kMinWidth) {
+ width = kMinWidth;
+ } else if (width > kMaxWidth) {
+ width = kMaxWidth;
+ }
+ return (static_cast<float>(2 * (width - kMinWidth)) /
+ static_cast<float>(kMaxWidth - kMinWidth)) -
+ 1.0f;
+}
+
+// Sends a SET_RPM command to the specified VESC.
+// Note that sending 6 VESC commands every 1ms doesn't quite fit in the CAN
+// bandwidth.
+void vesc_set_rpm(int vesc_id, float rpm) {
+ const int32_t rpm_int = rpm;
+ uint32_t id = CAN_EFF_FLAG;
+ id |= vesc_id;
+ id |= (0x03 /* SET_RPM */) << 8;
+ uint8_t data[4] = {
+ static_cast<uint8_t>((rpm_int >> 24) & 0xFF),
+ static_cast<uint8_t>((rpm_int >> 16) & 0xFF),
+ static_cast<uint8_t>((rpm_int >> 8) & 0xFF),
+ static_cast<uint8_t>((rpm_int >> 0) & 0xFF),
+ };
+ can_send(id, data, sizeof(data), 2 + vesc_id);
+}
+
+// Sends a SET_CURRENT command to the specified VESC.
+// current is in amps.
+// Note that sending 6 VESC commands every 1ms doesn't quite fit in the CAN
+// bandwidth.
+void vesc_set_current(int vesc_id, float current) {
+ constexpr float kMaxCurrent = 80.0f;
+ const int32_t current_int =
+ ::std::max(-kMaxCurrent, ::std::min(kMaxCurrent, current)) * 1000.0f;
+ uint32_t id = CAN_EFF_FLAG;
+ id |= vesc_id;
+ id |= (0x01 /* SET_CURRENT */) << 8;
+ uint8_t data[4] = {
+ static_cast<uint8_t>((current_int >> 24) & 0xFF),
+ static_cast<uint8_t>((current_int >> 16) & 0xFF),
+ static_cast<uint8_t>((current_int >> 8) & 0xFF),
+ static_cast<uint8_t>((current_int >> 0) & 0xFF),
+ };
+ can_send(id, data, sizeof(data), 2 + vesc_id);
+}
+
+// Sends a SET_DUTY command to the specified VESC.
+// duty is from -1 to 1.
+// Note that sending 6 VESC commands every 1ms doesn't quite fit in the CAN
+// bandwidth.
+void vesc_set_duty(int vesc_id, float duty) {
+ constexpr int32_t kMaxDuty = 99999;
+ const int32_t duty_int = ::std::max(
+ -kMaxDuty, ::std::min(kMaxDuty, static_cast<int32_t>(duty * 100000.0f)));
+ uint32_t id = CAN_EFF_FLAG;
+ id |= vesc_id;
+ id |= (0x00 /* SET_DUTY */) << 8;
+ uint8_t data[4] = {
+ static_cast<uint8_t>((duty_int >> 24) & 0xFF),
+ static_cast<uint8_t>((duty_int >> 16) & 0xFF),
+ static_cast<uint8_t>((duty_int >> 8) & 0xFF),
+ static_cast<uint8_t>((duty_int >> 0) & 0xFF),
+ };
+ can_send(id, data, sizeof(data), 2 + vesc_id);
+}
+
+// TODO(Brian): Move these two test functions somewhere else.
+__attribute__((unused)) void DoVescTest() {
+ uint32_t time = micros();
+ while (true) {
+ for (int i = 0; i < 6; ++i) {
+ const uint32_t end = time_add(time, 500000);
+ while (true) {
+ const bool done = time_after(micros(), end);
+ float current;
+ if (done) {
+ current = -6;
+ } else {
+ current = 6;
+ }
+ vesc_set_current(i, current);
+ if (done) {
+ break;
+ }
+ delay(5);
+ }
+ time = end;
+ }
+ }
+}
+
+__attribute__((unused)) void DoReceiverTest2() {
+ static constexpr float kMaxRpm = 10000.0f;
+ while (true) {
+ const bool flip = convert_input_width(2) > 0;
+
+ {
+ const float value = convert_input_width(0);
+
+ {
+ float rpm = ::std::min(0.0f, value) * kMaxRpm;
+ if (flip) {
+ rpm *= -1.0f;
+ }
+ vesc_set_rpm(0, rpm);
+ }
+
+ {
+ float rpm = ::std::max(0.0f, value) * kMaxRpm;
+ if (flip) {
+ rpm *= -1.0f;
+ }
+ vesc_set_rpm(1, rpm);
+ }
+ }
+
+ {
+ const float value = convert_input_width(1);
+
+ {
+ float rpm = ::std::min(0.0f, value) * kMaxRpm;
+ if (flip) {
+ rpm *= -1.0f;
+ }
+ vesc_set_rpm(2, rpm);
+ }
+
+ {
+ float rpm = ::std::max(0.0f, value) * kMaxRpm;
+ if (flip) {
+ rpm *= -1.0f;
+ }
+ vesc_set_rpm(3, rpm);
+ }
+ }
+
+ {
+ const float value = convert_input_width(4);
+
+ {
+ float rpm = ::std::min(0.0f, value) * kMaxRpm;
+ if (flip) {
+ rpm *= -1.0f;
+ }
+ vesc_set_rpm(4, rpm);
+ }
+
+ {
+ float rpm = ::std::max(0.0f, value) * kMaxRpm;
+ if (flip) {
+ rpm *= -1.0f;
+ }
+ vesc_set_rpm(5, rpm);
+ }
+ }
+ // Give the CAN frames a chance to go out.
+ delay(5);
+ }
+}
+
+void SetupPwmFtm(BigFTM *ftm) {
+ ftm->MODE = FTM_MODE_WPDIS;
+ ftm->MODE = FTM_MODE_WPDIS | FTM_MODE_FTMEN;
+ ftm->SC = FTM_SC_CLKS(0) /* Disable counting for now */;
+
+ // Can't change MOD according to the reference manual ("The Dual Edge Capture
+ // mode must be used with ... the FTM counter in Free running counter.").
+ ftm->MOD = 0xFFFF;
+
+ // Capturing rising edge.
+ ftm->C0SC = FTM_CSC_MSA | FTM_CSC_ELSA;
+ // Capturing falling edge.
+ ftm->C1SC = FTM_CSC_CHIE | FTM_CSC_MSA | FTM_CSC_ELSB;
+
+ // Capturing rising edge.
+ ftm->C2SC = FTM_CSC_MSA | FTM_CSC_ELSA;
+ // Capturing falling edge.
+ ftm->C3SC = FTM_CSC_CHIE | FTM_CSC_MSA | FTM_CSC_ELSB;
+
+ // Capturing rising edge.
+ ftm->C4SC = FTM_CSC_MSA | FTM_CSC_ELSA;
+ // Capturing falling edge.
+ ftm->C5SC = FTM_CSC_CHIE | FTM_CSC_MSA | FTM_CSC_ELSB;
+
+ // Capturing rising edge.
+ ftm->C6SC = FTM_CSC_MSA | FTM_CSC_ELSA;
+ // Capturing falling edge.
+ ftm->C7SC = FTM_CSC_CHIE | FTM_CSC_MSA | FTM_CSC_ELSB;
+
+ (void)ftm->STATUS;
+ ftm->STATUS = 0x00;
+
+ ftm->COMBINE = FTM_COMBINE_DECAP3 | FTM_COMBINE_DECAPEN3 |
+ FTM_COMBINE_DECAP2 | FTM_COMBINE_DECAPEN2 |
+ FTM_COMBINE_DECAP1 | FTM_COMBINE_DECAPEN1 |
+ FTM_COMBINE_DECAP0 | FTM_COMBINE_DECAPEN0;
+
+ // 34.95ms max period before it starts wrapping and being weird.
+ ftm->SC = FTM_SC_CLKS(1) /* Use the system clock */ |
+ FTM_SC_PS(4) /* Prescaler=32 */;
+
+ ftm->MODE &= ~FTM_MODE_WPDIS;
+}
+
+extern "C" void ftm0_isr() {
+ while (true) {
+ const uint32_t status = FTM0->STATUS;
+ if (status == 0) {
+ return;
+ }
+
+ if (status & (1 << 1)) {
+ const uint32_t start = FTM0->C0V;
+ const uint32_t end = FTM0->C1V;
+ pwm_input_widths[1] = (end - start) & 0xFFFF;
+ pwm_input_times[1] = millis();
+ }
+ if (status & (1 << 5)) {
+ const uint32_t start = FTM0->C4V;
+ const uint32_t end = FTM0->C5V;
+ pwm_input_widths[3] = (end - start) & 0xFFFF;
+ pwm_input_times[3] = millis();
+ }
+ if (status & (1 << 3)) {
+ const uint32_t start = FTM0->C2V;
+ const uint32_t end = FTM0->C3V;
+ pwm_input_widths[4] = (end - start) & 0xFFFF;
+ pwm_input_times[4] = millis();
+ }
+
+ FTM0->STATUS = 0;
+ }
+}
+
+extern "C" void ftm3_isr() {
+ while (true) {
+ const uint32_t status = FTM3->STATUS;
+ if (status == 0) {
+ return;
+ }
+
+ FTM3->STATUS = 0;
+ }
+}
+
+extern "C" void pit3_isr() {
+ PIT_TFLG3 = 1;
+ PolyDrivetrain<float> *polydrivetrain =
+ global_polydrivetrain.load(::std::memory_order_acquire);
+
+ const bool lost_drive_channel = lost_channel(3) || lost_channel(1);
+
+ if (false) {
+ static int count = 0;
+ if (++count == 50) {
+ count = 0;
+ printf("0: %d 1: %d\n", (int)pwm_input_widths[3],
+ (int)pwm_input_widths[1]);
+ }
+ }
+
+ if (polydrivetrain != nullptr) {
+ DrivetrainQueue_Goal goal;
+ goal.control_loop_driving = false;
+ if (lost_drive_channel) {
+ goal.throttle = 0.0f;
+ goal.wheel = 0.0f;
+ } else {
+ goal.throttle = convert_input_width(1);
+ goal.wheel = -convert_input_width(3);
+ }
+ goal.quickturn = ::std::abs(polydrivetrain->velocity()) < 0.25f;
+
+ if (false) {
+ static int count = 0;
+ if (++count == 50) {
+ count = 0;
+ printf("throttle: %d wheel: %d\n", (int)(goal.throttle * 100),
+ (int)(goal.wheel * 100));
+ }
+ }
+
+ DrivetrainQueue_Output output;
+
+ polydrivetrain->SetGoal(goal);
+ polydrivetrain->Update(12.0f);
+ polydrivetrain->SetOutput(&output);
+
+ if (false) {
+ static int count = 0;
+ if (++count == 50) {
+ count = 0;
+ printf("l: %d r: %d\n", (int)(output.left_voltage * 100),
+ (int)(output.right_voltage * 100));
+ }
+ }
+ vesc_set_duty(0, -output.left_voltage / 12.0f);
+ vesc_set_duty(1, -output.left_voltage / 12.0f);
+
+ vesc_set_duty(2, output.right_voltage / 12.0f);
+ vesc_set_duty(3, output.right_voltage / 12.0f);
+ }
+}
+
+} // namespace
+
+extern "C" {
+
+void *__stack_chk_guard = (void *)0x67111971;
+void __stack_chk_fail(void);
+
+} // extern "C"
+
+extern "C" int main(void) {
+ // for background about this startup delay, please see these conversations
+ // https://forum.pjrc.com/threads/36606-startup-time-(400ms)?p=113980&viewfull=1#post113980
+ // https://forum.pjrc.com/threads/31290-Teensey-3-2-Teensey-Loader-1-24-Issues?p=87273&viewfull=1#post87273
+ delay(400);
+
+ // Set all interrupts to the second-lowest priority to start with.
+ for (int i = 0; i < NVIC_NUM_INTERRUPTS; i++) NVIC_SET_SANE_PRIORITY(i, 0xD);
+
+ // Now set priorities for all the ones we care about. They only have meaning
+ // relative to each other, which means centralizing them here makes it a lot
+ // more manageable.
+ NVIC_SET_SANE_PRIORITY(IRQ_USBOTG, 0x7);
+ NVIC_SET_SANE_PRIORITY(IRQ_FTM0, 0xa);
+ NVIC_SET_SANE_PRIORITY(IRQ_FTM3, 0xa);
+ NVIC_SET_SANE_PRIORITY(IRQ_PIT_CH3, 0x5);
+
+ // Builtin LED.
+ PERIPHERAL_BITBAND(GPIOC_PDOR, 5) = 1;
+ PORTC_PCR5 = PORT_PCR_DSE | PORT_PCR_SRE | PORT_PCR_MUX(1);
+ PERIPHERAL_BITBAND(GPIOC_PDDR, 5) = 1;
+
+ // Set up the CAN pins.
+ PORTA_PCR12 = PORT_PCR_DSE | PORT_PCR_MUX(2);
+ PORTA_PCR13 = PORT_PCR_DSE | PORT_PCR_MUX(2);
+
+ // PWM_IN0
+ // FTM0_CH1 (doesn't work)
+ // PORTC_PCR2 = PORT_PCR_MUX(4);
+
+ // PWM_IN1
+ // FTM0_CH0
+ PORTC_PCR1 = PORT_PCR_MUX(4);
+
+ // PWM_IN2
+ // FTM0_CH5 (doesn't work)
+ // PORTD_PCR5 = PORT_PCR_MUX(4);
+
+ // PWM_IN3
+ // FTM0_CH4
+ PORTD_PCR4 = PORT_PCR_MUX(4);
+
+ // PWM_IN4
+ // FTM0_CH2
+ PORTC_PCR3 = PORT_PCR_MUX(4);
+
+ // PWM_IN5
+ // FTM0_CH3 (doesn't work)
+ // PORTC_PCR4 = PORT_PCR_MUX(4);
+
+ delay(100);
+
+ PrintingParameters printing_parameters;
+ printing_parameters.dedicated_usb = true;
+ const ::std::unique_ptr<PrintingImplementation> printing =
+ CreatePrinting(printing_parameters);
+ printing->Initialize();
+
+ SIM_SCGC6 |= SIM_SCGC6_PIT;
+ // Workaround for errata e7914.
+ (void)PIT_MCR;
+ PIT_MCR = 0;
+ PIT_LDVAL3 = (BUS_CLOCK_FREQUENCY / 200) - 1;
+ PIT_TCTRL3 = PIT_TCTRL_TIE | PIT_TCTRL_TEN;
+
+ can_init(0, 1);
+ SetupPwmFtm(FTM0);
+ SetupPwmFtm(FTM3);
+
+ PolyDrivetrain<float> polydrivetrain(GetDrivetrainConfig(), nullptr);
+ global_polydrivetrain.store(&polydrivetrain, ::std::memory_order_release);
+
+ // Leave the LED on for a bit longer.
+ delay(300);
+ printf("Done starting up\n");
+
+ // Done starting up, now turn the LED off.
+ PERIPHERAL_BITBAND(GPIOC_PDOR, 5) = 0;
+
+ NVIC_ENABLE_IRQ(IRQ_FTM0);
+ NVIC_ENABLE_IRQ(IRQ_FTM3);
+ NVIC_ENABLE_IRQ(IRQ_PIT_CH3);
+ printf("Done starting up2\n");
+
+ while (true) {
+ }
+
+ return 0;
+}
+
+void __stack_chk_fail(void) {
+ while (true) {
+ GPIOC_PSOR = (1 << 5);
+ printf("Stack corruption detected\n");
+ delay(1000);
+ GPIOC_PCOR = (1 << 5);
+ delay(1000);
+ }
+}
+
+} // namespace motors
+} // namespace frc971
diff --git a/third_party/seasocks/.clang-format b/third_party/seasocks/.clang-format
new file mode 100644
index 0000000..e0f6ca9
--- /dev/null
+++ b/third_party/seasocks/.clang-format
@@ -0,0 +1,23 @@
+---
+AccessModifierOffset: '-4'
+AllowShortBlocksOnASingleLine: 'false'
+AllowShortCaseLabelsOnASingleLine: 'false'
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: 'false'
+AllowShortLoopsOnASingleLine: 'false'
+AlwaysBreakTemplateDeclarations: 'true'
+ConstructorInitializerIndentWidth: '8'
+ColumnLimit: '0'
+FixNamespaceComments: 'false'
+IndentCaseLabels: 'true'
+IndentWidth: '4'
+Language: Cpp
+MaxEmptyLinesToKeep: '2'
+PointerAlignment: Left
+SortIncludes: 'false'
+SpaceAfterCStyleCast: 'true'
+SpaceInEmptyParentheses: 'false'
+TabWidth: '4'
+UseTab: Never
+
+...
diff --git a/third_party/seasocks/.codecov.yml b/third_party/seasocks/.codecov.yml
new file mode 100644
index 0000000..5bd10de
--- /dev/null
+++ b/third_party/seasocks/.codecov.yml
@@ -0,0 +1,3 @@
+ignore:
+ - "src/app/**/*"
+ - "src/test/**/*"
diff --git a/third_party/seasocks/.gitignore b/third_party/seasocks/.gitignore
index 65512ab..d457615 100644
--- a/third_party/seasocks/.gitignore
+++ b/third_party/seasocks/.gitignore
@@ -1,15 +1,6 @@
*.swp
-/.fig
-/.tests-pass
-/.tests-pass-valgrind
-/Makefile
-/autom4te.cache
-/bin
-/config.log
-/config.status
-/configure
-/obj
-/tags
-/.gmock
+*~
.gdb_history
+/build
gdb.txt
+/cmake-*
diff --git a/third_party/seasocks/.idea/.gitignore b/third_party/seasocks/.idea/.gitignore
new file mode 100644
index 0000000..a7c382e
--- /dev/null
+++ b/third_party/seasocks/.idea/.gitignore
@@ -0,0 +1 @@
+workspace.xml
diff --git a/third_party/seasocks/.idea/.name b/third_party/seasocks/.idea/.name
new file mode 100644
index 0000000..299c89e
--- /dev/null
+++ b/third_party/seasocks/.idea/.name
@@ -0,0 +1 @@
+Seasocks
\ No newline at end of file
diff --git a/third_party/seasocks/.idea/codeStyleSettings.xml b/third_party/seasocks/.idea/codeStyleSettings.xml
new file mode 100644
index 0000000..e967c80
--- /dev/null
+++ b/third_party/seasocks/.idea/codeStyleSettings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectCodeStyleSettingsManager">
+ <option name="PER_PROJECT_SETTINGS">
+ <value>
+ <Objective-C>
+ <option name="INDENT_NAMESPACE_MEMBERS" value="0" />
+ </Objective-C>
+ <Objective-C-extensions>
+ <file>
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+ </file>
+ <class>
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+ </class>
+ <extensions>
+ <pair source="cpp" header="h" />
+ <pair source="c" header="h" />
+ </extensions>
+ </Objective-C-extensions>
+ </value>
+ </option>
+ <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/third_party/seasocks/.idea/codeStyles/Project.xml b/third_party/seasocks/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..30aa626
--- /dev/null
+++ b/third_party/seasocks/.idea/codeStyles/Project.xml
@@ -0,0 +1,29 @@
+<component name="ProjectCodeStyleConfiguration">
+ <code_scheme name="Project" version="173">
+ <Objective-C-extensions>
+ <file>
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+ </file>
+ <class>
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+ </class>
+ <extensions>
+ <pair source="cpp" header="h" fileNamingConvention="NONE" />
+ <pair source="c" header="h" fileNamingConvention="NONE" />
+ </extensions>
+ </Objective-C-extensions>
+ </code_scheme>
+</component>
\ No newline at end of file
diff --git a/third_party/seasocks/.idea/codeStyles/codeStyleConfig.xml b/third_party/seasocks/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/third_party/seasocks/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+ <state>
+ <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+ </state>
+</component>
\ No newline at end of file
diff --git a/third_party/seasocks/.idea/encodings.xml b/third_party/seasocks/.idea/encodings.xml
new file mode 100644
index 0000000..97626ba
--- /dev/null
+++ b/third_party/seasocks/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Encoding">
+ <file url="PROJECT" charset="UTF-8" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/third_party/seasocks/.idea/misc.xml b/third_party/seasocks/.idea/misc.xml
new file mode 100644
index 0000000..089a0c1
--- /dev/null
+++ b/third_party/seasocks/.idea/misc.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
+ <component name="CidrRootsConfiguration">
+ <excludeRoots>
+ <file path="$PROJECT_DIR$/build/cmake-build-debug/CMakeFiles" />
+ <file path="$PROJECT_DIR$/cmake-build-debug/CMakeFiles" />
+ </excludeRoots>
+ </component>
+</project>
\ No newline at end of file
diff --git a/third_party/seasocks/.idea/modules.xml b/third_party/seasocks/.idea/modules.xml
new file mode 100644
index 0000000..f65179e
--- /dev/null
+++ b/third_party/seasocks/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/.idea/seasocks.iml" filepath="$PROJECT_DIR$/.idea/seasocks.iml" />
+ </modules>
+ </component>
+</project>
\ No newline at end of file
diff --git a/third_party/seasocks/.idea/seasocks.iml b/third_party/seasocks/.idea/seasocks.iml
new file mode 100644
index 0000000..f08604b
--- /dev/null
+++ b/third_party/seasocks/.idea/seasocks.iml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module classpath="CMake" type="CPP_MODULE" version="4" />
\ No newline at end of file
diff --git a/third_party/seasocks/.idea/vcs.xml b/third_party/seasocks/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/third_party/seasocks/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/third_party/seasocks/.travis.yml b/third_party/seasocks/.travis.yml
index 9df4ab8..4a41735 100644
--- a/third_party/seasocks/.travis.yml
+++ b/third_party/seasocks/.travis.yml
@@ -1,21 +1,149 @@
-language: cpp
-compiler:
- - gcc
- - clang
-before_install:
- - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- - sudo add-apt-repository ppa:h-rayflood/llvm -y
- - sudo apt-get update -qq
+language: generic
+
+dist: xenial
+
+matrix:
+ include:
+ - env: CXX=g++-8 CC=gcc-8
+ addons:
+ apt:
+ packages:
+ - g++-8
+ - valgrind
+ sources: &sources
+ - ubuntu-toolchain-r-test
+ - llvm-toolchain-trusty
+ - llvm-toolchain-xenial-8
+ - llvm-toolchain-xenial-7
+ - llvm-toolchain-xenial-6.0
+ - llvm-toolchain-xenial-5.0
+ - llvm-toolchain-trusty-4.0
+ - llvm-toolchain-trusty-3.9
+ - llvm-toolchain-precise-3.8
+ - llvm-toolchain-precise-3.7
+ - llvm-toolchain-precise-3.6
+ - env: CXX=g++-7 CC=gcc-7
+ addons:
+ apt:
+ packages:
+ - g++-7
+ - valgrind
+ sources: *sources
+ - env: CXX=g++-6 CC=gcc-6 EXTRA_CMAKE=-DDEFLATE_SUPPORT=Off
+ addons:
+ apt:
+ packages:
+ - g++-6
+ - valgrind
+ sources: *sources
+ - env: CXX=g++-6 CC=gcc-6
+ addons:
+ apt:
+ packages:
+ - g++-6
+ - valgrind
+ sources: *sources
+ - env: CXX=g++-5 CC=gcc-5
+ addons:
+ apt:
+ packages:
+ - g++-5
+ - valgrind
+ sources: *sources
+ - env: CXX=g++-4.9 CC=gcc-4.9
+ addons:
+ apt:
+ packages:
+ - g++-4.9
+ - valgrind
+ sources: *sources
+ - env: CXX=clang++-8 CC=clang-8
+ addons:
+ apt:
+ packages:
+ - clang-8
+ - libc++-8-dev
+ - libc++abi-8-dev
+ - valgrind
+ sources: *sources
+ - env: CXX=clang++-7 CC=clang-7
+ addons:
+ apt:
+ packages:
+ - clang-7
+ - libc++-7-dev
+ - libc++abi-7-dev
+ - valgrind
+ sources: *sources
+ - env: CXX=clang++-6.0 CC=clang-6.0
+ addons:
+ apt:
+ packages:
+ - clang-6.0
+ - libc++-dev
+ - valgrind
+ sources: *sources
+ - env: CXX=clang++-5.0 CC=clang-5.0
+ addons:
+ apt:
+ packages:
+ - clang-5.0
+ - libc++-dev
+ - valgrind
+ sources: *sources
+ - env: CXX=clang++-4.0 CC=clang-4.0
+ addons:
+ apt:
+ packages:
+ - clang-4.0
+ - libc++-dev
+ - valgrind
+ sources: *sources
+ - env: CXX=clang++-3.9 CC=clang-3.9 EXTRA_CMAKE=-DCOVERAGE=Off
+ addons:
+ apt:
+ packages:
+ - clang-3.9
+ - libc++-dev
+ - valgrind
+ sources: *sources
+ - env: CXX=clang++-3.8 CC=clang-3.8
+ addons:
+ apt:
+ packages:
+ - clang-3.8
+ - libc++-dev
+ - valgrind
+ sources: *sources
+ - env: CXX=clang++-3.7 CC=clang-3.7
+ addons:
+ apt:
+ packages:
+ - clang-3.7
+ - libc++-dev
+ - valgrind
+ sources: *sources
+ - env: CXX=clang++-3.6 CC=clang-3.6
+ addons:
+ apt:
+ packages:
+ - clang-3.6
+ - libc++-dev
+ - valgrind
+ sources: *sources
+
install:
- - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.7; fi
- - if [ "$CXX" = "g++" ]; then export CXX="g++-4.7" CC="gcc-4.7"; fi
- - if [ "$CXX" = "clang++" ]; then sudo apt-get install -qq --allow-unauthenticated clang-3.4; fi
- - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.4" CC="clang-3.4"; fi
- - wget "https://googlemock.googlecode.com/files/gmock-1.7.0.zip"
- - unzip gmock-1.7.0.zip
- - sudo apt-get install valgrind
+ - if [[ "$CXX" == clang* ]]; then export CXXFLAGS="-stdlib=libc++"; fi
+ - JOBS=2
+
+before_script:
+ - cmake --version
+ - cmake . -Bbuild -DCMAKE_BUILD_TYPE=Release -DCOVERAGE=On ${EXTRA_CMAKE}
+ - cmake --build build -- -j${JOBS}
+
script:
- - autoconf
- - ./configure --with-gmock=gmock-1.7.0
- - make
- - make test
+ - cd build
+ - cmake --build . --target unittest
+ - ctest -D ExperimentalBuild -j${JOBS}
+ - ctest -D ExperimentalMemCheck -j${JOBS}
+ - bash <(curl -s https://codecov.io/bash)
diff --git a/third_party/seasocks/BUILD b/third_party/seasocks/BUILD
index 974b131..e2b13eb 100644
--- a/third_party/seasocks/BUILD
+++ b/third_party/seasocks/BUILD
@@ -2,7 +2,10 @@
cc_library(
name = "seasocks",
- srcs = glob(include = ["src/main/c/**/*.cpp"]),
+ srcs = glob(
+ include = ["src/main/c/**/*.cpp"],
+ exclude = ["src/main/c/seasocks/ZlibContext.cpp"],
+ ),
hdrs = glob(
include = [
"src/main/c/**/*.h",
diff --git a/third_party/seasocks/CMakeLists.txt b/third_party/seasocks/CMakeLists.txt
new file mode 100644
index 0000000..9906377
--- /dev/null
+++ b/third_party/seasocks/CMakeLists.txt
@@ -0,0 +1,66 @@
+cmake_minimum_required(VERSION 3.3)
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+project(Seasocks VERSION 1.4.1)
+
+
+option(UNITTESTS "Build unittests." ON)
+option(COVERAGE "Build with code coverage enabled" OFF)
+option(SEASOCKS_EXAMPLE_APP "Build the example applications." ON)
+option(DEFLATE_SUPPORT "Include support for deflate (requires zlib)." ON)
+
+if (DEFLATE_SUPPORT)
+ set(DEFLATE_SUPPORT_BOOL "true")
+else ()
+ set(DEFLATE_SUPPORT_BOOL "false")
+endif ()
+message(STATUS "${PROJECT_NAME} ${PROJECT_VERSION}")
+message(STATUS "Unittests: ${UNITTESTS}")
+message(STATUS "Coverage: ${COVERAGE}")
+
+
+set(MEMORYCHECK_SUPPRESSIONS_FILE "${PROJECT_SOURCE_DIR}/src/test/suppressions.txt" CACHE INTERNAL "")
+include(CTest)
+include(Compiler)
+include(GNUInstallDirs)
+include(ClangFormat)
+
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.h.in internal/Config.h)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+add_compile_options(-Wall -Werror -Wextra -pedantic)
+if (COVERAGE)
+ add_compile_options(--coverage -O0)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage")
+endif ()
+
+find_package(Threads)
+
+
+find_program(PYTHON_BIN python DOC "Python executable")
+
+if (NOT PYTHON_BIN)
+ message(SEND_ERROR "Python not found")
+else()
+ message(STATUS "Using Python: '${PYTHON_BIN}'")
+endif ()
+
+if (DEFLATE_SUPPORT)
+ find_package(ZLIB REQUIRED)
+endif ()
+
+add_subdirectory("src")
+
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+ VERSION ${PROJECT_VERSION}
+ COMPATIBILITY SameMajorVersion
+)
+
+install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/
+)
+
diff --git a/third_party/seasocks/LICENSE b/third_party/seasocks/LICENSE
index 2798024..eff0cb3 100644
--- a/third_party/seasocks/LICENSE
+++ b/third_party/seasocks/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013, Matt Godbolt
+Copyright (c) 2013-2017, Matt Godbolt
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/third_party/seasocks/Makefile.in b/third_party/seasocks/Makefile.in
deleted file mode 100644
index 6261306..0000000
--- a/third_party/seasocks/Makefile.in
+++ /dev/null
@@ -1,145 +0,0 @@
-default: all
-
-AR=ar
-ARFLAGS=cru
-CXX=@CXX@
-CXXFLAGS=@CXXFLAGS@
-VALGRIND=@VALGRIND@
-LDFLAGS=@LDFLAGS@
-# hack for drw gcc on ubuntu
-GCC_MULTIARCH := $(shell gcc -print-multiarch 2>/dev/null)
-ifneq ($(GCC_MULTIARCH),)
- export LIBRARY_PATH = /usr/lib/$(GCC_MULTIARCH)
- export C_INCLUDE_PATH = /usr/include/$(GCC_MULTIARCH)
- export CPLUS_INCLUDE_PATH = /usr/include/$(GCC_MULTIARCH)
-endif
-
-C_SRC=src/main/c
-TEST_SRC=src/test/c
-APPS_SRC=src/app/c
-
-VERSION_STRING:=SeaSocks/$(or $(VERSION),unversioned) ($(shell git describe --always --dirty || echo non-git))
-
-CXXFLAGS += -fPIC -Wall -Werror '-DSEASOCKS_VERSION_STRING="$(VERSION_STRING)"' -I$(C_SRC)
-
-.PHONY: all clean run test spotless header-checks valgrind-test
-
-OBJ_DIR=obj
-BIN_DIR=bin
-
-CPP_SRCS=$(shell find $(C_SRC) -name '*.cpp')
-H_SRCS=$(shell find $(C_SRC) -name '*.h')
-TEST_SRCS=$(shell find $(TEST_SRC) -name '*.cpp')
-APPS_CPP_SRCS=$(shell find $(APPS_SRC) -name '*.cpp')
-TARGETS=$(patsubst $(APPS_SRC)/%.cpp,$(BIN_DIR)/%,$(APPS_CPP_SRCS))
-
-apps: $(TARGETS)
-all: apps $(BIN_DIR)/libseasocks.so $(BIN_DIR)/libseasocks.a test header-checks valgrind-test
-
-debug:
- echo $($(DEBUG_VAR))
-
-OBJS=$(patsubst $(C_SRC)/%.cpp,$(OBJ_DIR)/%.o,$(CPP_SRCS))
-HCS=$(patsubst $(C_SRC)/%.h,$(OBJ_DIR)/%.hc,$(H_SRCS))
-TEST_OBJS=$(patsubst $(TEST_SRC)/%.cpp,$(OBJ_DIR)/%.o,$(TEST_SRCS))
-APPS_OBJS=$(patsubst $(APPS_SRC)/%.cpp,$(OBJ_DIR)/%.o,$(APPS_CPP_SRCS))
-ALL_OBJS=$(OBJS) $(APPS_OBJS) $(TEST_OBJS)
-GEN_OBJS=$(OBJ_DIR)/embedded.o
-
--include $(ALL_OBJS:.o=.d)
-
-$(APPS_OBJS) : $(OBJ_DIR)/%.o : $(APPS_SRC)/%.cpp
- @mkdir -p $(dir $@)
- $(CXX) $(CXXFLAGS) -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -c -o "$@" "$<"
-
-$(OBJS) : $(OBJ_DIR)/%.o : $(C_SRC)/%.cpp
- @mkdir -p $(dir $@)
- $(CXX) $(CXXFLAGS) -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -c -o "$@" "$<"
-
-$(HCS) : $(OBJ_DIR)/%.hc : $(C_SRC)/%.h
- @mkdir -p $(dir $@)
- @echo "Checking header file is self-contained: $<"
- @$(CXX) -fsyntax-only $(CXXFLAGS) -o /dev/null -c -w $<
- @touch $@
-
-$(TEST_OBJS) : $(OBJ_DIR)/%.o : $(TEST_SRC)/%.cpp
- @mkdir -p $(dir $@)
- $(CXX) $(CXXFLAGS) -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -c -o "$@" "$<"
-
-$(TARGETS) : $(BIN_DIR)/% : $(OBJ_DIR)/%.o $(OBJS) $(GEN_OBJS)
- @mkdir -p $(BIN_DIR)
- $(CXX) $(CXXFLAGS) -o $@ $^
-
-$(BIN_DIR)/libseasocks.so: $(OBJS) $(GEN_OBJS)
- @mkdir -p $(BIN_DIR)
- $(CXX) -shared $(CXXFLAGS) -o $@ $^
-
-$(BIN_DIR)/libseasocks.a: $(OBJS) $(GEN_OBJS)
- @mkdir -p $(BIN_DIR)
- @-rm -f $(BIN_DIR)/libseasocks.a
- $(AR) $(ARFLAGS) $@ $^
-
-EMBEDDED_CONTENT:=$(shell find src/main/web -type f)
-$(OBJ_DIR)/embedded.o: scripts/gen_embedded.py $(EMBEDDED_CONTENT) src/main/c/internal/Embedded.h
- @mkdir -p $(dir $@)
- scripts/gen_embedded.py $(EMBEDDED_CONTENT) | $(CXX) $(CXXFLAGS) -x c++ -c -o "$@" -
-
-header-checks: $(HCS)
-
-run: $(BIN_DIR)/ws_test
- $(BIN_DIR)/ws_test
-
-ifneq ("@GMOCK_DIR@", "")
-GMOCK_DIR = @GMOCK_DIR@
-GTEST_DIR = $(GMOCK_DIR)/gtest
-CXXFLAGS += -isystem $(GTEST_DIR)/include -isystem $(GMOCK_DIR)/include
-GTEST_HEADERS = $(GTEST_DIR)/include/gtest/*.h \
- $(GTEST_DIR)/include/gtest/internal/*.h
-GMOCK_HEADERS = $(GMOCK_DIR)/include/gmock/*.h \
- $(GMOCK_DIR)/include/gmock/internal/*.h \
- $(GTEST_HEADERS)
-GTEST_SRCS_ = $(GTEST_DIR)/src/*.cc $(GTEST_DIR)/src/*.h $(GTEST_HEADERS)
-GMOCK_SRCS_ = $(GMOCK_DIR)/src/*.cc $(GMOCK_HEADERS)
-
-$(OBJ_DIR)/gtest-all.o : $(GTEST_SRCS_)
- $(CXX) $(CXXFLAGS) -I$(GTEST_DIR) -I$(GMOCK_DIR) $(CXXFLAGS) \
- -c $(GTEST_DIR)/src/gtest-all.cc -o $@
-
-$(OBJ_DIR)/gmock-all.o : $(GMOCK_SRCS_)
- $(CXX) $(CXXFLAGS) -I$(GTEST_DIR) -I$(GMOCK_DIR) $(CXXFLAGS) \
- -c $(GMOCK_DIR)/src/gmock-all.cc -o $@
-
-$(BIN_DIR)/tests: $(TEST_OBJS) $(BIN_DIR)/libseasocks.a \
- $(OBJ_DIR)/gmock-all.o $(OBJ_DIR)/gtest-all.o
- $(CXX) $(LDFLAGS) $(CXXFLAGS) -I $(TEST_SRC) -o $@ $^
-
-.tests-pass: $(BIN_DIR)/tests
- @rm -f .tests-pass
- $(BIN_DIR)/tests
- @touch .tests-pass
-
-test: .tests-pass
-
-ifneq ("@VALGRIND@", "")
-valgrind-test: .tests-pass
- $(VALGRIND) --leak-check=full --error-exitcode=2 -- $(BIN_DIR)/tests
-else
-valgrind-test:
- @echo "Not running valgrind-test as no valgrind binary found during configure"
-endif
-
-else
-
-test:
- @echo "Not running tests as no gmock/gtest specified during configure"
- @echo "To configure, specify with --with-gmock=PATH_TO_GMOCK"
-test-valgrind: test
-
-endif
-
-clean:
- rm -rf $(OBJ_DIR) $(BIN_DIR) *.tar.gz .tests-pass
-
-spotless: clean
- rm -rf lib include config.log configure config.status src/main/c/internal/Config.h Makefile autom4te.cache
-
diff --git a/third_party/seasocks/README.md b/third_party/seasocks/README.md
index 1201f49..0f0d40f 100644
--- a/third_party/seasocks/README.md
+++ b/third_party/seasocks/README.md
@@ -1,7 +1,8 @@
-SeaSocks - A tiny embeddable C++ HTTP and WebSocket server
+Seasocks - A tiny embeddable C++ HTTP and WebSocket server
==========================================================
[](https://travis-ci.org/mattgodbolt/seasocks)
+[](https://codecov.io/gh/mattgodbolt/seasocks)
Features
--------
@@ -14,11 +15,11 @@
Stuff it doesn't do
-------------------
It's not nearly as configurable as Apache, Lighttpd, Nginx, Jetty, etc.
-It provides only very limited support for custom content generation (e.g. Servlets).
-It has been optimized for WebSocket based control.
+It provides only limited support for custom content generation (e.g. Servlets).
+It has been designed for WebSocket based control.
Getting started
---------------
-Check out the [tutorial](https://github.com/mattgodbolt/seasocks/wiki/SeaSocks-quick-tutorial) on the wiki.
+Check out the [tutorial](https://github.com/mattgodbolt/seasocks/wiki/Seasocks-quick-tutorial) on the wiki.
See [src/app/c/ws_test.cpp](https://github.com/mattgodbolt/seasocks/blob/master/src/app/c/ws_test.cpp) for an example.
diff --git a/third_party/seasocks/TODO.md b/third_party/seasocks/TODO.md
index b56a7a6..5e74fff 100644
--- a/third_party/seasocks/TODO.md
+++ b/third_party/seasocks/TODO.md
@@ -14,3 +14,9 @@
* Generalise the request/response so that persistent connections can be phrased
as them.
* Benchmark and add benchmarks to the tests.
+* Put cookie handling code into Request (e.g. from DRW's internal SSO implementation)
+
+CMake stuff
+-----------
+* Would be nice to resurrect the check that each external header file doesn't contain references
+ to anything outside of the exported headers.
diff --git a/third_party/seasocks/cmake/ClangFormat.cmake b/third_party/seasocks/cmake/ClangFormat.cmake
new file mode 100644
index 0000000..07d129d
--- /dev/null
+++ b/third_party/seasocks/cmake/ClangFormat.cmake
@@ -0,0 +1,12 @@
+
+find_program(CLANG_FORMAT clang-format DOC "Clang Format executable")
+
+if( CLANG_FORMAT )
+ file(GLOB_RECURSE FORMAT_SRC_FILES
+ "${PROJECT_SOURCE_DIR}/src/**.h"
+ "${PROJECT_SOURCE_DIR}/src/**.cpp"
+ )
+
+ add_custom_target(clang-format COMMAND ${CLANG_FORMAT} -i ${FORMAT_SRC_FILES})
+endif()
+
diff --git a/third_party/seasocks/cmake/Compiler.cmake b/third_party/seasocks/cmake/Compiler.cmake
new file mode 100644
index 0000000..a5b7a61
--- /dev/null
+++ b/third_party/seasocks/cmake/Compiler.cmake
@@ -0,0 +1,3 @@
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
diff --git a/third_party/seasocks/cmake/Config.h.in b/third_party/seasocks/cmake/Config.h.in
new file mode 100644
index 0000000..2081c9c
--- /dev/null
+++ b/third_party/seasocks/cmake/Config.h.in
@@ -0,0 +1,11 @@
+#pragma once
+
+namespace seasocks {
+
+ struct Config {
+ static constexpr auto version = "@PROJECT_VERSION@";
+ static constexpr bool deflateEnabled = ${DEFLATE_SUPPORT_BOOL};
+ };
+
+}
+
diff --git a/third_party/seasocks/configure.ac b/third_party/seasocks/configure.ac
deleted file mode 100644
index 7c6e51b..0000000
--- a/third_party/seasocks/configure.ac
+++ /dev/null
@@ -1,71 +0,0 @@
-m4_include([scripts/c++11.m4])
-
-AC_PREREQ(2.63)
-AC_INIT([SeaSocks], [0.1], [matt@godbolt.org], [], [https://github.com/mattgodbolt/seasocks])
-AC_CONFIG_SRCDIR([src/main/c/seasocks/Server.h])
-
-AC_ARG_WITH([gmock],
- [AS_HELP_STRING([--with-gmock],
- [Build tests too, with supplied gmock directory. SeaSocks will
- build gmock and its embedded gtest automatically])],
- [],
- [AC_MSG_WARN([dnl
-Building without tests enabled. Use --with-gmock=PATH_TO_GMOCK])])
-
-AS_IF([test "x${with_gmock}" != "xno" -a "x${with_gmock}" != "x"],
- [
- AS_IF([test -e "${with_gmock}/include/gmock/gmock.h"],
- [GMOCK_DIR="${with_gmock}"],
- [AC_MSG_ERROR([dnl
- Unable to locate gmock source at '${with_gmock}'.])])
- ])
-AC_SUBST(GMOCK_DIR)
-
-dnl Basic setup
-AC_LANG(C++)
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_CXX
-AX_CXX_COMPILE_STDCXX_11([noext])
-AC_DEFUN([AX_CXX_CHECK_UNORDERED_MAP_EMPLACE], [
- AC_LANG_PUSH([C++])
- AC_MSG_CHECKING([whether std::unordered_map supports emplace])
- AC_COMPILE_IFELSE([AC_LANG_SOURCE[
- #include <unordered_map>
- void test() { std::unordered_map<int, int> a; a.emplace(2,3); }
- ]],
- [eval unordered_map_emplace=yes],[eval unordered_map_emplace=no])
- AC_MSG_RESULT([$unordered_map_emplace])
- AC_LANG_POP([C++])
- if test x$unordered_map_emplace = xyes; then
- AC_DEFINE(HAVE_UNORDERED_MAP_EMPLACE,1, [define if unordered_map supports emplace])
- fi
- AC_SUBST(HAVE_UNORDERED_MAP_EMPLACE)
- ])
-AX_CXX_CHECK_UNORDERED_MAP_EMPLACE
-AC_PATH_PROG(VALGRIND, valgrind)
-
-dnl Basic headers and features
-AC_HEADER_STDBOOL
-AC_C_INLINE
-AC_TYPE_PID_T
-AC_C_RESTRICT
-AC_TYPE_SIZE_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
-AC_TYPE_UINT8_T
-AC_FUNC_ERROR_AT_LINE
-AC_FUNC_FORK
-AC_FUNC_STRERROR_R
-AC_CHECK_TYPES([ptrdiff_t])
-
-dnl pthreads; better if we detect this somehow
-CXXFLAGS="$CXXFLAGS -pthread"
-
-dnl System headers and functions used
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h netinet/in.h stddef.h stdlib.h string.h strings.h sys/ioctl.h sys/socket.h unistd.h getopt.h])
-AC_CHECK_FUNCS([dup2 eventfd syscall gethostname memset rmdir socket sqrt strcasecmp strchr strdup strerror getopt])
-
-AC_CONFIG_HEADERS([src/main/c/internal/Config.h])
-AC_OUTPUT([Makefile])
diff --git a/third_party/seasocks/scripts/c++11.m4 b/third_party/seasocks/scripts/c++11.m4
deleted file mode 100644
index f3e5fce..0000000
--- a/third_party/seasocks/scripts/c++11.m4
+++ /dev/null
@@ -1,136 +0,0 @@
-# ============================================================================
-# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
-# ============================================================================
-#
-# SYNOPSIS
-#
-# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
-#
-# DESCRIPTION
-#
-# Check for baseline language coverage in the compiler for the C++11
-# standard; if necessary, add switches to CXXFLAGS to enable support.
-#
-# The first argument, if specified, indicates whether you insist on an
-# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-# -std=c++11). If neither is specified, you get whatever works, with
-# preference for an extended mode.
-#
-# The second argument, if specified 'mandatory' or if left unspecified,
-# indicates that baseline C++11 support is required and that the macro
-# should error out if no mode with that support is found. If specified
-# 'optional', then configuration proceeds regardless, after defining
-# HAVE_CXX11 if and only if a supporting mode is found.
-#
-# LICENSE
-#
-# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-# Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-# Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#
-# Copying and distribution of this file, with or without modification, are
-# permitted in any medium without royalty provided the copyright notice
-# and this notice are preserved. This file is offered as-is, without any
-# warranty.
-
-#serial 3
-
-m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [
- template <typename T>
- struct check
- {
- static_assert(sizeof(int) <= sizeof(T), "not big enough");
- };
-
- struct base { virtual void func() = 0; };
- struct override : base { virtual void func() override {}; };
-
- typedef check<check<bool>> right_angle_brackets;
-
- int a;
- decltype(a) b;
-
- typedef check<int> check_type;
- check_type c;
- check_type&& cr = static_cast<check_type&&>(c);
-
- auto d = a;
-])
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
- m4_if([$1], [], [],
- [$1], [ext], [],
- [$1], [noext], [],
- [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])
- m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
- [$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
- [$2], [optional], [ax_cxx_compile_cxx11_required=false],
- [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])
- AC_LANG_PUSH([C++])
- ac_success=no
- AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
- ax_cv_cxx_compile_cxx11,
- [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
- [ax_cv_cxx_compile_cxx11=yes],
- [ax_cv_cxx_compile_cxx11=no])])
- if test x$ax_cv_cxx_compile_cxx11 = xyes; then
- ac_success=yes
- fi
-
- m4_if([$1], [noext], [], [dnl
- if test x$ac_success = xno; then
- for switch in -std=gnu++11 -std=gnu++0x; do
- cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
- AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
- $cachevar,
- [ac_save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $switch"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
- [eval $cachevar=yes],
- [eval $cachevar=no])
- CXXFLAGS="$ac_save_CXXFLAGS"])
- if eval test x\$$cachevar = xyes; then
- CXXFLAGS="$CXXFLAGS $switch"
- ac_success=yes
- break
- fi
- done
- fi])
-
- m4_if([$1], [ext], [], [dnl
- if test x$ac_success = xno; then
- for switch in -std=c++11 -std=c++0x; do
- cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
- AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
- $cachevar,
- [ac_save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $switch"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
- [eval $cachevar=yes],
- [eval $cachevar=no])
- CXXFLAGS="$ac_save_CXXFLAGS"])
- if eval test x\$$cachevar = xyes; then
- CXXFLAGS="$CXXFLAGS $switch"
- ac_success=yes
- break
- fi
- done
- fi])
- AC_LANG_POP([C++])
- if test x$ax_cxx_compile_cxx11_required = xtrue; then
- if test x$ac_success = xno; then
- AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
- fi
- else
- if test x$ac_success = xno; then
- HAVE_CXX11=0
- AC_MSG_NOTICE([No compiler with C++11 support was found])
- else
- HAVE_CXX11=1
- AC_DEFINE(HAVE_CXX11,1,
- [define if the compiler supports basic C++11 syntax])
- fi
-
- AC_SUBST(HAVE_CXX11)
- fi
-])
diff --git a/third_party/seasocks/scripts/config-for-drw b/third_party/seasocks/scripts/config-for-drw
index 388bc5a..be34910 100755
--- a/third_party/seasocks/scripts/config-for-drw
+++ b/third_party/seasocks/scripts/config-for-drw
@@ -2,18 +2,18 @@
set -e
-autoconf
-
-GMOCK_DIR=.gmock/gmock-1.7.0
-
-if [ ! -d "${GMOCK_DIR}" ]; then
- echo "Grabbing gmock"
- mkdir -p .gmock
- pushd .gmock
- wget https://googlemock.googlecode.com/files/gmock-1.7.0.zip
- unzip gmock-1.7.0.zip
- popd
+pushd /tmp
+GCC_HOME=$(fig -m gcc/5.2.0-1 -g GCC_HOME)
+popd
+export CC=${GCC_HOME}/bin/gcc
+export CXX=${GCC_HOME}/bin/g++
+GCC_MULTIARCH=$(gcc -print-multiarch 2>/dev/null)
+if [[ "$GCC_MULTIARCH" != "" ]]; then
+ export LIBRARY_PATH=/usr/lib/$GCC_MULTIARCH
+ export C_INCLUDE_PATH=/usr/include/$GCC_MULTIARCH
+ export CPLUS_INCLUDE_PATH=/usr/include/$GCC_MULTIARCH
fi
-
-GCC_HOME=$(fig -m gcc/4.9.0-2 -g GCC_HOME)
-LDFLAGS="-Wl,--rpath,${GCC_HOME}/lib64" CXX=${GCC_HOME}/bin/g++ ./configure --with-gmock=${GMOCK_DIR}
+export LDFLAGS="-Wl,--rpath,${GCC_HOME}/lib64"
+mkdir -p build
+cd build
+cmake ..
diff --git a/third_party/seasocks/scripts/gen_embedded.py b/third_party/seasocks/scripts/gen_embedded.py
index f715b1d..901b014 100755
--- a/third_party/seasocks/scripts/gen_embedded.py
+++ b/third_party/seasocks/scripts/gen_embedded.py
@@ -1,35 +1,83 @@
#!/usr/bin/env python
-import os, os.path, sys
+import os, os.path, sys, argparse
-print """
+SOURCE_TEMPLATE = """
#include "internal/Embedded.h"
#include <string>
#include <unordered_map>
namespace {
+%s
-std::unordered_map<std::string, EmbeddedContent> embedded = {
-"""
-
-for f in sys.argv[1:]:
- bytes = open(f, 'rb').read()
- print '{"/%s", {' % os.path.basename(f)
- print '"' + "".join(['\\x%02x' % ord(x) for x in bytes]) + '"'
- print ',%d }},' % len(bytes)
-
-print """
-};
+ const std::unordered_map<std::string, EmbeddedContent> embedded = {
+%s
+ };
} // namespace
const EmbeddedContent* findEmbeddedContent(const std::string& name) {
- auto found = embedded.find(name);
- if (found == embedded.end()) {
- return NULL;
- }
- return &found->second;
-}
+ const auto found = embedded.find(name);
+ if (found == embedded.end()) {
+ return nullptr;
+ }
+ return &found->second;
+}\n
"""
+MAX_SLICE = 70
+
+
+def as_byte(data):
+ if sys.version_info < (3,):
+ return ord(data)
+ else:
+ return data
+
+
+def parse_arguments():
+ parser = argparse.ArgumentParser(description="Embedded content generator")
+ parser.add_argument('--output', '-o', action='store', dest='output_file', type=str, help='Output File', required=True)
+ parser.add_argument('--file', '-f', action='store', nargs='+', dest='input_file', type=str, help='Output File', required=True)
+ return parser.parse_args()
+
+
+def create_file_byte(name, file_bytes):
+ output = []
+ output.append(' const char %s[] = {' % name)
+
+ for start in range(0, len(file_bytes), MAX_SLICE):
+ output.append('' + "".join(["'\\x%02x'," % as_byte(x) for x in file_bytes[start:start+MAX_SLICE]]) + "\n")
+ output.append('0};\n')
+ return ''.join(output)
+
+
+def create_file_info(file_list):
+ output = []
+ for name, base, length in file_list:
+ output.append(' {"/%s", { %s, %d }},\n' % (base, name, length))
+ return ''.join(output)
+
+
+def main():
+ args = parse_arguments()
+
+ files = []
+ index = 1
+ file_byte_entries = []
+
+ for file_name in args.input_file:
+ with open(file_name, 'rb') as f:
+ file_bytes = f.read()
+ name = "fileData%d" % index
+ index += 1
+ files.append((name, os.path.basename(file_name), len(file_bytes)))
+ file_byte_entries.append(create_file_byte(name, file_bytes))
+
+ with open(args.output_file, 'w') as output_file:
+ output_file.write(SOURCE_TEMPLATE % (''.join(file_byte_entries), create_file_info(files)))
+
+
+if __name__ == '__main__':
+ main()
diff --git a/third_party/seasocks/src/CMakeLists.txt b/third_party/seasocks/src/CMakeLists.txt
new file mode 100644
index 0000000..8a4e3db
--- /dev/null
+++ b/third_party/seasocks/src/CMakeLists.txt
@@ -0,0 +1,14 @@
+
+add_subdirectory("main/c")
+add_subdirectory("main/web")
+
+if (SEASOCKS_EXAMPLE_APP)
+ add_subdirectory("app/c")
+endif ()
+
+if (UNITTESTS)
+ find_program(CMAKE_MEMORYCHECK_COMMAND valgrind)
+ enable_testing()
+ add_subdirectory("test/c")
+endif ()
+
diff --git a/third_party/seasocks/src/app/c/CMakeLists.txt b/third_party/seasocks/src/app/c/CMakeLists.txt
new file mode 100644
index 0000000..18e2667
--- /dev/null
+++ b/third_party/seasocks/src/app/c/CMakeLists.txt
@@ -0,0 +1,25 @@
+macro(add_app _NAME)
+ add_executable(${_NAME} ${_NAME}.cpp)
+ target_link_libraries(${_NAME} seasocks "${ZLIB_LIBRARIES}")
+endmacro()
+
+add_app(ph_test)
+add_app(serve)
+add_app(ws_chatroom)
+add_app(ws_echo)
+add_app(ws_test)
+add_app(ws_test_poll)
+add_app(async_test)
+add_app(streaming_test)
+
+add_custom_command(TARGET ws_test POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
+ ${PROJECT_SOURCE_DIR}/src/ws_test_web $<TARGET_FILE_DIR:ws_test>/src/ws_test_web)
+
+add_custom_command(TARGET async_test POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
+ ${PROJECT_SOURCE_DIR}/src/async_test_web $<TARGET_FILE_DIR:async_test>/src/async_test_web)
+
+add_custom_command(TARGET ws_chatroom POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
+ ${PROJECT_SOURCE_DIR}/src/ws_chatroom_web $<TARGET_FILE_DIR:ws_chatroom>/src/ws_chatroom_web)
diff --git a/third_party/seasocks/src/app/c/async_test.cpp b/third_party/seasocks/src/app/c/async_test.cpp
new file mode 100644
index 0000000..3faf540
--- /dev/null
+++ b/third_party/seasocks/src/app/c/async_test.cpp
@@ -0,0 +1,116 @@
+// Copyright (c) 2013-2017, Matt Godbolt
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+// An example to show how one might use asynchronous responses.
+
+#include "seasocks/PrintfLogger.h"
+#include "seasocks/Server.h"
+#include "seasocks/Response.h"
+#include "seasocks/ResponseWriter.h"
+#include "seasocks/ResponseCode.h"
+#include "seasocks/util/RootPageHandler.h"
+#include "seasocks/util/PathHandler.h"
+
+#include <cassert>
+#include <cstring>
+#include <iostream>
+#include <memory>
+#include <set>
+#include <sstream>
+#include <string>
+#include <thread>
+#include <unistd.h>
+
+using namespace seasocks;
+
+// The AsyncResponse does some long-lived "work" (in this case a big sleep...)
+// before responding to the ResponseWriter, in chunks. It uses a new thread to
+// perform this "work". As responses can be canceled before the work is
+// complete, we must ensure the ResponseWriter used to communicate the response
+// is kept alive long enough by holding its shared_ptr in the "work" thread.
+// Seasocks will tell the response it has been cancelled (if the connection
+// associated with the request is closed); but the ResponseWriter is safe in the
+// presence of a closed connection so for simplicity this example does nothing
+// in the cancel() method. It is assumed the lifetime of the Server object is
+// long enough for all requests to complete before it is destroyed.
+struct AsyncResponse : Response {
+ Server& _server;
+ explicit AsyncResponse(Server& server)
+ : _server(server) {
+ }
+
+ // From Response:
+ virtual void handle(std::shared_ptr<ResponseWriter> writer) override {
+ auto& server = _server;
+ std::thread t([&server, writer]() mutable {
+ usleep(1000000); // A long database query...
+ std::string response = "some kind of response...beginning<br>";
+ server.execute([response, writer] {
+ writer->begin(ResponseCode::Ok, TransferEncoding::Chunked);
+ writer->header("Content-type", "application/html");
+ writer->payload(response.data(), response.length());
+ });
+ response = "more data...<br>";
+ for (auto i = 0; i < 5; ++i) {
+ usleep(1000000); // more data
+ server.execute([response, writer] {
+ writer->payload(response.data(), response.length());
+ });
+ }
+ response = "Done!";
+ usleep(100000); // final data
+ server.execute([response, writer] {
+ writer->payload(response.data(), response.length());
+ writer->finish(true);
+ });
+ });
+ t.detach();
+ }
+ virtual void cancel() override {
+ // If we could cancel the thread, we would do so here. There's no need
+ // to invalidate the _writer; any writes to it after this will be
+ // silently dropped.
+ }
+};
+
+struct DataHandler : CrackedUriPageHandler {
+ virtual std::shared_ptr<Response> handle(
+ const CrackedUri& /*uri*/, const Request& request) override {
+ return std::make_shared<AsyncResponse>(request.server());
+ }
+};
+
+int main(int /*argc*/, const char* /*argv*/[]) {
+ auto logger = std::make_shared<PrintfLogger>(Logger::Level::Debug);
+
+ Server server(logger);
+ auto root = std::make_shared<RootPageHandler>();
+ auto pathHandler = std::make_shared<PathHandler>("data", std::make_shared<DataHandler>());
+ root->add(pathHandler);
+ server.addPageHandler(root);
+
+ server.serve("src/async_test_web", 9090);
+ return 0;
+}
diff --git a/third_party/seasocks/src/app/c/ph_test.cpp b/third_party/seasocks/src/app/c/ph_test.cpp
index 4398e04..90eb714 100644
--- a/third_party/seasocks/src/app/c/ph_test.cpp
+++ b/third_party/seasocks/src/app/c/ph_test.cpp
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "seasocks/PageHandler.h"
@@ -37,28 +37,30 @@
using namespace seasocks;
-class MyPageHandler: public PageHandler {
+class MyPageHandler : public PageHandler {
public:
- virtual std::shared_ptr<Response> handle(const Request& request) {
- if (request.verb() == Request::Post) {
+ virtual std::shared_ptr<Response> handle(const Request& request) override {
+ if (request.verb() == Request::Verb::Post) {
std::string content(request.content(), request.content() + request.contentLength());
return Response::textResponse("Thanks for the post. You said: " + content);
}
- if (request.verb() != Request::Get) return Response::unhandled();
+ if (request.verb() != Request::Verb::Get)
+ return Response::unhandled();
std::ostringstream ostr;
ostr << "<html><head><title>seasocks example</title></head>"
- "<body>Hello, " << request.credentials()->attributes["fullName"] << "! You asked for " << request.getRequestUri()
- << " and your ip is " << request.getRemoteAddress().sin_addr.s_addr
- << " and a random number is " << rand()
- << "<form action=/post method=post><input type=text name=value1></input><br>"
- << "<input type=submit value=Submit></input></form>"
- << "</body></html>";
+ "<body>Hello, "
+ << request.credentials()->attributes["fullName"] << "! You asked for " << request.getRequestUri()
+ << " and your ip is " << request.getRemoteAddress().sin_addr.s_addr
+ << " and a random number is " << rand()
+ << "<form action=/post method=post><input type=text name=value1></input><br>"
+ << "<input type=submit value=Submit></input></form>"
+ << "</body></html>";
return Response::htmlResponse(ostr.str());
}
};
-int main(int argc, const char* argv[]) {
- std::shared_ptr<Logger> logger(new PrintfLogger(Logger::INFO));
+int main(int /*argc*/, const char* /*argv*/[]) {
+ auto logger = std::make_shared<PrintfLogger>(Logger::Level::Info);
Server server(logger);
server.addPageHandler(std::make_shared<MyPageHandler>());
diff --git a/third_party/seasocks/src/app/c/serve.cpp b/third_party/seasocks/src/app/c/serve.cpp
index a45501c..d1dc5d9 100644
--- a/third_party/seasocks/src/app/c/serve.cpp
+++ b/third_party/seasocks/src/app/c/serve.cpp
@@ -1,30 +1,28 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
-#include "internal/Version.h"
-
#include "seasocks/PrintfLogger.h"
#include "seasocks/Server.h"
#include "seasocks/StringUtil.h"
@@ -39,7 +37,7 @@
namespace {
const char usage[] = "Usage: %s [-p PORT] [-v] DIR\n"
- " Serves files from DIR over HTTP on port PORT\n";
+ " Serves files from DIR over HTTP on port PORT\n";
}
@@ -49,11 +47,15 @@
int opt;
while ((opt = getopt(argc, argv, "vp:")) != -1) {
switch (opt) {
- case 'v': verbose = true; break;
- case 'p': port = atoi(optarg); break;
- default:
- fprintf(stderr, usage, argv[0]);
- exit(1);
+ case 'v':
+ verbose = true;
+ break;
+ case 'p':
+ port = std::stoi(optarg);
+ break;
+ default:
+ fprintf(stderr, usage, argv[0]);
+ exit(1);
}
}
if (optind >= argc) {
@@ -62,7 +64,7 @@
}
auto logger = std::make_shared<PrintfLogger>(
- verbose ? Logger::DEBUG : Logger::ACCESS);
+ verbose ? Logger::Level::Debug : Logger::Level::Access);
Server server(logger);
auto root = argv[optind];
server.serve(root, port);
diff --git a/third_party/seasocks/src/app/c/streaming_test.cpp b/third_party/seasocks/src/app/c/streaming_test.cpp
new file mode 100644
index 0000000..4f57939
--- /dev/null
+++ b/third_party/seasocks/src/app/c/streaming_test.cpp
@@ -0,0 +1,88 @@
+// Copyright (c) 2013-2017, Martin Charles
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+#include "seasocks/PageHandler.h"
+#include "seasocks/PrintfLogger.h"
+#include "seasocks/Server.h"
+#include "seasocks/StringUtil.h"
+#include "seasocks/SimpleResponse.h"
+
+#include <cstring>
+#include <iostream>
+#include <memory>
+#include <set>
+#include <sstream>
+#include <string>
+
+using namespace seasocks;
+
+size_t streamlen(std::shared_ptr<std::istream> stream) {
+ stream->seekg(0, stream->end);
+ size_t len = stream->tellg();
+ stream->seekg(0, stream->beg);
+ return len;
+}
+
+class MyPageHandler : public PageHandler {
+public:
+ virtual std::shared_ptr<Response> handle(const Request& request) override {
+ if (request.verb() != Request::Verb::Get) {
+ return Response::unhandled();
+ }
+
+ auto ss = std::make_shared<std::stringstream>();
+ (*ss) << "<html><head><title>seasocks example</title></head>"
+ "<body>Hello, "
+ << request.credentials()->attributes["fullName"] << "! You asked for " << request.getRequestUri()
+ << " and your ip is " << request.getRemoteAddress().sin_addr.s_addr
+ << " and a random number is " << rand()
+ << "</body></html>";
+
+ auto headers = SimpleResponse::Headers({
+ {"Content-Type", "text/html"},
+ {"Content-Length", std::to_string(streamlen(ss))},
+ {"Connection", "keep-alive"},
+ });
+
+ const auto response = std::make_shared<SimpleResponse>(
+ ResponseCode::Ok, // response code
+ ss, // stream
+ headers, // headers
+ true, // keep alive
+ true // flush instantly
+ );
+ return response;
+ }
+};
+
+int main(int /*argc*/, const char* /*argv*/[]) {
+ auto logger = std::make_shared<PrintfLogger>(Logger::Level::Info);
+
+ Server server(logger);
+ server.addPageHandler(std::make_shared<MyPageHandler>());
+
+ server.serve("", 9090);
+ return 0;
+}
diff --git a/third_party/seasocks/src/app/c/ws_chatroom.cpp b/third_party/seasocks/src/app/c/ws_chatroom.cpp
new file mode 100644
index 0000000..c654790
--- /dev/null
+++ b/third_party/seasocks/src/app/c/ws_chatroom.cpp
@@ -0,0 +1,87 @@
+// Copyright (c) 2013-2017, Matt Godbolt
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+#include "seasocks/PageHandler.h"
+#include "seasocks/PrintfLogger.h"
+#include "seasocks/Server.h"
+#include "seasocks/WebSocket.h"
+#include "seasocks/StringUtil.h"
+
+#include <memory>
+#include <set>
+#include <string>
+
+// Simple chatroom server, showing how one might use authentication.
+
+using namespace seasocks;
+
+namespace {
+
+struct Handler : WebSocket::Handler {
+ std::set<WebSocket*> _cons;
+
+ void onConnect(WebSocket* con) override {
+ _cons.insert(con);
+ send(con->credentials()->username + " has joined");
+ }
+ void onDisconnect(WebSocket* con) override {
+ _cons.erase(con);
+ send(con->credentials()->username + " has left");
+ }
+
+ void onData(WebSocket* con, const char* data) override {
+ send(con->credentials()->username + ": " + data);
+ }
+
+ void send(const std::string& msg) {
+ for (auto* con : _cons) {
+ con->send(msg);
+ }
+ }
+};
+
+struct MyAuthHandler : PageHandler {
+ std::shared_ptr<Response> handle(const Request& request) override {
+ // Here one would handle one's authentication system, for example;
+ // * check to see if the user has a trusted cookie: if so, accept it.
+ // * if not, redirect to a login handler page, and await a redirection
+ // back here with relevant URL parameters indicating success. Then,
+ // set the cookie.
+ // For this example, we set the user's authentication information purely
+ // from their connection.
+ request.credentials()->username = formatAddress(request.getRemoteAddress());
+ return Response::unhandled(); // cause next handler to run
+ }
+};
+
+}
+
+int main(int /*argc*/, const char* /*argv*/[]) {
+ Server server(std::make_shared<PrintfLogger>());
+ server.addPageHandler(std::make_shared<MyAuthHandler>());
+ server.addWebSocketHandler("/chat", std::make_shared<Handler>());
+ server.serve("src/ws_chatroom_web", 9000);
+ return 0;
+}
diff --git a/third_party/seasocks/src/app/c/ws_echo.cpp b/third_party/seasocks/src/app/c/ws_echo.cpp
index 9464a63..5d79e68 100644
--- a/third_party/seasocks/src/app/c/ws_echo.cpp
+++ b/third_party/seasocks/src/app/c/ws_echo.cpp
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "seasocks/PrintfLogger.h"
@@ -39,28 +39,28 @@
using namespace seasocks;
-class EchoHandler: public WebSocket::Handler {
+class EchoHandler : public WebSocket::Handler {
public:
- virtual void onConnect(WebSocket* connection) {
+ virtual void onConnect(WebSocket* /*connection*/) override {
}
- virtual void onData(WebSocket* connection, const uint8_t* data, size_t length) {
- connection->send(data, length); // binary
+ virtual void onData(WebSocket* connection, const uint8_t* data, size_t length) override {
+ connection->send(data, length); // binary
}
- virtual void onData(WebSocket* connection, const char* data) {
- connection->send(data); // text
+ virtual void onData(WebSocket* connection, const char* data) override {
+ connection->send(data); // text
}
- virtual void onDisconnect(WebSocket* connection) {
+ virtual void onDisconnect(WebSocket* /*connection*/) override {
}
};
-int main(int argc, const char* argv[]) {
- std::shared_ptr<Logger> logger(new PrintfLogger(Logger::DEBUG));
+int main(int /*argc*/, const char* /*argv*/[]) {
+ auto logger = std::make_shared<PrintfLogger>(Logger::Level::Debug);
Server server(logger);
- std::shared_ptr<EchoHandler> handler(new EchoHandler());
+ auto handler = std::make_shared<EchoHandler>();
server.addWebSocketHandler("/", handler);
server.serve("/dev/null", 8000);
return 0;
diff --git a/third_party/seasocks/src/app/c/ws_test.cpp b/third_party/seasocks/src/app/c/ws_test.cpp
index 2a8823a..fec4ccf 100644
--- a/third_party/seasocks/src/app/c/ws_test.cpp
+++ b/third_party/seasocks/src/app/c/ws_test.cpp
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
// An extraordinarily simple test which presents a web page with some buttons.
@@ -43,56 +43,54 @@
#include <string>
using namespace seasocks;
-using namespace std;
-class MyHandler: public WebSocket::Handler {
+class MyHandler : public WebSocket::Handler {
public:
- MyHandler(Server* server) : _server(server), _currentValue(0) {
+ explicit MyHandler(Server* server)
+ : _server(server), _currentValue(0) {
setValue(1);
}
- virtual void onConnect(WebSocket* connection) {
+ virtual void onConnect(WebSocket* connection) override {
_connections.insert(connection);
connection->send(_currentSetValue.c_str());
- cout << "Connected: " << connection->getRequestUri()
- << " : " << formatAddress(connection->getRemoteAddress())
- << endl;
- cout << "Credentials: " << *(connection->credentials()) << endl;
+ std::cout << "Connected: " << connection->getRequestUri()
+ << " : " << formatAddress(connection->getRemoteAddress())
+ << "\nCredentials: " << *(connection->credentials()) << "\n";
}
- virtual void onData(WebSocket* connection, const char* data) {
+ virtual void onData(WebSocket* connection, const char* data) override {
if (0 == strcmp("die", data)) {
_server->terminate();
return;
}
if (0 == strcmp("close", data)) {
- cout << "Closing.." << endl;
+ std::cout << "Closing..\n";
connection->close();
- cout << "Closed." << endl;
+ std::cout << "Closed.\n";
return;
}
- int value = atoi(data) + 1;
+ const int value = std::stoi(data) + 1;
if (value > _currentValue) {
setValue(value);
- for (auto connection : _connections) {
- connection->send(_currentSetValue.c_str());
+ for (auto c : _connections) {
+ c->send(_currentSetValue.c_str());
}
}
}
- virtual void onDisconnect(WebSocket* connection) {
+ virtual void onDisconnect(WebSocket* connection) override {
_connections.erase(connection);
- cout << "Disconnected: " << connection->getRequestUri()
- << " : " << formatAddress(connection->getRemoteAddress())
- << endl;
+ std::cout << "Disconnected: " << connection->getRequestUri()
+ << " : " << formatAddress(connection->getRemoteAddress()) << "\n";
}
private:
- set<WebSocket*> _connections;
+ std::set<WebSocket*> _connections;
Server* _server;
int _currentValue;
- string _currentSetValue;
+ std::string _currentSetValue;
void setValue(int value) {
_currentValue = value;
@@ -100,12 +98,12 @@
}
};
-int main(int argc, const char* argv[]) {
- shared_ptr<Logger> logger(new PrintfLogger(Logger::DEBUG));
+int main(int /*argc*/, const char* /*argv*/[]) {
+ auto logger = std::make_shared<PrintfLogger>(Logger::Level::Debug);
Server server(logger);
- shared_ptr<MyHandler> handler(new MyHandler(&server));
+ auto handler = std::make_shared<MyHandler>(&server);
server.addWebSocketHandler("/ws", handler);
server.serve("src/ws_test_web", 9090);
return 0;
diff --git a/third_party/seasocks/src/app/c/ws_test_poll.cpp b/third_party/seasocks/src/app/c/ws_test_poll.cpp
index fd5805e..5fdce47 100644
--- a/third_party/seasocks/src/app/c/ws_test_poll.cpp
+++ b/third_party/seasocks/src/app/c/ws_test_poll.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -49,56 +49,54 @@
#include <sys/epoll.h>
using namespace seasocks;
-using namespace std;
-class MyHandler: public WebSocket::Handler {
+class MyHandler : public WebSocket::Handler {
public:
- MyHandler(Server* server) : _server(server), _currentValue(0) {
+ explicit MyHandler(Server* server)
+ : _server(server), _currentValue(0) {
setValue(1);
}
- virtual void onConnect(WebSocket* connection) {
+ virtual void onConnect(WebSocket* connection) override {
_connections.insert(connection);
connection->send(_currentSetValue.c_str());
- cout << "Connected: " << connection->getRequestUri()
- << " : " << formatAddress(connection->getRemoteAddress())
- << endl;
- cout << "Credentials: " << *(connection->credentials()) << endl;
+ std::cout << "Connected: " << connection->getRequestUri()
+ << " : " << formatAddress(connection->getRemoteAddress())
+ << "\nCredentials: " << *(connection->credentials()) << "\n";
}
- virtual void onData(WebSocket* connection, const char* data) {
+ virtual void onData(WebSocket* connection, const char* data) override {
if (0 == strcmp("die", data)) {
_server->terminate();
return;
}
if (0 == strcmp("close", data)) {
- cout << "Closing.." << endl;
+ std::cout << "Closing..\n";
connection->close();
- cout << "Closed." << endl;
+ std::cout << "Closed.\n";
return;
}
- int value = atoi(data) + 1;
+ const int value = std::stoi(data) + 1;
if (value > _currentValue) {
setValue(value);
- for (auto connection : _connections) {
- connection->send(_currentSetValue.c_str());
+ for (auto c : _connections) {
+ c->send(_currentSetValue.c_str());
}
}
}
- virtual void onDisconnect(WebSocket* connection) {
+ virtual void onDisconnect(WebSocket* connection) override {
_connections.erase(connection);
- cout << "Disconnected: " << connection->getRequestUri()
- << " : " << formatAddress(connection->getRemoteAddress())
- << endl;
+ std::cout << "Disconnected: " << connection->getRequestUri()
+ << " : " << formatAddress(connection->getRemoteAddress()) << "\n";
}
private:
- set<WebSocket*> _connections;
+ std::set<WebSocket*> _connections;
Server* _server;
int _currentValue;
- string _currentSetValue;
+ std::string _currentSetValue;
void setValue(int value) {
_currentValue = value;
@@ -106,42 +104,44 @@
}
};
-int main(int argc, const char* argv[]) {
- shared_ptr<Logger> logger(new PrintfLogger(Logger::DEBUG));
+int main(int /*argc*/, const char* /*argv*/[]) {
+ auto logger = std::make_shared<PrintfLogger>(Logger::Level::Debug);
Server server(logger);
- shared_ptr<MyHandler> handler(new MyHandler(&server));
+ auto handler = std::make_shared<MyHandler>(&server);
server.addWebSocketHandler("/ws", handler);
server.setStaticPath("src/ws_test_web");
if (!server.startListening(9090)) {
- cerr << "couldn't start listening" << endl;
+ std::cerr << "couldn't start listening\n";
return 1;
}
int myEpoll = epoll_create(10);
- epoll_event wakeSeasocks = { EPOLLIN|EPOLLOUT|EPOLLERR, { &server } };
+ epoll_event wakeSeasocks = {EPOLLIN | EPOLLOUT | EPOLLERR, {&server}};
epoll_ctl(myEpoll, EPOLL_CTL_ADD, server.fd(), &wakeSeasocks);
// Also poll stdin
- epoll_event wakeStdin = { EPOLLIN, { nullptr } };
+ epoll_event wakeStdin = {EPOLLIN, {nullptr}};
epoll_ctl(myEpoll, EPOLL_CTL_ADD, STDIN_FILENO, &wakeStdin);
auto prevFlags = fcntl(STDIN_FILENO, F_GETFL, 0);
fcntl(STDIN_FILENO, F_SETFL, prevFlags | O_NONBLOCK);
- cout << "Will echo anything typed in stdin: " << flush;
+ std::cout << "Will echo anything typed in stdin: " << std::flush;
while (true) {
constexpr auto maxEvents = 2;
epoll_event events[maxEvents];
auto res = epoll_wait(myEpoll, events, maxEvents, -1);
if (res < 0) {
- cerr << "epoll returned an error" << endl;
+ std::cerr << "epoll returned an error\n";
return 1;
}
for (auto i = 0; i < res; ++i) {
if (events[i].data.ptr == &server) {
auto seasocksResult = server.poll(0);
- if (seasocksResult == Server::PollResult::Terminated) return 0;
- if (seasocksResult == Server::PollResult::Error) return 1;
+ if (seasocksResult == Server::PollResult::Terminated)
+ return 0;
+ if (seasocksResult == Server::PollResult::Error)
+ return 1;
} else if (events[i].data.ptr == nullptr) {
// Echo stdin to stdout to show we can read from that too.
for (;;) {
@@ -149,17 +149,17 @@
auto numRead = ::read(STDIN_FILENO, buf, sizeof(buf));
if (numRead < 0) {
if (errno != EWOULDBLOCK && errno != EAGAIN) {
- cerr << "Error reading stdin" << endl;
+ std::cerr << "Error reading stdin\n";
return 1;
}
break;
} else if (numRead > 0) {
auto written = write(STDOUT_FILENO, buf, numRead);
if (written != numRead) {
- cerr << "Truncated write" << endl;
+ std::cerr << "Truncated write\n";
}
} else if (numRead == 0) {
- cerr << "EOF on stdin" << endl;
+ std::cerr << "EOF on stdin\n";
return 0;
}
}
diff --git a/third_party/seasocks/src/async_test_web/app.js b/third_party/seasocks/src/async_test_web/app.js
new file mode 100644
index 0000000..cfc38fc
--- /dev/null
+++ b/third_party/seasocks/src/async_test_web/app.js
@@ -0,0 +1,14 @@
+function loadData() {
+ document.getElementById("test").innerHTML = "Please wait...";
+ var xhttp = new XMLHttpRequest();
+ xhttp.open("GET", "data/monkeys", true);
+ xhttp.onprogress = function () {
+ document.getElementById("test").innerHTML = "<i>" + xhttp.responseText + "</i>";
+ };
+ xhttp.onreadystatechange = function () {
+ if (xhttp.readyState == 4 && xhttp.status == 200) {
+ document.getElementById("test").innerHTML = xhttp.responseText;
+ }
+ };
+ xhttp.send();
+}
diff --git a/third_party/seasocks/src/async_test_web/index.html b/third_party/seasocks/src/async_test_web/index.html
new file mode 100644
index 0000000..5b60262
--- /dev/null
+++ b/third_party/seasocks/src/async_test_web/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Hello, world</title>
+ <script src='app.js'></script>
+ </head>
+ <body>
+ <h1>Async test...</h1>
+ <button type="button" onclick="loadData()">Request data</button>
+ <div id="test"></div>
+ </body>
+</html>
diff --git a/third_party/seasocks/src/main/c/CMakeLists.txt b/third_party/seasocks/src/main/c/CMakeLists.txt
new file mode 100644
index 0000000..5c4d7f8
--- /dev/null
+++ b/third_party/seasocks/src/main/c/CMakeLists.txt
@@ -0,0 +1,120 @@
+set(SEASOCKS_SOURCE_FILES
+ Connection.cpp
+ HybiAccept.cpp
+ HybiPacketDecoder.cpp
+ internal/Base64.cpp
+ internal/Base64.h
+ internal/ConcreteResponse.h
+ internal/Debug.h
+ internal/Embedded.h
+ internal/HeaderMap.h
+ internal/HybiAccept.h
+ internal/HybiPacketDecoder.h
+ internal/LogStream.h
+ internal/PageRequest.h
+ Logger.cpp
+ md5/md5.cpp
+ md5/md5.h
+ PageRequest.cpp
+ Response.cpp
+ seasocks/Connection.h
+ seasocks/Credentials.h
+ seasocks/IgnoringLogger.h
+ seasocks/Logger.h
+ seasocks/PageHandler.h
+ seasocks/PrintfLogger.h
+ seasocks/Request.cpp
+ seasocks/Request.h
+ seasocks/ResponseBuilder.cpp
+ seasocks/ResponseBuilder.h
+ seasocks/ResponseCode.cpp
+ seasocks/ResponseCodeDefs.h
+ seasocks/ResponseCode.h
+ seasocks/Response.h
+ seasocks/ResponseWriter.h
+ seasocks/Server.h
+ seasocks/ServerImpl.h
+ seasocks/SimpleResponse.h
+ seasocks/StreamingResponse.cpp
+ seasocks/StreamingResponse.h
+ seasocks/StringUtil.h
+ seasocks/SynchronousResponse.cpp
+ seasocks/SynchronousResponse.h
+ seasocks/ToString.h
+ seasocks/TransferEncoding.h
+ seasocks/util/CrackedUri.h
+ seasocks/util/CrackedUriPageHandler.h
+ seasocks/util/Html.h
+ seasocks/util/Json.h
+ seasocks/util/PathHandler.h
+ seasocks/util/RootPageHandler.h
+ seasocks/util/StaticResponseHandler.h
+ seasocks/WebSocket.h
+ seasocks/ZlibContext.h
+ Server.cpp
+ sha1/sha1.cpp
+ sha1/sha1.h
+ StringUtil.cpp
+ util/CrackedUri.cpp
+ util/Json.cpp
+ util/PathHandler.cpp
+ util/RootPageHandler.cpp
+ )
+
+if (DEFLATE_SUPPORT)
+ set(SEASOCKS_SOURCE_FILES ${SEASOCKS_SOURCE_FILES} seasocks/ZlibContext.cpp)
+else()
+ set(SEASOCKS_SOURCE_FILES ${SEASOCKS_SOURCE_FILES} seasocks/ZlibContextDisabled.cpp)
+endif()
+
+add_library(seasocks_obj OBJECT ${SEASOCKS_SOURCE_FILES})
+target_include_directories(seasocks_obj PUBLIC
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/.>
+)
+set_property(TARGET seasocks_obj PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+
+add_library(seasocks STATIC $<TARGET_OBJECTS:seasocks_obj> $<TARGET_OBJECTS:embedded>)
+add_library(Seasocks::seasocks ALIAS seasocks)
+target_include_directories(seasocks PUBLIC
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/.>
+)
+target_link_libraries(seasocks PRIVATE ${CMAKE_THREAD_LIBS_INIT})
+if (DEFLATE_SUPPORT)
+ target_link_libraries(seasocks PRIVATE "${ZLIB_LIBRARIES}")
+endif()
+
+add_library(seasocks_so SHARED $<TARGET_OBJECTS:seasocks_obj> $<TARGET_OBJECTS:embedded>)
+add_library(Seasocks::seasocks_so ALIAS seasocks_so)
+target_include_directories(seasocks_so PUBLIC ${ZLIB_INCLUDE_DIRS}
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/.>
+)
+if (DEFLATE_SUPPORT)
+ target_link_libraries(seasocks_so PRIVATE ${CMAKE_THREAD_LIBS_INIT} "${ZLIB_LIBRARIES}")
+endif()
+set_target_properties(seasocks_so PROPERTIES OUTPUT_NAME seasocks VERSION ${PROJECT_VERSION})
+
+install(TARGETS seasocks seasocks_so EXPORT ${PROJECT_NAME}Config
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ )
+install(DIRECTORY seasocks
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ FILES_MATCHING PATTERN "*.h"
+ )
+# export for build tree.
+export(
+ TARGETS seasocks seasocks_so
+ NAMESPACE ${PROJECT_NAME}::
+ FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+)
+# export for install.
+install(
+ EXPORT ${PROJECT_NAME}Config
+ FILE ${PROJECT_NAME}Config.cmake
+ NAMESPACE ${PROJECT_NAME}::
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/
+)
diff --git a/third_party/seasocks/src/main/c/Connection.cpp b/third_party/seasocks/src/main/c/Connection.cpp
index 9c250a0..bace14d 100644
--- a/third_party/seasocks/src/main/c/Connection.cpp
+++ b/third_party/seasocks/src/main/c/Connection.cpp
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "internal/Config.h"
@@ -30,7 +30,7 @@
#include "internal/HybiPacketDecoder.h"
#include "internal/LogStream.h"
#include "internal/PageRequest.h"
-#include "internal/Version.h"
+#include "internal/RaiiFd.h"
#include "md5/md5.h"
@@ -41,22 +41,29 @@
#include "seasocks/Server.h"
#include "seasocks/StringUtil.h"
#include "seasocks/ToString.h"
+#include "seasocks/ResponseWriter.h"
+#include "seasocks/ZlibContext.h"
+#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
+#include <algorithm>
+#include <cassert>
+#include <cctype>
+#include <cerrno>
#include <fcntl.h>
#include <fstream>
#include <iostream>
#include <limits>
+#include <memory>
#include <sstream>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
#include <unistd.h>
+#include <byteswap.h>
#include <unordered_map>
+#include <memory>
namespace {
@@ -73,85 +80,51 @@
return numSpaces > 0 ? keyNumber / numSpaces : 0;
}
-char* extractLine(uint8_t*& first, uint8_t* last, char** colon = NULL) {
+char* extractLine(uint8_t*& first, uint8_t* last, char** colon = nullptr) {
for (uint8_t* ptr = first; ptr < last - 1; ++ptr) {
if (ptr[0] == '\r' && ptr[1] == '\n') {
ptr[0] = 0;
uint8_t* result = first;
first = ptr + 2;
- return reinterpret_cast<char*> (result);
+ return reinterpret_cast<char*>(result);
}
- if (colon && ptr[0] == ':' && *colon == NULL) {
- *colon = reinterpret_cast<char*> (ptr);
+ if (colon && ptr[0] == ':' && *colon == nullptr) {
+ *colon = reinterpret_cast<char*>(ptr);
}
}
- return NULL;
+ return nullptr;
}
-std::string webtime(time_t time) {
- struct tm tm;
- gmtime_r(&time, &tm);
- char buf[1024];
- // Wed, 20 Apr 2011 17:31:28 GMT
- strftime(buf, sizeof(buf)-1, "%a, %d %b %Y %H:%M:%S %Z", &tm);
- return buf;
-}
-
-std::string now() {
- return webtime(time(NULL));
-}
-
-class RaiiFd {
- int _fd;
-public:
- RaiiFd(const char* filename) {
- _fd = ::open(filename, O_RDONLY);
- }
- RaiiFd(const RaiiFd&) = delete;
- RaiiFd& operator=(const RaiiFd&) = delete;
- ~RaiiFd() {
- if (_fd != -1) {
- ::close(_fd);
- }
- }
- bool ok() const {
- return _fd != -1;
- }
- operator int() const {
- return _fd;
- }
-};
-
const std::unordered_map<std::string, std::string> contentTypes = {
- { "txt", "text/plain" },
- { "css", "text/css" },
- { "csv", "text/csv" },
- { "htm", "text/html" },
- { "html", "text/html" },
- { "xml", "text/xml" },
- { "js", "text/javascript" }, // Technically it should be application/javascript (RFC 4329), but IE8 struggles with that
- { "xhtml", "application/xhtml+xml" },
- { "json", "application/json" },
- { "pdf", "application/pdf" },
- { "zip", "application/zip" },
- { "tar", "application/x-tar" },
- { "gif", "image/gif" },
- { "jpeg", "image/jpeg" },
- { "jpg", "image/jpeg" },
- { "tiff", "image/tiff" },
- { "tif", "image/tiff" },
- { "png", "image/png" },
- { "svg", "image/svg+xml" },
- { "ico", "image/x-icon" },
- { "swf", "application/x-shockwave-flash" },
- { "mp3", "audio/mpeg" },
- { "wav", "audio/x-wav" },
- { "ttf", "font/ttf" },
+ {"txt", "text/plain"},
+ {"css", "text/css"},
+ {"csv", "text/csv"},
+ {"htm", "text/html"},
+ {"html", "text/html"},
+ {"xml", "text/xml"},
+ {"js", "text/javascript"}, // Technically it should be application/javascript (RFC 4329), but IE8 struggles with that
+ {"xhtml", "application/xhtml+xml"},
+ {"json", "application/json"},
+ {"pdf", "application/pdf"},
+ {"zip", "application/zip"},
+ {"tar", "application/x-tar"},
+ {"gif", "image/gif"},
+ {"jpeg", "image/jpeg"},
+ {"jpg", "image/jpeg"},
+ {"tiff", "image/tiff"},
+ {"tif", "image/tiff"},
+ {"png", "image/png"},
+ {"svg", "image/svg+xml"},
+ {"ico", "image/x-icon"},
+ {"swf", "application/x-shockwave-flash"},
+ {"mp3", "audio/mpeg"},
+ {"wav", "audio/x-wav"},
+ {"ttf", "font/ttf"},
};
std::string getExt(const std::string& path) {
auto lastDot = path.find_last_of('.');
- if (lastDot != path.npos) {
+ if (lastDot != std::string::npos) {
return path.substr(lastDot + 1);
}
return "";
@@ -177,24 +150,25 @@
return false;
}
-const size_t MaxBufferSize = 16 * 1024 * 1024;
-const size_t ReadWriteBufferSize = 16 * 1024;
-const size_t MaxWebsocketMessageSize = 16384;
-const size_t MaxHeadersSize = 64 * 1024;
+constexpr size_t ReadWriteBufferSize = 16 * 1024;
+constexpr size_t MaxWebsocketMessageSize = 16384;
+constexpr size_t MaxHeadersSize = 64 * 1024;
class PrefixWrapper : public seasocks::Logger {
std::string _prefix;
std::shared_ptr<Logger> _logger;
+
public:
PrefixWrapper(const std::string& prefix, std::shared_ptr<Logger> logger)
- : _prefix(prefix), _logger(logger) {}
+ : _prefix(prefix), _logger(logger) {
+ }
- virtual void log(Level level, const char* message) {
+ virtual void log(Level level, const char* message) override {
_logger->log(level, (_prefix + message).c_str());
}
};
-bool hasConnectionType(const std::string &connection, const std::string &type) {
+bool hasConnectionType(const std::string& connection, const std::string& type) {
for (auto conType : seasocks::split(connection, ',')) {
while (!conType.empty() && isspace(conType[0]))
conType = conType.substr(1);
@@ -204,27 +178,66 @@
return false;
}
-} // namespace
+} // namespace
namespace seasocks {
+struct Connection::Writer : ResponseWriter {
+ Connection* _connection;
+ explicit Writer(Connection& connection)
+ : _connection(&connection) {
+ }
+
+ void detach() {
+ _connection = nullptr;
+ }
+
+ void begin(ResponseCode responseCode, TransferEncoding encoding) override {
+ if (_connection)
+ _connection->begin(responseCode, encoding);
+ }
+ void header(const std::string& header, const std::string& value) override {
+ if (_connection)
+ _connection->header(header, value);
+ }
+ void payload(const void* data, size_t size, bool flush) override {
+ if (_connection)
+ _connection->payload(data, size, flush);
+ }
+ void finish(bool keepConnectionOpen) override {
+ if (_connection)
+ _connection->finish(keepConnectionOpen);
+ }
+ void error(ResponseCode responseCode, const std::string& payload) override {
+ if (_connection)
+ _connection->error(responseCode, payload);
+ }
+
+ bool isActive() const override {
+ return _connection;
+ }
+};
+
Connection::Connection(
- std::shared_ptr<Logger> logger,
- ServerImpl& server,
- int fd,
- const sockaddr_in& address)
- : _logger(new PrefixWrapper(formatAddress(address) + " : ", logger)),
- _server(server),
- _fd(fd),
- _shutdown(false),
- _hadSendError(false),
- _closeOnEmpty(false),
- _registeredForWriteEvents(false),
- _address(address),
- _bytesSent(0),
- _bytesReceived(0),
- _shutdownByUser(false),
- _state(READING_HEADERS) {
+ std::shared_ptr<Logger> logger,
+ ServerImpl& server,
+ int fd,
+ const sockaddr_in& address)
+ : _logger(std::make_shared<PrefixWrapper>(formatAddress(address) + " : ", logger)),
+ _server(server),
+ _fd(fd),
+ _shutdown(false),
+ _hadSendError(false),
+ _closeOnEmpty(false),
+ _registeredForWriteEvents(false),
+ _address(address),
+ _bytesSent(0),
+ _bytesReceived(0),
+ _shutdownByUser(false),
+ _transferEncoding(TransferEncoding::Raw),
+ _chunk(0u),
+ _writer(std::make_shared<Writer>(*this)),
+ _state(State::READING_HEADERS) {
}
Connection::~Connection() {
@@ -258,6 +271,12 @@
void Connection::finalise() {
+ if (_response) {
+ _response->cancel();
+ _response.reset();
+ _writer->detach();
+ _writer.reset();
+ }
if (_webSocketHandler) {
_webSocketHandler->onDisconnect(this);
_webSocketHandler.reset();
@@ -270,12 +289,12 @@
_fd = -1;
}
-int Connection::safeSend(const void* data, size_t size) {
+ssize_t Connection::safeSend(const void* data, size_t size) {
if (_fd == -1 || _hadSendError || _shutdown) {
// Ignore further writes to the socket, it's already closed or has been shutdown
return -1;
}
- int sendResult = ::send(_fd, data, size, MSG_NOSIGNAL);
+ auto sendResult = ::send(_fd, data, size, MSG_NOSIGNAL);
if (sendResult == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) {
// Treat this as if zero bytes were written.
@@ -294,7 +313,7 @@
return false;
}
if (size) {
- int bytesSent = 0;
+ ssize_t bytesSent = 0;
if (_outBuf.empty() && flushIt) {
// Attempt fast path, send directly.
bytesSent = safeSend(data, size);
@@ -309,9 +328,9 @@
size_t bytesToBuffer = size - bytesSent;
size_t endOfBuffer = _outBuf.size();
size_t newBufferSize = endOfBuffer + bytesToBuffer;
- if (newBufferSize >= MaxBufferSize) {
- LS_WARNING(_logger, "Closing connection: buffer size too large ("
- << newBufferSize << " >= " << MaxBufferSize << ")");
+ if (newBufferSize >= _server.clientBufferSize()) {
+ LS_WARNING(_logger, "Closing connection: buffer size too large ("
+ << newBufferSize << " >= " << _server.clientBufferSize() << ")");
closeInternal();
return false;
}
@@ -325,8 +344,9 @@
}
bool Connection::bufferLine(const char* line) {
- static const char crlf[] = { '\r', '\n' };
- if (!write(line, strlen(line), false)) return false;
+ static const char crlf[] = {'\r', '\n'};
+ if (!write(line, strlen(line), false))
+ return false;
return write(crlf, 2, false);
}
@@ -341,7 +361,7 @@
}
size_t curSize = _inBuf.size();
_inBuf.resize(curSize + ReadWriteBufferSize);
- int result = ::read(_fd, &_inBuf[curSize], ReadWriteBufferSize);
+ auto result = ::read(_fd, &_inBuf[curSize], ReadWriteBufferSize);
if (result == -1) {
LS_WARNING(_logger, "Unable to read from socket : " << getLastError());
return;
@@ -367,12 +387,12 @@
if (_outBuf.empty()) {
return true;
}
- int numSent = safeSend(&_outBuf[0], _outBuf.size());
+ auto numSent = safeSend(&_outBuf[0], _outBuf.size());
if (numSent == -1) {
return false;
}
_outBuf.erase(_outBuf.begin(), _outBuf.begin() + numSent);
- if (_outBuf.size() > 0 && !_registeredForWriteEvents) {
+ if (!_outBuf.empty() && !_registeredForWriteEvents) {
if (!_server.subscribeToWriteEvents(this)) {
return false;
}
@@ -396,24 +416,28 @@
void Connection::handleNewData() {
switch (_state) {
- case READING_HEADERS:
- handleHeaders();
- break;
- case READING_WEBSOCKET_KEY3:
- handleWebSocketKey3();
- break;
- case HANDLING_HIXIE_WEBSOCKET:
- handleHixieWebSocket();
- break;
- case HANDLING_HYBI_WEBSOCKET:
- handleHybiWebSocket();
- break;
- case BUFFERING_POST_DATA:
- handleBufferingPostData();
- break;
- default:
- assert(false);
- break;
+ case State::READING_HEADERS:
+ handleHeaders();
+ break;
+ case State::READING_WEBSOCKET_KEY3:
+ handleWebSocketKey3();
+ break;
+ case State::HANDLING_HIXIE_WEBSOCKET:
+ handleHixieWebSocket();
+ break;
+ case State::HANDLING_HYBI_WEBSOCKET:
+ handleHybiWebSocket();
+ break;
+ case State::BUFFERING_POST_DATA:
+ handleBufferingPostData();
+ break;
+ case State::AWAITING_RESPONSE_BEGIN:
+ case State::SENDING_RESPONSE_BODY:
+ case State::SENDING_RESPONSE_HEADERS:
+ break;
+ default:
+ assert(false);
+ break;
}
}
@@ -423,9 +447,9 @@
}
for (size_t i = 0; i <= _inBuf.size() - 4; ++i) {
if (_inBuf[i] == '\r' &&
- _inBuf[i+1] == '\n' &&
- _inBuf[i+2] == '\r' &&
- _inBuf[i+3] == '\n') {
+ _inBuf[i + 1] == '\n' &&
+ _inBuf[i + 2] == '\r' &&
+ _inBuf[i + 3] == '\n') {
if (!processHeaders(&_inBuf[0], &_inBuf[i + 2])) {
closeInternal();
return;
@@ -474,7 +498,7 @@
bufferLine("Connection: Upgrade");
bool allowCrossOrigin = _server.isCrossOriginAllowed(_request->getRequestUri());
if (_request->hasHeader("Origin") && allowCrossOrigin) {
- bufferLine("Sec-WebSocket-Origin: " + _request->getHeader("Origin"));
+ bufferLine("Sec-WebSocket-Origin: " + _request->getHeader("Origin"));
}
if (_request->hasHeader("Host")) {
auto host = _request->getHeader("Host");
@@ -483,20 +507,39 @@
}
bufferLine("Sec-WebSocket-Location: ws://" + host + _request->getRequestUri());
}
+ pickProtocol();
bufferLine("");
write(&digest, 16, true);
- _state = HANDLING_HIXIE_WEBSOCKET;
+ _state = State::HANDLING_HIXIE_WEBSOCKET;
_inBuf.erase(_inBuf.begin(), _inBuf.begin() + 8);
if (_webSocketHandler) {
_webSocketHandler->onConnect(this);
}
}
+void Connection::pickProtocol() {
+ static std::string protocolHeader = "Sec-WebSocket-Protocol";
+ if (!_request->hasHeader(protocolHeader) || !_webSocketHandler)
+ return;
+ // Ideally we need o support this header being set multiple times...but the headers don't support that.
+ auto protocols = split(_request->getHeader(protocolHeader), ',');
+ LS_DEBUG(_logger, "Requested protocols:");
+ std::transform(protocols.begin(), protocols.end(), protocols.begin(), trimWhitespace);
+ for (auto&& p : protocols) {
+ LS_DEBUG(_logger, " " + p);
+ }
+ auto choice = _webSocketHandler->chooseProtocol(protocols);
+ if (choice >= 0 && choice < static_cast<ssize_t>(protocols.size())) {
+ LS_DEBUG(_logger, "Chose protocol " + protocols[choice]);
+ bufferLine(protocolHeader + ": " + protocols[choice]);
+ }
+}
+
void Connection::handleBufferingPostData() {
if (_request->consumeContent(_inBuf)) {
- _state = READING_HEADERS;
+ _state = State::READING_HEADERS;
if (!handlePageRequest()) {
closeInternal();
}
@@ -512,18 +555,21 @@
return;
}
auto messageLength = strlen(webSocketResponse);
- if (_state == HANDLING_HIXIE_WEBSOCKET) {
+ if (_state == State::HANDLING_HIXIE_WEBSOCKET) {
uint8_t zero = 0;
- if (!write(&zero, 1, false)) return;
- if (!write(webSocketResponse, messageLength, false)) return;
+ if (!write(&zero, 1, false))
+ return;
+ if (!write(webSocketResponse, messageLength, false))
+ return;
uint8_t effeff = 0xff;
write(&effeff, 1, true);
return;
}
- sendHybi(HybiPacketDecoder::OPCODE_TEXT, reinterpret_cast<const uint8_t*>(webSocketResponse), messageLength);
+ sendHybi(static_cast<uint8_t>(HybiPacketDecoder::Opcode::Text),
+ reinterpret_cast<const uint8_t*>(webSocketResponse), messageLength);
}
-void Connection::send(const uint8_t* data, size_t length) {
+void Connection::send(const uint8_t* webSocketResponse, size_t length) {
_server.checkThread();
if (_shutdown) {
if (_shutdownByUser) {
@@ -531,29 +577,51 @@
}
return;
}
- if (_state == HANDLING_HIXIE_WEBSOCKET) {
+ if (_state == State::HANDLING_HIXIE_WEBSOCKET) {
LS_ERROR(_logger, "Hixie does not support binary");
return;
}
- sendHybi(HybiPacketDecoder::OPCODE_BINARY, data, length);
+ sendHybi(static_cast<uint8_t>(HybiPacketDecoder::Opcode::Binary), webSocketResponse, length);
}
-void Connection::sendHybi(int opcode, const uint8_t* webSocketResponse, size_t messageLength) {
+void Connection::sendHybi(uint8_t opcode, const uint8_t* webSocketResponse, size_t messageLength) {
uint8_t firstByte = 0x80 | opcode;
- if (!write(&firstByte, 1, false)) return;
+ if (_perMessageDeflate)
+ firstByte |= 0x40;
+ if (!write(&firstByte, 1, false))
+ return;
+
+ if (_perMessageDeflate) {
+ std::vector<uint8_t> compressed;
+
+ zlibContext.deflate(webSocketResponse, messageLength, compressed);
+
+ LS_DEBUG(_logger, "Compression result: " << messageLength << " bytes -> " << compressed.size() << " bytes");
+ sendHybiData(compressed.data(), compressed.size());
+ } else {
+ sendHybiData(webSocketResponse, messageLength);
+ }
+}
+
+void Connection::sendHybiData(const uint8_t* webSocketResponse, size_t messageLength) {
if (messageLength < 126) {
uint8_t nextByte = messageLength; // No MASK bit set.
- if (!write(&nextByte, 1, false)) return;
+ if (!write(&nextByte, 1, false))
+ return;
} else if (messageLength < 65536) {
uint8_t nextByte = 126; // No MASK bit set.
- if (!write(&nextByte, 1, false)) return;
+ if (!write(&nextByte, 1, false))
+ return;
auto lengthBytes = htons(messageLength);
- if (!write(&lengthBytes, 2, false)) return;
+ if (!write(&lengthBytes, 2, false))
+ return;
} else {
uint8_t nextByte = 127; // No MASK bit set.
- if (!write(&nextByte, 1, false)) return;
+ if (!write(&nextByte, 1, false))
+ return;
uint64_t lengthBytes = __bswap_64(messageLength);
- if (!write(&lengthBytes, 8, false)) return;
+ if (!write(&lengthBytes, 8, false))
+ return;
}
write(webSocketResponse, messageLength, true);
}
@@ -570,7 +638,7 @@
size_t messageStart = 0;
while (messageStart < _inBuf.size()) {
if (_inBuf[messageStart] != 0) {
- LS_WARNING(_logger, "Error in WebSocket input stream (got " << (int)_inBuf[messageStart] << ")");
+ LS_WARNING(_logger, "Error in WebSocket input stream (got " << (int) _inBuf[messageStart] << ")");
closeInternal();
return;
}
@@ -607,31 +675,67 @@
bool done = false;
while (!done) {
std::vector<uint8_t> decodedMessage;
- switch (decoder.decodeNextMessage(decodedMessage)) {
- default:
- closeInternal();
- LS_WARNING(_logger, "Unknown HybiPacketDecoder state");
- return;
- case HybiPacketDecoder::Error:
- closeInternal();
- return;
- case HybiPacketDecoder::TextMessage:
- decodedMessage.push_back(0); // avoids a copy
- handleWebSocketTextMessage(reinterpret_cast<const char*>(&decodedMessage[0]));
- break;
- case HybiPacketDecoder::BinaryMessage:
- handleWebSocketBinaryMessage(decodedMessage);
- break;
- case HybiPacketDecoder::Ping:
- sendHybi(HybiPacketDecoder::OPCODE_PONG, &decodedMessage[0], decodedMessage.size());
- break;
- case HybiPacketDecoder::NoMessage:
- done = true;
- break;
- case HybiPacketDecoder::Close:
- LS_DEBUG(_logger, "Received WebSocket close");
- closeInternal();
- return;
+ bool deflateNeeded = false;
+
+ auto messageState = decoder.decodeNextMessage(decodedMessage, deflateNeeded);
+
+ if (deflateNeeded) {
+ if (!_perMessageDeflate) {
+ LS_WARNING(_logger, "Received deflated hybi frame but deflate wasn't negotiated");
+ closeInternal();
+ return;
+ }
+
+ size_t compressed_size = decodedMessage.size();
+
+ std::vector<uint8_t> decompressed;
+ int zlibError;
+
+ // Note: inflate() alters decodedMessage
+ bool success = zlibContext.inflate(decodedMessage, decompressed, zlibError);
+
+ if (!success) {
+ LS_WARNING(_logger, "Decompression error from zlib: " << zlibError);
+ closeInternal();
+ return;
+ }
+
+ LS_DEBUG(_logger, "Decompression result: " << compressed_size << " bytes -> " << decodedMessage.size() << " bytes");
+
+ decodedMessage.swap(decompressed);
+ }
+
+
+ switch (messageState) {
+ default:
+ closeInternal();
+ LS_WARNING(_logger, "Unknown HybiPacketDecoder state");
+ return;
+ case HybiPacketDecoder::MessageState::Error:
+ closeInternal();
+ return;
+ case HybiPacketDecoder::MessageState::TextMessage:
+ decodedMessage.push_back(0); // avoids a copy
+ handleWebSocketTextMessage(reinterpret_cast<const char*>(&decodedMessage[0]));
+ break;
+ case HybiPacketDecoder::MessageState::BinaryMessage:
+ handleWebSocketBinaryMessage(decodedMessage);
+ break;
+ case HybiPacketDecoder::MessageState::Ping:
+ sendHybi(static_cast<uint8_t>(HybiPacketDecoder::Opcode::Pong),
+ &decodedMessage[0], decodedMessage.size());
+ break;
+ case HybiPacketDecoder::MessageState::Pong:
+ // Pongs can be sent unsolicited (MSIE and Edge do this)
+ // The spec says to ignore them.
+ break;
+ case HybiPacketDecoder::MessageState::NoMessage:
+ done = true;
+ break;
+ case HybiPacketDecoder::MessageState::Close:
+ LS_DEBUG(_logger, "Received WebSocket close");
+ closeInternal();
+ return;
}
}
if (decoder.numBytesDecoded() != 0) {
@@ -658,7 +762,7 @@
}
bool Connection::sendError(ResponseCode errorCode, const std::string& body) {
- assert(_state != HANDLING_HIXIE_WEBSOCKET);
+ assert(_state != State::HANDLING_HIXIE_WEBSOCKET);
auto errorNumber = static_cast<int>(errorCode);
auto message = ::name(errorCode);
bufferResponseAndCommonHeaders(errorCode);
@@ -672,8 +776,9 @@
} else {
std::stringstream documentStr;
documentStr << "<html><head><title>" << errorNumber << " - " << message << "</title></head>"
- << "<body><h1>" << errorNumber << " - " << message << "</h1>"
- << "<div>" << body << "</div><hr/><div><i>Powered by seasocks</i></div></body></html>";
+ << "<body><h1>" << errorNumber << " - " << message << "</h1>"
+ << "<div>" << body << "</div><hr/><div><i>Powered by "
+ "<a href=\"https://github.com/mattgodbolt/seasocks\">Seasocks</a></i></div></body></html>";
document = documentStr.str();
}
bufferLine("Content-Length: " + toString(document.length()));
@@ -717,7 +822,7 @@
// Be careful about lifetimes though and multiple requests coming in, should
// we ever support HTTP pipelining and/or long-lived requests.
char* requestLine = extractLine(first, last);
- assert(requestLine != NULL);
+ assert(requestLine != nullptr);
LS_ACCESS(_logger, "Request: " << requestLine);
@@ -730,12 +835,12 @@
return sendBadRequest("Malformed request line");
}
const char* requestUri = shift(requestLine);
- if (requestUri == NULL) {
+ if (requestUri == nullptr) {
return sendBadRequest("Malformed request line");
}
const char* httpVersion = shift(requestLine);
- if (httpVersion == NULL) {
+ if (httpVersion == nullptr) {
return sendBadRequest("Malformed request line");
}
if (strcmp(httpVersion, "HTTP/1.1") != 0) {
@@ -747,26 +852,20 @@
HeaderMap headers(31);
while (first < last) {
- char* colonPos = NULL;
+ char* colonPos = nullptr;
char* headerLine = extractLine(first, last, &colonPos);
- assert(headerLine != NULL);
- if (colonPos == NULL) {
+ assert(headerLine != nullptr);
+ if (colonPos == nullptr) {
return sendBadRequest("Malformed header");
}
*colonPos = 0;
const char* key = headerLine;
const char* value = skipWhitespace(colonPos + 1);
LS_DEBUG(_logger, "Key: " << key << " || " << value);
-#if HAVE_UNORDERED_MAP_EMPLACE
headers.emplace(key, value);
-#else
- headers.insert(std::make_pair(key, value));
-#endif
}
- if (headers.count("Connection") && headers.count("Upgrade")
- && hasConnectionType(headers["Connection"], "Upgrade")
- && caseInsensitiveSame(headers["Upgrade"], "websocket")) {
+ if (headers.count("Connection") && headers.count("Upgrade") && hasConnectionType(headers["Connection"], "Upgrade") && caseInsensitiveSame(headers["Upgrade"], "websocket")) {
LS_INFO(_logger, "Websocket request for " << requestUri << "'");
if (verb != Request::Verb::Get) {
return sendBadRequest("Non-GET WebSocket request");
@@ -777,23 +876,30 @@
return send404();
}
verb = Request::Verb::WebSocket;
+
+ if (_server.server().getPerMessageDeflateEnabled() && headers.count("Sec-WebSocket-Extensions")) {
+ parsePerMessageDeflateHeader(headers["Sec-WebSocket-Extensions"]);
+ }
}
- _request.reset(new PageRequest(_address, requestUri, verb, std::move(headers)));
+ _request = std::make_unique<PageRequest>(_address, requestUri, _server.server(),
+ verb, std::move(headers));
- const EmbeddedContent *embedded = findEmbeddedContent(requestUri);
+ const EmbeddedContent* embedded = findEmbeddedContent(requestUri);
if (verb == Request::Verb::Get && embedded) {
// MRG: one day, this could be a request handler.
return sendData(getContentType(requestUri), embedded->data, embedded->length);
+ } else if (verb == Request::Verb::Head && embedded) {
+ return sendHeader(getContentType(requestUri), embedded->length);
}
- if (_request->contentLength() > MaxBufferSize) {
+ if (_request->contentLength() > _server.clientBufferSize()) {
return sendBadRequest("Content length too long");
}
if (_request->contentLength() == 0) {
return handlePageRequest();
}
- _state = BUFFERING_POST_DATA;
+ _state = State::BUFFERING_POST_DATA;
return true;
}
@@ -811,14 +917,14 @@
auto uri = _request->getRequestUri();
if (!response && _request->verb() == Request::Verb::WebSocket) {
_webSocketHandler = _server.getWebSocketHandler(uri.c_str());
- auto webSocketVersion = atoi(_request->getHeader("Sec-WebSocket-Version").c_str());
+ const auto webSocketVersion = std::stoi(_request->getHeader("Sec-WebSocket-Version"));
if (!_webSocketHandler) {
LS_WARNING(_logger, "Couldn't find WebSocket end point for '" << uri << "'");
return send404();
}
if (webSocketVersion == 0) {
// Hixie
- _state = READING_WEBSOCKET_KEY3;
+ _state = State::READING_WEBSOCKET_KEY3;
return true;
}
auto hybiKey = _request->getHeader("Sec-WebSocket-Key");
@@ -828,47 +934,108 @@
}
bool Connection::sendResponse(std::shared_ptr<Response> response) {
- const auto requestUri = _request->getRequestUri();
if (response == Response::unhandled()) {
return sendStaticData();
}
- if (response->responseCode() == ResponseCode::NotFound) {
- // TODO: better here; we use this purely to serve our own embedded content.
- return send404();
- } else if (!isOk(response->responseCode())) {
- return sendError(response->responseCode(), response->payload());
- }
-
- bufferResponseAndCommonHeaders(response->responseCode());
- bufferLine("Content-Length: " + toString(response->payloadSize()));
- bufferLine("Content-Type: " + response->contentType());
- if (response->keepConnectionAlive()) {
- bufferLine("Connection: keep-alive");
- } else {
- bufferLine("Connection: close");
- }
- bufferLine("Last-Modified: " + now());
- bufferLine("Cache-Control: no-store");
- bufferLine("Pragma: no-cache");
- bufferLine("Expires: " + now());
- auto headers = response->getAdditionalHeaders();
- for (auto it = headers.begin(); it != headers.end(); ++it) {
- bufferLine(it->first + ": " + it->second);
- }
- bufferLine("");
-
- if (!write(response->payload(), response->payloadSize(), true)) {
- return false;
- }
- if (!response->keepConnectionAlive()) {
- closeWhenEmpty();
- }
+ assert(_response.get() == nullptr);
+ _state = State::AWAITING_RESPONSE_BEGIN;
+ _transferEncoding = TransferEncoding::Raw;
+ _chunk = 0;
+ _response = response;
+ _response->handle(_writer);
return true;
}
+void Connection::error(ResponseCode responseCode, const std::string& payload) {
+ _server.checkThread();
+ if (_state != State::AWAITING_RESPONSE_BEGIN) {
+ LS_ERROR(_logger, "error() called when in wrong state");
+ return;
+ }
+ if (isOk(responseCode)) {
+ LS_ERROR(_logger, "error() called with a non-error code");
+ }
+ if (responseCode == ResponseCode::NotFound) {
+ // TODO: better here; we use this purely to serve our own embedded content.
+ send404();
+ } else {
+ sendError(responseCode, payload);
+ }
+}
+
+void Connection::begin(ResponseCode responseCode, TransferEncoding encoding) {
+ _server.checkThread();
+ if (_state != State::AWAITING_RESPONSE_BEGIN) {
+ LS_ERROR(_logger, "begin() called when in wrong state");
+ return;
+ }
+ _state = State::SENDING_RESPONSE_HEADERS;
+ bufferResponseAndCommonHeaders(responseCode);
+ _transferEncoding = encoding;
+ if (_transferEncoding == TransferEncoding::Chunked) {
+ bufferLine("Transfer-encoding: chunked");
+ }
+}
+
+void Connection::header(const std::string& header, const std::string& value) {
+ _server.checkThread();
+ if (_state != State::SENDING_RESPONSE_HEADERS) {
+ LS_ERROR(_logger, "header() called when in wrong state");
+ return;
+ }
+ bufferLine(header + ": " + value);
+}
+void Connection::payload(const void* data, size_t size, bool flush) {
+ _server.checkThread();
+ if (_state == State::SENDING_RESPONSE_HEADERS) {
+ bufferLine("");
+ _state = State::SENDING_RESPONSE_BODY;
+ } else if (_state != State::SENDING_RESPONSE_BODY) {
+ LS_ERROR(_logger, "payload() called when in wrong state");
+ return;
+ }
+ if (size && _transferEncoding == TransferEncoding::Chunked) {
+ writeChunkHeader(size);
+ }
+ write(data, size, flush);
+}
+
+void Connection::writeChunkHeader(size_t size) {
+ std::ostringstream lengthStr;
+ if (_chunk)
+ lengthStr << "\r\n";
+ lengthStr << std::hex << size << "\r\n";
+ auto length = lengthStr.str();
+ _chunk++;
+ write(length.c_str(), length.size(), false);
+}
+
+void Connection::finish(bool keepConnectionOpen) {
+ _server.checkThread();
+ if (_state == State::SENDING_RESPONSE_HEADERS) {
+ bufferLine("");
+ } else if (_state != State::SENDING_RESPONSE_BODY) {
+ LS_ERROR(_logger, "finish() called when in wrong state");
+ return;
+ }
+ if (_transferEncoding == TransferEncoding::Chunked) {
+ writeChunkHeader(0);
+ write("\r\n", 2, false);
+ }
+
+ flush();
+
+ if (!keepConnectionOpen) {
+ closeWhenEmpty();
+ }
+
+ _state = State::READING_HEADERS;
+ _response.reset();
+}
+
bool Connection::handleHybiHandshake(
- int webSocketVersion,
- const std::string& webSocketKey) {
+ int webSocketVersion,
+ const std::string& webSocketKey) {
if (webSocketVersion != 8 && webSocketVersion != 13) {
return sendBadRequest("Invalid websocket version");
}
@@ -880,16 +1047,33 @@
bufferLine("Upgrade: websocket");
bufferLine("Connection: Upgrade");
bufferLine("Sec-WebSocket-Accept: " + getAcceptKey(webSocketKey));
+ if (_perMessageDeflate)
+ bufferLine("Sec-WebSocket-Extensions: permessage-deflate");
+ pickProtocol();
bufferLine("");
flush();
if (_webSocketHandler) {
_webSocketHandler->onConnect(this);
}
- _state = HANDLING_HYBI_WEBSOCKET;
+ _state = State::HANDLING_HYBI_WEBSOCKET;
return true;
}
+void Connection::parsePerMessageDeflateHeader(const std::string& header) {
+ for (auto& extField : seasocks::split(header, ';')) {
+ while (!extField.empty() && isspace(extField[0])) {
+ extField = extField.substr(1);
+ }
+
+ if (seasocks::caseInsensitiveSame(extField, "permessage-deflate")) {
+ LS_INFO(_logger, "Enabling per-message deflate");
+ _perMessageDeflate = true;
+ zlibContext.initialise();
+ }
+ }
+}
+
bool Connection::parseRange(const std::string& rangeStr, Range& range) const {
size_t minusPos = rangeStr.find('-');
if (minusPos == std::string::npos) {
@@ -898,15 +1082,15 @@
}
if (minusPos == 0) {
// A range like "-500" means 500 bytes from end of file to end.
- range.start = atoi(rangeStr.c_str());
+ range.start = std::stoi(rangeStr);
range.end = std::numeric_limits<long>::max();
return true;
} else {
- range.start = atoi(rangeStr.substr(0, minusPos).c_str());
- if (minusPos == rangeStr.size()-1) {
+ range.start = std::stoi(rangeStr.substr(0, minusPos));
+ if (minusPos == rangeStr.size() - 1) {
range.end = std::numeric_limits<long>::max();
} else {
- range.end = atoi(rangeStr.substr(minusPos + 1).c_str());
+ range.end = std::stoi(rangeStr.substr(minusPos + 1));
}
return true;
}
@@ -920,9 +1104,9 @@
return false;
}
auto rangesText = split(range.substr(expectedPrefix.length()), ',');
- for (auto it = rangesText.begin(); it != rangesText.end(); ++it) {
+ for (auto& it : rangesText) {
Range r;
- if (!parseRange(*it, r)) {
+ if (!parseRange(it, r)) {
return false;
}
ranges.push_back(r);
@@ -937,7 +1121,7 @@
// Easy case: a non-range request.
bufferResponseAndCommonHeaders(ResponseCode::Ok);
bufferLine("Content-Length: " + toString(fileSize));
- return { Range { 0, fileSize - 1 } };
+ return {Range{0, fileSize - 1}};
}
// Partial content request.
@@ -946,8 +1130,7 @@
std::ostringstream rangeLine;
rangeLine << "Content-Range: bytes ";
std::list<Range> sendRanges;
- for (auto rangeIter = origRanges.cbegin(); rangeIter != origRanges.cend(); ++rangeIter) {
- Range actualRange = *rangeIter;
+ for (auto actualRange : origRanges) {
if (actualRange.start < 0) {
actualRange.start += fileSize;
}
@@ -973,26 +1156,27 @@
auto rangeHeader = getHeader("Range");
// Trim any trailing queries.
size_t queryPos = path.find('?');
- if (queryPos != path.npos) {
+ if (queryPos != std::string::npos) {
path.resize(queryPos);
}
if (*path.rbegin() == '/') {
path += "index.html";
}
- RaiiFd input(path.c_str());
- struct stat stat;
- if (!input.ok() || ::fstat(input, &stat) == -1) {
+
+ RaiiFd input{::open(path.c_str(), O_RDONLY)};
+ struct stat fileStat;
+ if (!input.ok() || ::fstat(input, &fileStat) == -1) {
return send404();
}
std::list<Range> ranges;
if (!rangeHeader.empty() && !parseRanges(rangeHeader, ranges)) {
return sendBadRequest("Bad range header");
}
- ranges = processRangesForStaticData(ranges, stat.st_size);
+ ranges = processRangesForStaticData(ranges, fileStat.st_size);
bufferLine("Content-Type: " + getContentType(path));
bufferLine("Connection: keep-alive");
bufferLine("Accept-Ranges: bytes");
- bufferLine("Last-Modified: " + webtime(stat.st_mtime));
+ bufferLine("Last-Modified: " + webtime(fileStat.st_mtime));
if (!isCacheable(path)) {
bufferLine("Cache-Control: no-store");
bufferLine("Pragma: no-cache");
@@ -1003,12 +1187,12 @@
return false;
}
- for (auto rangeIter = ranges.cbegin(); rangeIter != ranges.cend(); ++rangeIter) {
- if (::lseek(input, rangeIter->start, SEEK_SET) == -1) {
+ for (auto range : ranges) {
+ if (::lseek(input, range.start, SEEK_SET) == -1) {
// We've (probably) already sent data.
return false;
}
- auto bytesLeft = rangeIter->length();
+ auto bytesLeft = range.length();
while (bytesLeft) {
char buf[ReadWriteBufferSize];
auto bytesRead = ::read(input, buf, std::min(sizeof(buf), bytesLeft));
@@ -1027,6 +1211,14 @@
return true;
}
+bool Connection::sendHeader(const std::string& type, size_t size) {
+ bufferResponseAndCommonHeaders(ResponseCode::Ok);
+ bufferLine("Content-Type: " + type);
+ bufferLine("Content-Length: " + toString(size));
+ bufferLine("Connection: keep-alive");
+ return bufferLine("");
+}
+
bool Connection::sendData(const std::string& type, const char* start, size_t size) {
bufferResponseAndCommonHeaders(ResponseCode::Ok);
bufferLine("Content-Type: " + type);
@@ -1043,7 +1235,7 @@
auto response = std::string("HTTP/1.1 " + toString(responseCodeInt) + " " + responseCodeName);
LS_ACCESS(_logger, "Response: " << response);
bufferLine(response);
- bufferLine("Server: " SEASOCKS_VERSION_STRING);
+ bufferLine("Server: " + std::string(Config::version));
bufferLine("Date: " + now());
bufferLine("Access-Control-Allow-Origin: *");
}
@@ -1053,7 +1245,7 @@
return;
}
const int secondsToLinger = 1;
- struct linger linger = { true, secondsToLinger };
+ struct linger linger = {true, secondsToLinger};
if (::setsockopt(_fd, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger)) == -1) {
LS_INFO(_logger, "Unable to set linger on socket");
}
@@ -1072,4 +1264,8 @@
return _request ? _request->getRequestUri() : empty;
}
-} // seasocks
+Server& Connection::server() const {
+ return _server.server();
+}
+
+} // seasocks
diff --git a/third_party/seasocks/src/main/c/HybiAccept.cpp b/third_party/seasocks/src/main/c/HybiAccept.cpp
index 8c2dbde..fcf05fc 100644
--- a/third_party/seasocks/src/main/c/HybiAccept.cpp
+++ b/third_party/seasocks/src/main/c/HybiAccept.cpp
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "internal/Base64.h"
@@ -32,7 +32,9 @@
namespace seasocks {
-static const std::string magicString("258EAFA5-E914-47DA-95CA-C5AB0DC85B11");
+namespace {
+const char* magicString = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+}
std::string getAcceptKey(const std::string& challenge) {
auto fullString = challenge + magicString;
@@ -40,8 +42,8 @@
hasher.Input(fullString.c_str(), fullString.size());
unsigned hash[5];
hasher.Result(hash);
- for (int i = 0; i < 5; ++i) {
- hash[i] = htonl(hash[i]);
+ for (unsigned int& i : hash) {
+ i = htonl(i);
}
return base64Encode(hash, sizeof(hash));
}
diff --git a/third_party/seasocks/src/main/c/HybiPacketDecoder.cpp b/third_party/seasocks/src/main/c/HybiPacketDecoder.cpp
index c2971b2..80977cd 100644
--- a/third_party/seasocks/src/main/c/HybiPacketDecoder.cpp
+++ b/third_party/seasocks/src/main/c/HybiPacketDecoder.cpp
@@ -1,68 +1,80 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "internal/HybiPacketDecoder.h"
#include "internal/LogStream.h"
#include <arpa/inet.h>
-#include <string.h>
+#include <byteswap.h>
+#include <cstring>
namespace seasocks {
-HybiPacketDecoder::HybiPacketDecoder(Logger& logger, const std::vector<uint8_t>& buffer) :
- _logger(logger),
- _buffer(buffer),
- _messageStart(0) {
+HybiPacketDecoder::HybiPacketDecoder(Logger& logger,
+ const std::vector<uint8_t>& buffer)
+ : _logger(logger),
+ _buffer(buffer),
+ _messageStart(0) {
}
-HybiPacketDecoder::MessageState HybiPacketDecoder::decodeNextMessage(std::vector<uint8_t>& messageOut) {
+HybiPacketDecoder::MessageState HybiPacketDecoder::decodeNextMessage(
+ std::vector<uint8_t>& messageOut, bool& deflateNeeded) {
if (_messageStart + 1 >= _buffer.size()) {
- return NoMessage;
+ return MessageState::NoMessage;
}
if ((_buffer[_messageStart] & 0x80) == 0) {
// FIN bit is not clear...
// TODO: support
LS_WARNING(&_logger, "Received hybi frame without FIN bit set - unsupported");
- return Error;
+ return MessageState::Error;
}
- if ((_buffer[_messageStart] & (7<<4)) != 0) {
+
+ auto reservedBits = _buffer[_messageStart] & (7 << 4);
+ if ((reservedBits & 0x30) != 0) {
LS_WARNING(&_logger, "Received hybi frame with reserved bits set - error");
- return Error;
+ return MessageState::Error;
}
- auto opcode = _buffer[_messageStart] & 0xf;
- size_t payloadLength = _buffer[_messageStart + 1] & 0x7f;
+
+ deflateNeeded = !!(reservedBits & 0x40);
+
+ auto opcode = static_cast<Opcode>(_buffer[_messageStart] & 0xf);
+ size_t payloadLength = _buffer[_messageStart + 1] & 0x7fu;
auto maskBit = _buffer[_messageStart + 1] & 0x80;
auto ptr = _messageStart + 2;
if (payloadLength == 126) {
- if (_buffer.size() < 4) { return NoMessage; }
+ if (_buffer.size() < 4) {
+ return MessageState::NoMessage;
+ }
uint16_t raw_length;
memcpy(&raw_length, &_buffer[ptr], sizeof(raw_length));
payloadLength = htons(raw_length);
ptr += 2;
} else if (payloadLength == 127) {
- if (_buffer.size() < 10) { return NoMessage; }
+ if (_buffer.size() < 10) {
+ return MessageState::NoMessage;
+ }
uint64_t raw_length;
memcpy(&raw_length, &_buffer[ptr], sizeof(raw_length));
payloadLength = __bswap_64(raw_length);
@@ -71,34 +83,41 @@
uint32_t mask = 0;
if (maskBit) {
// MASK is set.
- if (_buffer.size() < ptr + 4) { return NoMessage; }
+ if (_buffer.size() < ptr + 4) {
+ return MessageState::NoMessage;
+ }
uint32_t raw_length;
memcpy(&raw_length, &_buffer[ptr], sizeof(raw_length));
mask = htonl(raw_length);
ptr += 4;
}
auto bytesLeftInBuffer = _buffer.size() - ptr;
- if (payloadLength > bytesLeftInBuffer) { return NoMessage; }
+ if (payloadLength > bytesLeftInBuffer) {
+ return MessageState::NoMessage;
+ }
messageOut.clear();
messageOut.reserve(payloadLength);
for (auto i = 0u; i < payloadLength; ++i) {
auto byteShift = (3 - (i & 3)) * 8;
- messageOut.push_back(static_cast<char>((_buffer[ptr++] ^ (mask >> byteShift)) & 0xff));
+ messageOut.push_back(static_cast<uint8_t>((_buffer[ptr++] ^ (mask >> byteShift)) & 0xff));
}
_messageStart = ptr;
switch (opcode) {
- default:
- LS_WARNING(&_logger, "Received hybi frame with unknown opcode " << opcode);
- return Error;
- case OPCODE_TEXT:
- return TextMessage;
- case OPCODE_BINARY:
- return BinaryMessage;
- case OPCODE_PING:
- return Ping;
- case OPCODE_CLOSE:
- return Close;
+ default:
+ LS_WARNING(&_logger, "Received hybi frame with unknown opcode "
+ << static_cast<int>(opcode));
+ return MessageState::Error;
+ case Opcode::Text:
+ return MessageState::TextMessage;
+ case Opcode::Binary:
+ return MessageState::BinaryMessage;
+ case Opcode::Ping:
+ return MessageState::Ping;
+ case Opcode::Pong:
+ return MessageState::Pong;
+ case Opcode::Close:
+ return MessageState::Close;
}
}
diff --git a/third_party/seasocks/src/main/c/Logger.cpp b/third_party/seasocks/src/main/c/Logger.cpp
index 347ae30..bb69672 100644
--- a/third_party/seasocks/src/main/c/Logger.cpp
+++ b/third_party/seasocks/src/main/c/Logger.cpp
@@ -1,76 +1,78 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "internal/Debug.h"
#include "seasocks/Logger.h"
-#include <stdarg.h>
-#include <stdio.h>
+#include <cstdarg>
+#include <cstdio>
namespace seasocks {
-const int MAX_MESSAGE_LENGTH = 1024;
+constexpr int MAX_MESSAGE_LENGTH = 1024;
-#define PRINT_TO_MESSAGEBUF() \
- char messageBuf[MAX_MESSAGE_LENGTH]; \
- va_list args; \
- va_start(args, message); \
+#define PRINT_TO_MESSAGEBUF() \
+ char messageBuf[MAX_MESSAGE_LENGTH]; \
+ va_list args; \
+ va_start(args, message); \
vsnprintf(messageBuf, MAX_MESSAGE_LENGTH, message, args); \
va_end(args)
void Logger::debug(const char* message, ...) {
#ifdef LOG_DEBUG_INFO
PRINT_TO_MESSAGEBUF();
- log(DEBUG, messageBuf);
+ log(Level::Debug, messageBuf);
+#else
+ (void) message;
#endif
}
void Logger::access(const char* message, ...) {
PRINT_TO_MESSAGEBUF();
- log(ACCESS, messageBuf);
+ log(Level::Access, messageBuf);
}
void Logger::info(const char* message, ...) {
PRINT_TO_MESSAGEBUF();
- log(INFO, messageBuf);
+ log(Level::Info, messageBuf);
}
void Logger::warning(const char* message, ...) {
PRINT_TO_MESSAGEBUF();
- log(WARNING, messageBuf);
+ log(Level::Warning, messageBuf);
}
void Logger::error(const char* message, ...) {
PRINT_TO_MESSAGEBUF();
- log(ERROR, messageBuf);
+ log(Level::Error, messageBuf);
}
void Logger::severe(const char* message, ...) {
PRINT_TO_MESSAGEBUF();
- log(SEVERE, messageBuf);
+ log(Level::Severe, messageBuf);
}
-} // namespace seasocks
+} // namespace seasocks
diff --git a/third_party/seasocks/src/main/c/PageRequest.cpp b/third_party/seasocks/src/main/c/PageRequest.cpp
index a2a5313..ac59b45 100644
--- a/third_party/seasocks/src/main/c/PageRequest.cpp
+++ b/third_party/seasocks/src/main/c/PageRequest.cpp
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "internal/PageRequest.h"
@@ -31,20 +31,24 @@
namespace seasocks {
PageRequest::PageRequest(
- const sockaddr_in& remoteAddress,
- const std::string& requestUri,
- Verb verb,
- HeaderMap&& headers) :
- _credentials(std::shared_ptr<Credentials>(new Credentials())),
- _remoteAddress(remoteAddress),
- _requestUri(requestUri),
- _verb(verb),
- _headers(std::move(headers)),
- _contentLength(getIntHeader("Content-Length")) {
+ const sockaddr_in& remoteAddress,
+ const std::string& requestUri,
+ Server& server,
+ Verb verb,
+ HeaderMap&& headers)
+ : _credentials(std::make_shared<Credentials>()),
+ _remoteAddress(remoteAddress),
+ _requestUri(requestUri),
+ _server(server),
+ _verb(verb),
+ _headers(std::move(headers)),
+ _contentLength(getUintHeader("Content-Length")) {
}
bool PageRequest::consumeContent(std::vector<uint8_t>& buffer) {
- if (buffer.size() < _contentLength) return false;
+ if (buffer.size() < _contentLength) {
+ return false;
+ }
if (buffer.size() == _contentLength) {
_content.swap(buffer);
} else {
@@ -54,9 +58,16 @@
return true;
}
-int PageRequest::getIntHeader(const std::string& name) const {
- auto iter = _headers.find(name);
- return iter == _headers.end() ? 0 : atoi(iter->second.c_str());
+size_t PageRequest::getUintHeader(const std::string& name) const {
+ const auto iter = _headers.find(name);
+ if (iter == _headers.end()) {
+ return 0u;
+ }
+ const auto val = std::stoi(iter->second);
+ if (val < 0) {
+ return 0u;
+ }
+ return static_cast<size_t>(val);
}
-} // namespace seasocks
+} // namespace seasocks
diff --git a/third_party/seasocks/src/main/c/Response.cpp b/third_party/seasocks/src/main/c/Response.cpp
index 2eddfe2..1e364e5 100644
--- a/third_party/seasocks/src/main/c/Response.cpp
+++ b/third_party/seasocks/src/main/c/Response.cpp
@@ -1,34 +1,32 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "internal/ConcreteResponse.h"
#include "seasocks/Response.h"
-using namespace seasocks;
-
namespace seasocks {
std::shared_ptr<Response> Response::unhandled() {
@@ -37,27 +35,38 @@
}
std::shared_ptr<Response> Response::notFound() {
- static std::shared_ptr<Response> notFound(new ConcreteResponse(ResponseCode::NotFound, "Not found", "text/plain", Response::Headers(), false));
+ static std::shared_ptr<Response> notFound = std::make_shared<ConcreteResponse>(
+ ResponseCode::NotFound,
+ "Not found", "text/plain",
+ SynchronousResponse::Headers(), false);
return notFound;
}
-std::shared_ptr<Response> Response::error(ResponseCode code, const std::string& reason) {
- return std::shared_ptr<Response>(new ConcreteResponse(code, reason, "text/plain", Response::Headers(), false));
+std::shared_ptr<Response> Response::error(ResponseCode code, const std::string& error) {
+ return std::make_shared<ConcreteResponse>(
+ code, error, "text/plain",
+ SynchronousResponse::Headers(), false);
}
std::shared_ptr<Response> Response::textResponse(const std::string& response) {
- return std::shared_ptr<Response>(
- new ConcreteResponse(ResponseCode::Ok, response, "text/plain", Response::Headers(), true));
+ return std::make_shared<ConcreteResponse>(
+ ResponseCode::Ok,
+ response, "text/plain",
+ SynchronousResponse::Headers(), true);
}
std::shared_ptr<Response> Response::jsonResponse(const std::string& response) {
- return std::shared_ptr<Response>(
- new ConcreteResponse(ResponseCode::Ok, response, "application/json", Response::Headers(), true));
+ return std::make_shared<ConcreteResponse>(
+ ResponseCode::Ok, response,
+ "application/json",
+ SynchronousResponse::Headers(), true);
}
std::shared_ptr<Response> Response::htmlResponse(const std::string& response) {
- return std::shared_ptr<Response>(
- new ConcreteResponse(ResponseCode::Ok, response, "text/html", Response::Headers(), true));
+ return std::make_shared<ConcreteResponse>(
+ ResponseCode::Ok, response,
+ "text/html",
+ SynchronousResponse::Headers(), true);
}
}
diff --git a/third_party/seasocks/src/main/c/Server.cpp b/third_party/seasocks/src/main/c/Server.cpp
index 5ad1c30..4908b90 100644
--- a/third_party/seasocks/src/main/c/Server.cpp
+++ b/third_party/seasocks/src/main/c/Server.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -23,6 +23,7 @@
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
+#include "internal/Config.h"
#include "internal/LogStream.h"
#include "seasocks/Connection.h"
@@ -40,23 +41,34 @@
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/syscall.h>
+#include <sys/un.h>
#include <memory>
#include <stdexcept>
-#include <string.h>
+#include <cstring>
#include <unistd.h>
namespace {
struct EventBits {
uint32_t bits;
- explicit EventBits(uint32_t bits) : bits(bits) {}
+ explicit EventBits(uint32_t b)
+ : bits(b) {
+ }
};
-std::ostream& operator <<(std::ostream& o, const EventBits& b) {
+std::ostream& operator<<(std::ostream& o, const EventBits& b) {
uint32_t bits = b.bits;
-#define DO_BIT(NAME) \
- do { if (bits & (NAME)) { if (bits != b.bits) {o << ", "; } o << #NAME; bits &= ~(NAME); } } while (0)
+#define DO_BIT(NAME) \
+ do { \
+ if (bits & (NAME)) { \
+ if (bits != b.bits) { \
+ o << ", "; \
+ } \
+ o << #NAME; \
+ bits &= ~(NAME); \
+ } \
+ } while (0)
DO_BIT(EPOLLIN);
DO_BIT(EPOLLPRI);
DO_BIT(EPOLLOUT);
@@ -76,22 +88,25 @@
return o;
}
-const int EpollTimeoutMillis = 500; // Twice a second is ample.
-const int DefaultLameConnectionTimeoutSeconds = 10;
-int gettid() {
- return syscall(SYS_gettid);
+constexpr int EpollTimeoutMillis = 500; // Twice a second is ample.
+constexpr int DefaultLameConnectionTimeoutSeconds = 10;
+pid_t gettid() {
+ return static_cast<pid_t>(syscall(SYS_gettid));
}
}
namespace seasocks {
+constexpr size_t Server::DefaultClientBufferSize;
+
Server::Server(std::shared_ptr<Logger> logger)
-: _logger(logger), _listenSock(-1), _epollFd(-1), _eventFd(-1),
- _maxKeepAliveDrops(0),
- _lameConnectionTimeoutSeconds(DefaultLameConnectionTimeoutSeconds),
- _nextDeadConnectionCheck(0), _threadId(0), _terminate(false),
- _expectedTerminate(false) {
+ : _logger(logger), _listenSock(-1), _epollFd(-1), _eventFd(-1),
+ _maxKeepAliveDrops(0),
+ _lameConnectionTimeoutSeconds(DefaultLameConnectionTimeoutSeconds),
+ _clientBufferSize(DefaultClientBufferSize),
+ _nextDeadConnectionCheck(0), _threadId(0), _terminate(false),
+ _expectedTerminate(false) {
_epollFd = epoll_create(10);
if (_epollFd == -1) {
@@ -105,7 +120,7 @@
return;
}
- epoll_event eventWake = { EPOLLIN, { &_eventFd } };
+ epoll_event eventWake = {EPOLLIN, {&_eventFd}};
if (epoll_ctl(_epollFd, EPOLL_CTL_ADD, _eventFd, &eventWake) == -1) {
LS_ERROR(_logger, "Unable to add wake socket to epoll: " << getLastError());
return;
@@ -192,12 +207,17 @@
return startListening(INADDR_ANY, port);
}
-bool Server::startListening(uint32_t hostAddr, int port) {
+bool Server::startListening(uint32_t ipInHostOrder, int port) {
if (_epollFd == -1 || _eventFd == -1) {
LS_ERROR(_logger, "Unable to serve, did not initialize properly.");
return false;
}
+ auto port16 = static_cast<uint16_t>(port);
+ if (port != port16) {
+ LS_ERROR(_logger, "Invalid port: " << port);
+ return false;
+ }
_listenSock = socket(AF_INET, SOCK_STREAM, 0);
if (_listenSock == -1) {
LS_ERROR(_logger, "Unable to create listen socket: " << getLastError());
@@ -208,8 +228,8 @@
}
sockaddr_in sock;
memset(&sock, 0, sizeof(sock));
- sock.sin_port = htons(port);
- sock.sin_addr.s_addr = htonl(hostAddr);
+ sock.sin_port = htons(port16);
+ sock.sin_addr.s_addr = htonl(ipInHostOrder);
sock.sin_family = AF_INET;
if (bind(_listenSock, reinterpret_cast<const sockaddr*>(&sock), sizeof(sock)) == -1) {
LS_ERROR(_logger, "Unable to bind socket: " << getLastError());
@@ -219,7 +239,7 @@
LS_ERROR(_logger, "Unable to listen on socket: " << getLastError());
return false;
}
- epoll_event event = { EPOLLIN, { this } };
+ epoll_event event = {EPOLLIN, {this}};
if (epoll_ctl(_epollFd, EPOLL_CTL_ADD, _listenSock, &event) == -1) {
LS_ERROR(_logger, "Unable to add listen socket to epoll: " << getLastError());
return false;
@@ -232,6 +252,43 @@
return true;
}
+bool Server::startListeningUnix(const char* socketPath) {
+ struct sockaddr_un sock;
+
+ _listenSock = socket(AF_UNIX, SOCK_STREAM, 0);
+ if (_listenSock == -1) {
+ LS_ERROR(_logger, "Unable to create unix listen socket: " << getLastError());
+ return false;
+ }
+ if (!configureSocket(_listenSock)) {
+ return false;
+ }
+
+ memset(&sock, 0, sizeof(struct sockaddr_un));
+ sock.sun_family = AF_UNIX;
+ strncpy(sock.sun_path, socketPath, sizeof(sock.sun_path) - 1);
+
+ if (bind(_listenSock, reinterpret_cast<const sockaddr*>(&sock), sizeof(sock)) == -1) {
+ LS_ERROR(_logger, "Unable to bind unix socket (" << socketPath << "): " << getLastError());
+ return false;
+ }
+
+ if (listen(_listenSock, 5) == -1) {
+ LS_ERROR(_logger, "Unable to listen on unix socket: " << getLastError());
+ return false;
+ }
+
+ epoll_event event = {EPOLLIN, {this}};
+ if (epoll_ctl(_epollFd, EPOLL_CTL_ADD, _listenSock, &event) == -1) {
+ LS_ERROR(_logger, "Unable to add unix listen socket to epoll: " << getLastError());
+ return false;
+ }
+
+ LS_INFO(_logger, "Listening on unix socket: http://unix:" << socketPath);
+
+ return true;
+}
+
void Server::handlePipe() {
uint64_t dummy;
while (::read(_eventFd, &dummy, sizeof(dummy)) != -1) {
@@ -245,18 +302,18 @@
}
Server::NewState Server::handleConnectionEvents(Connection* connection, uint32_t events) {
- if (events & ~(EPOLLIN|EPOLLOUT|EPOLLHUP|EPOLLERR)) {
+ if (events & ~(EPOLLIN | EPOLLOUT | EPOLLHUP | EPOLLERR)) {
LS_WARNING(_logger, "Got unhandled epoll event (" << EventBits(events) << ") on connection: "
- << formatAddress(connection->getRemoteAddress()));
- return Close;
+ << formatAddress(connection->getRemoteAddress()));
+ return NewState::Close;
} else if (events & EPOLLERR) {
LS_INFO(_logger, "Error on socket (" << EventBits(events) << "): "
- << formatAddress(connection->getRemoteAddress()));
- return Close;
+ << formatAddress(connection->getRemoteAddress()));
+ return NewState::Close;
} else if (events & EPOLLHUP) {
LS_DEBUG(_logger, "Graceful hang-up (" << EventBits(events) << ") of socket: "
- << formatAddress(connection->getRemoteAddress()));
- return Close;
+ << formatAddress(connection->getRemoteAddress()));
+ return NewState::Close;
} else {
if (events & EPOLLOUT) {
connection->handleDataReadyForWrite();
@@ -265,11 +322,11 @@
connection->handleDataReadyForRead();
}
}
- return KeepOpen;
+ return NewState::KeepOpen;
}
void Server::checkAndDispatchEpoll(int epollMillis) {
- const int maxEvents = 256;
+ constexpr int maxEvents = 256;
epoll_event events[maxEvents];
std::list<Connection*> toBeDeleted;
@@ -282,10 +339,10 @@
}
if (numEvents == maxEvents) {
static time_t lastWarnTime = 0;
- time_t now = time(NULL);
+ time_t now = time(nullptr);
if (now - lastWarnTime >= 60) {
LS_WARNING(_logger, "Full event queue; may start starving connections. "
- "Will warn at most once a minute");
+ "Will warn at most once a minute");
lastWarnTime = now;
}
}
@@ -293,7 +350,7 @@
if (events[i].data.ptr == this) {
if (events[i].events & ~EPOLLIN) {
LS_SEVERE(_logger, "Got unexpected event on listening socket ("
- << EventBits(events[i].events) << ") - terminating");
+ << EventBits(events[i].events) << ") - terminating");
_terminate = true;
break;
}
@@ -301,25 +358,24 @@
} else if (events[i].data.ptr == &_eventFd) {
if (events[i].events & ~EPOLLIN) {
LS_SEVERE(_logger, "Got unexpected event on management pipe ("
- << EventBits(events[i].events) << ") - terminating");
+ << EventBits(events[i].events) << ") - terminating");
_terminate = true;
break;
}
handlePipe();
} else {
auto connection = reinterpret_cast<Connection*>(events[i].data.ptr);
- if (handleConnectionEvents(connection, events[i].events) == Close) {
+ if (handleConnectionEvents(connection, events[i].events) == NewState::Close) {
toBeDeleted.push_back(connection);
}
}
}
// The connections are all deleted at the end so we've processed any other subject's
// closes etc before we call onDisconnect().
- for (auto it = toBeDeleted.begin(); it != toBeDeleted.end(); ++it) {
- auto connection = *it;
+ for (auto connection : toBeDeleted) {
if (_connections.find(connection) == _connections.end()) {
- LS_SEVERE(_logger, "Attempt to delete connection we didn't know about: " << (void*)connection
- << formatAddress(connection->getRemoteAddress()));
+ LS_SEVERE(_logger, "Attempt to delete connection we didn't know about: " << (void*) connection
+ << formatAddress(connection->getRemoteAddress()));
_terminate = true;
break;
}
@@ -365,7 +421,8 @@
Server::PollResult Server::poll(int millis) {
// Grab the thread ID on the first poll.
- if (_threadId == 0) _threadId = gettid();
+ if (_threadId == 0)
+ _threadId = gettid();
if (_threadId != gettid()) {
LS_ERROR(_logger, "poll() called from the wrong thread");
return PollResult::Error;
@@ -376,7 +433,8 @@
}
processEventQueue();
checkAndDispatchEpoll(millis);
- if (!_terminate) return PollResult::Continue;
+ if (!_terminate)
+ return PollResult::Continue;
// Reasonable effort to ensure anything enqueued during terminate has a chance to run.
processEventQueue();
@@ -387,35 +445,41 @@
}
void Server::processEventQueue() {
- for (;;) {
- std::shared_ptr<Runnable> runnable = popNextRunnable();
- if (!runnable) break;
- runnable->run();
- }
- time_t now = time(NULL);
- if (now >= _nextDeadConnectionCheck) {
- std::list<Connection*> toRemove;
- for (auto it = _connections.cbegin(); it != _connections.cend(); ++it) {
- time_t numSecondsSinceConnection = now - it->second;
- auto connection = it->first;
- if (connection->bytesReceived() == 0 && numSecondsSinceConnection >= _lameConnectionTimeoutSeconds) {
- LS_INFO(_logger, formatAddress(connection->getRemoteAddress())
- << " : Killing lame connection - no bytes received after " << numSecondsSinceConnection << "s");
- toRemove.push_back(connection);
- }
- }
- for (auto it = toRemove.begin(); it != toRemove.end(); ++it) {
- delete *it;
+ runExecutables();
+ time_t now = time(nullptr);
+ if (now < _nextDeadConnectionCheck)
+ return;
+ std::list<Connection*> toRemove;
+ for (auto _connection : _connections) {
+ time_t numSecondsSinceConnection = now - _connection.second;
+ auto connection = _connection.first;
+ if (connection->bytesReceived() == 0 && numSecondsSinceConnection >= _lameConnectionTimeoutSeconds) {
+ LS_INFO(_logger, formatAddress(connection->getRemoteAddress())
+ << " : Killing lame connection - no bytes received after "
+ << numSecondsSinceConnection << "s");
+ toRemove.push_back(connection);
}
}
+ for (auto& it : toRemove) {
+ delete it;
+ }
+}
+
+void Server::runExecutables() {
+ decltype(_pendingExecutables) copy;
+ std::unique_lock<decltype(_pendingExecutableMutex)> lock(_pendingExecutableMutex);
+ copy.swap(_pendingExecutables);
+ lock.unlock();
+ for (auto&& ex : copy)
+ ex();
}
void Server::handleAccept() {
sockaddr_in address;
socklen_t addrLen = sizeof(address);
int fd = ::accept(_listenSock,
- reinterpret_cast<sockaddr*>(&address),
- &addrLen);
+ reinterpret_cast<sockaddr*>(&address),
+ &addrLen);
if (fd == -1) {
LS_ERROR(_logger, "Unable to accept: " << getLastError());
return;
@@ -426,19 +490,19 @@
}
LS_INFO(_logger, formatAddress(address) << " : Accepted on descriptor " << fd);
Connection* newConnection = new Connection(_logger, *this, fd, address);
- epoll_event event = { EPOLLIN, { newConnection } };
+ epoll_event event = {EPOLLIN, {newConnection}};
if (epoll_ctl(_epollFd, EPOLL_CTL_ADD, fd, &event) == -1) {
LS_ERROR(_logger, "Unable to add socket to epoll: " << getLastError());
delete newConnection;
::close(fd);
return;
}
- _connections.insert(std::make_pair(newConnection, time(NULL)));
+ _connections.insert(std::make_pair(newConnection, time(nullptr)));
}
void Server::remove(Connection* connection) {
checkThread();
- epoll_event event = { 0, { connection } };
+ epoll_event event = {0, {connection}};
if (epoll_ctl(_epollFd, EPOLL_CTL_DEL, connection->getFd(), &event) == -1) {
LS_ERROR(_logger, "Unable to remove from epoll: " << getLastError());
}
@@ -446,7 +510,7 @@
}
bool Server::subscribeToWriteEvents(Connection* connection) {
- epoll_event event = { EPOLLIN | EPOLLOUT, { connection } };
+ epoll_event event = {EPOLLIN | EPOLLOUT, {connection}};
if (epoll_ctl(_epollFd, EPOLL_CTL_MOD, connection->getFd(), &event) == -1) {
LS_ERROR(_logger, "Unable to subscribe to write events: " << getLastError());
return false;
@@ -455,7 +519,7 @@
}
bool Server::unsubscribeFromWriteEvents(Connection* connection) {
- epoll_event event = { EPOLLIN, { connection } };
+ epoll_event event = {EPOLLIN, {connection}};
if (epoll_ctl(_epollFd, EPOLL_CTL_MOD, connection->getFd(), &event) == -1) {
LS_ERROR(_logger, "Unable to unsubscribe from write events: " << getLastError());
return false;
@@ -464,15 +528,15 @@
}
void Server::addWebSocketHandler(const char* endpoint, std::shared_ptr<WebSocket::Handler> handler,
- bool allowCrossOriginRequests) {
- _webSocketHandlerMap[endpoint] = { handler, allowCrossOriginRequests };
+ bool allowCrossOriginRequests) {
+ _webSocketHandlerMap[endpoint] = {handler, allowCrossOriginRequests};
}
void Server::addPageHandler(std::shared_ptr<PageHandler> handler) {
_pageHandlers.emplace_back(handler);
}
-bool Server::isCrossOriginAllowed(const std::string &endpoint) const {
+bool Server::isCrossOriginAllowed(const std::string& endpoint) const {
auto splits = split(endpoint, '?');
auto iter = _webSocketHandlerMap.find(splits[0]);
if (iter == _webSocketHandlerMap.end()) {
@@ -491,8 +555,12 @@
}
void Server::execute(std::shared_ptr<Runnable> runnable) {
- std::unique_lock<decltype(_pendingRunnableMutex)> lock(_pendingRunnableMutex);
- _pendingRunnables.push_back(runnable);
+ execute([runnable] { runnable->run(); });
+}
+
+void Server::execute(std::function<void()> toExecute) {
+ std::unique_lock<decltype(_pendingExecutableMutex)> lock(_pendingExecutableMutex);
+ _pendingExecutables.emplace_back(std::move(toExecute));
lock.unlock();
uint64_t one = 1;
@@ -503,36 +571,24 @@
}
}
-std::shared_ptr<Server::Runnable> Server::popNextRunnable() {
- std::lock_guard<decltype(_pendingRunnableMutex)> lock(_pendingRunnableMutex);
- std::shared_ptr<Runnable> runnable;
- if (!_pendingRunnables.empty()) {
- runnable = _pendingRunnables.front();
- _pendingRunnables.pop_front();
- }
- return runnable;
-}
-
std::string Server::getStatsDocument() const {
std::ostringstream doc;
- doc << "clear();" << std::endl;
- for (auto it = _connections.begin(); it != _connections.end(); ++it) {
+ doc << "clear();\n";
+ for (auto _connection : _connections) {
doc << "connection({";
- auto connection = it->first;
+ auto connection = _connection.first;
jsonKeyPairToStream(doc,
- "since", EpochTimeAsLocal(it->second),
- "fd", connection->getFd(),
- "id", reinterpret_cast<uint64_t>(connection),
- "uri", connection->getRequestUri(),
- "addr", formatAddress(connection->getRemoteAddress()),
- "user", connection->credentials() ?
- connection->credentials()->username : "(not authed)",
- "input", connection->inputBufferSize(),
- "read", connection->bytesReceived(),
- "output", connection->outputBufferSize(),
- "written", connection->bytesSent()
- );
- doc << "});" << std::endl;
+ "since", EpochTimeAsLocal(_connection.second),
+ "fd", connection->getFd(),
+ "id", reinterpret_cast<uint64_t>(connection),
+ "uri", connection->getRequestUri(),
+ "addr", formatAddress(connection->getRemoteAddress()),
+ "user", connection->credentials() ? connection->credentials()->username : "(not authed)",
+ "input", connection->inputBufferSize(),
+ "read", connection->bytesReceived(),
+ "output", connection->outputBufferSize(),
+ "written", connection->bytesSent());
+ doc << "});\n";
}
return doc.str();
}
@@ -547,6 +603,15 @@
_maxKeepAliveDrops = maxKeepAliveDrops;
}
+void Server::setPerMessageDeflateEnabled(bool enabled) {
+ if (!Config::deflateEnabled) {
+ LS_ERROR(_logger, "Ignoring request to enable deflate as Seasocks was compiled without support");
+ return;
+ }
+ LS_INFO(_logger, "Setting per-message deflate to " << (enabled ? "enabled" : "disabled"));
+ _perMessageDeflateEnabled = enabled;
+}
+
void Server::checkThread() const {
auto thisTid = gettid();
if (thisTid != _threadId) {
@@ -557,12 +622,18 @@
}
}
-std::shared_ptr<Response> Server::handle(const Request &request) {
- for (auto handler : _pageHandlers) {
+std::shared_ptr<Response> Server::handle(const Request& request) {
+ for (const auto& handler : _pageHandlers) {
auto result = handler->handle(request);
- if (result != Response::unhandled()) return result;
+ if (result != Response::unhandled())
+ return result;
}
return Response::unhandled();
}
-} // namespace seasocks
+void Server::setClientBufferSize(size_t bytesToBuffer) {
+ LS_INFO(_logger, "Setting client buffer size to " << bytesToBuffer << " bytes");
+ _clientBufferSize = bytesToBuffer;
+}
+
+} // namespace seasocks
diff --git a/third_party/seasocks/src/main/c/StringUtil.cpp b/third_party/seasocks/src/main/c/StringUtil.cpp
index b7177ce..958caef 100644
--- a/third_party/seasocks/src/main/c/StringUtil.cpp
+++ b/third_party/seasocks/src/main/c/StringUtil.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,8 @@
namespace seasocks {
char* skipWhitespace(char* str) {
- while (isspace(*str)) ++str;
+ while (isspace(*str))
+ ++str;
return str;
}
@@ -46,13 +47,13 @@
}
char* shift(char*& str) {
- if (str == NULL) {
- return NULL;
+ if (str == nullptr) {
+ return nullptr;
}
char* startOfWord = skipWhitespace(str);
if (*startOfWord == 0) {
str = startOfWord;
- return NULL;
+ return nullptr;
}
char* endOfWord = skipNonWhitespace(startOfWord);
if (*endOfWord != 0) {
@@ -62,9 +63,21 @@
return startOfWord;
}
-std::string getLastError(){
+std::string trimWhitespace(const std::string& str) {
+ auto* start = str.c_str();
+ while (isspace(*start))
+ ++start;
+ auto* end = &str.back();
+ while (end >= start && isspace(*end))
+ --end;
+ return std::string(start, end - start + 1);
+}
+
+std::string getLastError() {
char errbuf[1024];
- return strerror_r(errno, errbuf, sizeof(errbuf));
+ const auto ignore = strerror_r(errno, errbuf, sizeof(errbuf));
+ static_cast<void>(ignore);
+ return errbuf;
}
std::string formatAddress(const sockaddr_in& address) {
@@ -80,7 +93,8 @@
}
std::vector<std::string> split(const std::string& input, char splitChar) {
- if (input.empty()) return std::vector<std::string>();
+ if (input.empty())
+ return std::vector<std::string>();
std::vector<std::string> result;
size_t pos = 0;
size_t newPos;
@@ -92,7 +106,12 @@
return result;
}
-void replace(std::string& string, const std::string& find, const std::string& replace) {
+void replace(std::string& string, const std::string& find,
+ const std::string& replace) {
+ if (find.empty()) {
+ return;
+ }
+
size_t pos = 0;
const size_t findLen = find.length();
const size_t replaceLen = replace.length();
@@ -102,8 +121,21 @@
}
}
-bool caseInsensitiveSame(const std::string &lhs, const std::string &rhs) {
+bool caseInsensitiveSame(const std::string& lhs, const std::string& rhs) {
return strcasecmp(lhs.c_str(), rhs.c_str()) == 0;
}
+std::string webtime(time_t time) {
+ struct tm timeValue;
+ gmtime_r(&time, &timeValue);
+ char buf[1024];
+ // Wed, 20 Apr 2011 17:31:28 GMT
+ strftime(buf, sizeof(buf) - 1, "%a, %d %b %Y %H:%M:%S %Z", &timeValue);
+ return buf;
+}
+
+std::string now() {
+ return webtime(time(nullptr));
+}
+
}
diff --git a/third_party/seasocks/src/main/c/internal/.gitignore b/third_party/seasocks/src/main/c/internal/.gitignore
deleted file mode 100644
index 672ffc0..0000000
--- a/third_party/seasocks/src/main/c/internal/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-#/Config.h
diff --git a/third_party/seasocks/src/main/c/internal/Base64.cpp b/third_party/seasocks/src/main/c/internal/Base64.cpp
index 3b1cf20..6d6cfdd 100644
--- a/third_party/seasocks/src/main/c/internal/Base64.cpp
+++ b/third_party/seasocks/src/main/c/internal/Base64.cpp
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "internal/Base64.h"
@@ -28,17 +28,18 @@
#include <cstdint>
namespace seasocks {
+namespace {
+const char cb64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+}
-const char cb64[]="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-std::string base64Encode(const void* dataVoid, size_t length) {
+std::string base64Encode(const void* data, size_t length) {
std::string output;
- auto data = reinterpret_cast<const uint8_t*>(dataVoid);
+ const auto dataPtr = reinterpret_cast<const uint8_t*>(data);
for (auto i = 0u; i < length; i += 3) {
- auto bytesLeft = length - i;
- auto b0 = data[i];
- auto b1 = bytesLeft > 1 ? data[i + 1] : 0;
- auto b2 = bytesLeft > 2 ? data[i + 2] : 0;
+ const auto bytesLeft = length - i;
+ const auto b0 = dataPtr[i];
+ const auto b1 = bytesLeft > 1 ? dataPtr[i + 1] : 0;
+ const auto b2 = bytesLeft > 2 ? dataPtr[i + 2] : 0;
output.push_back(cb64[b0 >> 2]);
output.push_back(cb64[((b0 & 0x03) << 4) | ((b1 & 0xf0) >> 4)]);
output.push_back((bytesLeft > 1 ? cb64[((b1 & 0x0f) << 2) | ((b2 & 0xc0) >> 6)] : '='));
diff --git a/third_party/seasocks/src/main/c/internal/Base64.h b/third_party/seasocks/src/main/c/internal/Base64.h
index b6dc014..1ea578e 100644
--- a/third_party/seasocks/src/main/c/internal/Base64.h
+++ b/third_party/seasocks/src/main/c/internal/Base64.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
diff --git a/third_party/seasocks/src/main/c/internal/ConcreteResponse.h b/third_party/seasocks/src/main/c/internal/ConcreteResponse.h
index d4a68b3..cf56187 100644
--- a/third_party/seasocks/src/main/c/internal/ConcreteResponse.h
+++ b/third_party/seasocks/src/main/c/internal/ConcreteResponse.h
@@ -1,65 +1,69 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
-#include "seasocks/Response.h"
+#include "seasocks/SynchronousResponse.h"
namespace seasocks {
-class ConcreteResponse : public Response {
+class ConcreteResponse : public SynchronousResponse {
ResponseCode _responseCode;
const std::string _payload;
const std::string _contentType;
const Headers _headers;
const bool _keepAlive;
-public:
- ConcreteResponse(ResponseCode responseCode, const std::string& payload, const std::string& contentType, const Headers& headers, bool keepAlive) :
- _responseCode(responseCode), _payload(payload), _contentType(contentType), _headers(headers), _keepAlive(keepAlive) {}
- virtual ResponseCode responseCode() const {
+public:
+ ConcreteResponse(ResponseCode responseCode, const std::string& payload,
+ const std::string& contentType, const Headers& headers, bool keepAlive)
+ : _responseCode(responseCode), _payload(payload), _contentType(contentType),
+ _headers(headers), _keepAlive(keepAlive) {
+ }
+
+ virtual ResponseCode responseCode() const override {
return _responseCode;
}
- virtual const char* payload() const {
+ virtual const char* payload() const override {
return _payload.c_str();
}
- virtual size_t payloadSize() const {
+ virtual size_t payloadSize() const override {
return _payload.size();
}
- virtual bool keepConnectionAlive() const {
+ virtual bool keepConnectionAlive() const override {
return _keepAlive;
}
- virtual std::string contentType() const {
+ virtual std::string contentType() const override {
return _contentType;
}
- virtual Headers getAdditionalHeaders() const {
+ virtual Headers getAdditionalHeaders() const override {
return _headers;
}
};
diff --git a/third_party/seasocks/src/main/c/internal/Config.h b/third_party/seasocks/src/main/c/internal/Config.h
index 71adecd..b9715c2 100644
--- a/third_party/seasocks/src/main/c/internal/Config.h
+++ b/third_party/seasocks/src/main/c/internal/Config.h
@@ -1,213 +1,11 @@
-/* src/main/c/internal/Config.h. Generated from Config.h.in by configure. */
-/* src/main/c/internal/Config.h.in. Generated from configure.ac by autoheader. */
+#pragma once
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
+namespace seasocks {
-/* define if the compiler supports basic C++11 syntax */
-/* #undef HAVE_CXX11 */
+ struct Config {
+ static constexpr auto version = "1.4.1";
+ static constexpr bool deflateEnabled = false;
+ };
-/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
- don't. */
-#define HAVE_DECL_STRERROR_R 1
+}
-/* Define to 1 if you have the `dup2' function. */
-#define HAVE_DUP2 1
-
-/* Define to 1 if you have the `eventfd' function. */
-#define HAVE_EVENTFD 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `fork' function. */
-#define HAVE_FORK 1
-
-/* Define to 1 if you have the `gethostname' function. */
-#define HAVE_GETHOSTNAME 1
-
-/* Define to 1 if you have the `getopt' function. */
-#define HAVE_GETOPT 1
-
-/* Define to 1 if you have the <getopt.h> header file. */
-#define HAVE_GETOPT_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
-
-/* Define to 1 if the system has the type `ptrdiff_t'. */
-#define HAVE_PTRDIFF_T 1
-
-/* Define to 1 if you have the `rmdir' function. */
-#define HAVE_RMDIR 1
-
-/* Define to 1 if you have the `socket' function. */
-#define HAVE_SOCKET 1
-
-/* Define to 1 if you have the `sqrt' function. */
-#define HAVE_SQRT 1
-
-/* Define to 1 if stdbool.h conforms to C99. */
-#define HAVE_STDBOOL_H 1
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#define HAVE_STRCASECMP 1
-
-/* Define to 1 if you have the `strchr' function. */
-#define HAVE_STRCHR 1
-
-/* Define to 1 if you have the `strdup' function. */
-#define HAVE_STRDUP 1
-
-/* Define to 1 if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
-/* Define to 1 if you have the `strerror_r' function. */
-#define HAVE_STRERROR_R 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `syscall' function. */
-#define HAVE_SYSCALL 1
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* define if unordered_map supports emplace */
-#define HAVE_UNORDERED_MAP_EMPLACE 1
-
-/* Define to 1 if you have the `vfork' function. */
-#define HAVE_VFORK 1
-
-/* Define to 1 if you have the <vfork.h> header file. */
-/* #undef HAVE_VFORK_H */
-
-/* Define to 1 if `fork' works. */
-#define HAVE_WORKING_FORK 1
-
-/* Define to 1 if `vfork' works. */
-#define HAVE_WORKING_VFORK 1
-
-/* Define to 1 if the system has the type `_Bool'. */
-/* #undef HAVE__BOOL */
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "matt@godbolt.org"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "SeaSocks"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "SeaSocks 0.1"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "seasocks"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL "https://github.com/mattgodbolt/seasocks"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.1"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if strerror_r returns char *. */
-#define STRERROR_R_CHAR_P 1
-
-/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
- <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
- #define below would cause a syntax error. */
-/* #undef _UINT32_T */
-
-/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
- <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
- #define below would cause a syntax error. */
-/* #undef _UINT64_T */
-
-/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
- <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
- #define below would cause a syntax error. */
-/* #undef _UINT8_T */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef pid_t */
-
-/* Define to the equivalent of the C99 'restrict' keyword, or to
- nothing if this is not supported. Do not define if restrict is
- supported directly. */
-#define restrict __restrict
-/* Work around a bug in Sun C++: it does not support _Restrict or
- __restrict__, even though the corresponding Sun C compiler ends up with
- "#define restrict _Restrict" or "#define restrict __restrict__" in the
- previous line. Perhaps some future version of Sun C++ will work with
- restrict; if so, hopefully it defines __RESTRICT like Sun C does. */
-#if defined __SUNPRO_CC && !defined __RESTRICT
-# define _Restrict
-# define __restrict__
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to the type of an unsigned integer type of width exactly 16 bits if
- such a type exists and the standard includes do not define it. */
-/* #undef uint16_t */
-
-/* Define to the type of an unsigned integer type of width exactly 32 bits if
- such a type exists and the standard includes do not define it. */
-/* #undef uint32_t */
-
-/* Define to the type of an unsigned integer type of width exactly 64 bits if
- such a type exists and the standard includes do not define it. */
-/* #undef uint64_t */
-
-/* Define to the type of an unsigned integer type of width exactly 8 bits if
- such a type exists and the standard includes do not define it. */
-/* #undef uint8_t */
-
-/* Define as `fork' if `vfork' does not work. */
-/* #undef vfork */
diff --git a/third_party/seasocks/src/main/c/internal/Config.h.in b/third_party/seasocks/src/main/c/internal/Config.h.in
deleted file mode 100644
index 48c5421..0000000
--- a/third_party/seasocks/src/main/c/internal/Config.h.in
+++ /dev/null
@@ -1,219 +0,0 @@
-/* src/main/c/internal/Config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#undef HAVE_ARPA_INET_H
-
-/* define if the compiler supports basic C++11 syntax */
-#undef HAVE_CXX11
-
-/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
- don't. */
-#undef HAVE_DECL_STRERROR_R
-
-/* Define to 1 if you have the `dup2' function. */
-#undef HAVE_DUP2
-
-/* Define to 1 if you have the `eventfd' function. */
-#undef HAVE_EVENTFD
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define to 1 if you have the `fork' function. */
-#undef HAVE_FORK
-
-/* Define to 1 if you have the `gethostname' function. */
-#undef HAVE_GETHOSTNAME
-
-/* Define to 1 if you have the `getopt' function. */
-#undef HAVE_GETOPT
-
-/* Define to 1 if you have the <getopt.h> header file. */
-#undef HAVE_GETOPT_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
- to 0 otherwise. */
-#undef HAVE_MALLOC
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#undef HAVE_NETINET_IN_H
-
-/* Define to 1 if the system has the type `ptrdiff_t'. */
-#undef HAVE_PTRDIFF_T
-
-/* Define to 1 if you have the `rmdir' function. */
-#undef HAVE_RMDIR
-
-/* Define to 1 if you have the `socket' function. */
-#undef HAVE_SOCKET
-
-/* Define to 1 if you have the `sqrt' function. */
-#undef HAVE_SQRT
-
-/* Define to 1 if stdbool.h conforms to C99. */
-#undef HAVE_STDBOOL_H
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#undef HAVE_STDDEF_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
-/* Define to 1 if you have the `strerror_r' function. */
-#undef HAVE_STRERROR_R
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `syscall' function. */
-#undef HAVE_SYSCALL
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#undef HAVE_SYS_IOCTL_H
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* define if unordered_map supports emplace */
-#undef HAVE_UNORDERED_MAP_EMPLACE
-
-/* Define to 1 if you have the `vfork' function. */
-#undef HAVE_VFORK
-
-/* Define to 1 if you have the <vfork.h> header file. */
-#undef HAVE_VFORK_H
-
-/* Define to 1 if `fork' works. */
-#undef HAVE_WORKING_FORK
-
-/* Define to 1 if `vfork' works. */
-#undef HAVE_WORKING_VFORK
-
-/* Define to 1 if the system has the type `_Bool'. */
-#undef HAVE__BOOL
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if strerror_r returns char *. */
-#undef STRERROR_R_CHAR_P
-
-/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
- <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
- #define below would cause a syntax error. */
-#undef _UINT32_T
-
-/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
- <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
- #define below would cause a syntax error. */
-#undef _UINT64_T
-
-/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
- <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
- #define below would cause a syntax error. */
-#undef _UINT8_T
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to rpl_malloc if the replacement function should be used. */
-#undef malloc
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
-
-/* Define to the equivalent of the C99 'restrict' keyword, or to
- nothing if this is not supported. Do not define if restrict is
- supported directly. */
-#undef restrict
-/* Work around a bug in Sun C++: it does not support _Restrict or
- __restrict__, even though the corresponding Sun C compiler ends up with
- "#define restrict _Restrict" or "#define restrict __restrict__" in the
- previous line. Perhaps some future version of Sun C++ will work with
- restrict; if so, hopefully it defines __RESTRICT like Sun C does. */
-#if defined __SUNPRO_CC && !defined __RESTRICT
-# define _Restrict
-# define __restrict__
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
-
-/* Define to the type of an unsigned integer type of width exactly 16 bits if
- such a type exists and the standard includes do not define it. */
-#undef uint16_t
-
-/* Define to the type of an unsigned integer type of width exactly 32 bits if
- such a type exists and the standard includes do not define it. */
-#undef uint32_t
-
-/* Define to the type of an unsigned integer type of width exactly 64 bits if
- such a type exists and the standard includes do not define it. */
-#undef uint64_t
-
-/* Define to the type of an unsigned integer type of width exactly 8 bits if
- such a type exists and the standard includes do not define it. */
-#undef uint8_t
-
-/* Define as `fork' if `vfork' does not work. */
-#undef vfork
diff --git a/third_party/seasocks/src/main/c/internal/Debug.h b/third_party/seasocks/src/main/c/internal/Debug.h
index 304e141..731029d 100644
--- a/third_party/seasocks/src/main/c/internal/Debug.h
+++ b/third_party/seasocks/src/main/c/internal/Debug.h
@@ -1,29 +1,29 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
-// Uncomment to actually log at DEBUG level.
+// Uncomment to actually log at Debug level.
//#define LOG_DEBUG_INFO
diff --git a/third_party/seasocks/src/main/c/internal/Embedded.h b/third_party/seasocks/src/main/c/internal/Embedded.h
index 5741c62..e53b3ca 100644
--- a/third_party/seasocks/src/main/c/internal/Embedded.h
+++ b/third_party/seasocks/src/main/c/internal/Embedded.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
@@ -28,8 +28,8 @@
#include <string>
struct EmbeddedContent {
- const char* data;
- size_t length;
+ const char* data;
+ size_t length;
};
const EmbeddedContent* findEmbeddedContent(const std::string& name);
diff --git a/third_party/seasocks/src/main/c/internal/HeaderMap.h b/third_party/seasocks/src/main/c/internal/HeaderMap.h
index ba5ed35..33e233d 100644
--- a/third_party/seasocks/src/main/c/internal/HeaderMap.h
+++ b/third_party/seasocks/src/main/c/internal/HeaderMap.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -33,9 +33,9 @@
namespace seasocks {
struct CaseInsensitiveHash {
- size_t operator()(const std::string &string) const {
+ size_t operator()(const std::string& string) const {
size_t h = 0;
- for (auto c: string) {
+ for (auto c : string) {
h = h * 13 + tolower(c);
}
return h;
@@ -43,12 +43,12 @@
};
struct CaseInsensitiveComparison {
- bool operator()(const std::string &lhs, const std::string &rhs) const {
+ bool operator()(const std::string& lhs, const std::string& rhs) const {
return strcasecmp(lhs.c_str(), rhs.c_str()) == 0;
}
};
using HeaderMap = std::unordered_map<std::string, std::string,
- CaseInsensitiveHash, CaseInsensitiveComparison>;
+ CaseInsensitiveHash, CaseInsensitiveComparison>;
}
diff --git a/third_party/seasocks/src/main/c/internal/HybiAccept.h b/third_party/seasocks/src/main/c/internal/HybiAccept.h
index d02833b..379d9ea 100644
--- a/third_party/seasocks/src/main/c/internal/HybiAccept.h
+++ b/third_party/seasocks/src/main/c/internal/HybiAccept.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
diff --git a/third_party/seasocks/src/main/c/internal/HybiPacketDecoder.h b/third_party/seasocks/src/main/c/internal/HybiPacketDecoder.h
index 528bbf9..5ad9526 100644
--- a/third_party/seasocks/src/main/c/internal/HybiPacketDecoder.h
+++ b/third_party/seasocks/src/main/c/internal/HybiPacketDecoder.h
@@ -1,32 +1,33 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
#include "seasocks/Logger.h"
+#include <cstdint>
#include <memory>
#include <string>
#include <vector>
@@ -37,27 +38,33 @@
Logger& _logger;
const std::vector<uint8_t>& _buffer;
size_t _messageStart;
+
public:
HybiPacketDecoder(Logger& logger, const std::vector<uint8_t>& buffer);
- enum {
- OPCODE_CONT = 0x0, // Deprecated in latest hybi spec, here anyway.
- OPCODE_TEXT = 0x1,
- OPCODE_BINARY = 0x2,
- OPCODE_CLOSE = 0x8,
- OPCODE_PING = 0x9,
- OPCODE_PONG = 0xA,
+ enum class Opcode : uint8_t {
+ Cont = 0x0, // Deprecated in latest hybi spec, here anyway.
+ Text = 0x1,
+ Binary = 0x2,
+ Close = 0x8,
+ Ping = 0x9,
+ Pong = 0xA,
};
- enum MessageState {
+ enum class MessageState {
NoMessage,
TextMessage,
BinaryMessage,
Error,
Ping,
+ Pong,
Close
};
- MessageState decodeNextMessage(std::vector<uint8_t>& messageOut);
+ MessageState decodeNextMessage(std::vector<uint8_t>& messageOut, bool& deflateNeeded);
+ MessageState decodeNextMessage(std::vector<uint8_t>& messageOut) {
+ bool ignore;
+ return decodeNextMessage(messageOut, ignore);
+ }
size_t numBytesDecoded() const;
};
diff --git a/third_party/seasocks/src/main/c/internal/LogStream.h b/third_party/seasocks/src/main/c/internal/LogStream.h
index 16612ba..e8b9a65 100644
--- a/third_party/seasocks/src/main/c/internal/LogStream.h
+++ b/third_party/seasocks/src/main/c/internal/LogStream.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
@@ -30,16 +30,16 @@
// Internal stream helpers for logging.
#include <sstream>
-#define LS_LOG(LOG, LEVEL, STUFF) \
-{ \
- std::ostringstream o; \
- o << STUFF; \
- (LOG)->log(Logger::LEVEL, o.str().c_str()); \
-}
+#define LS_LOG(LOG, LEVEL, STUFF) \
+ { \
+ std::ostringstream os_; \
+ os_ << STUFF; \
+ (LOG)->log(Logger::Level::LEVEL, os_.str().c_str()); \
+ }
-#define LS_DEBUG(LOG, STUFF) LS_LOG(LOG, DEBUG, STUFF)
-#define LS_ACCESS(LOG, STUFF) LS_LOG(LOG, ACCESS, STUFF)
-#define LS_INFO(LOG, STUFF) LS_LOG(LOG, INFO, STUFF)
-#define LS_WARNING(LOG, STUFF) LS_LOG(LOG, WARNING, STUFF)
-#define LS_ERROR(LOG, STUFF) LS_LOG(LOG, ERROR, STUFF)
-#define LS_SEVERE(LOG, STUFF) LS_LOG(LOG, SEVERE, STUFF)
+#define LS_DEBUG(LOG, STUFF) LS_LOG(LOG, Debug, STUFF)
+#define LS_ACCESS(LOG, STUFF) LS_LOG(LOG, Access, STUFF)
+#define LS_INFO(LOG, STUFF) LS_LOG(LOG, Info, STUFF)
+#define LS_WARNING(LOG, STUFF) LS_LOG(LOG, Warning, STUFF)
+#define LS_ERROR(LOG, STUFF) LS_LOG(LOG, Error, STUFF)
+#define LS_SEVERE(LOG, STUFF) LS_LOG(LOG, Severe, STUFF)
diff --git a/third_party/seasocks/src/main/c/internal/PageRequest.h b/third_party/seasocks/src/main/c/internal/PageRequest.h
index 6fea7fb..a8c8eb6 100644
--- a/third_party/seasocks/src/main/c/internal/PageRequest.h
+++ b/third_party/seasocks/src/main/c/internal/PageRequest.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
@@ -37,6 +37,7 @@
std::shared_ptr<Credentials> _credentials;
const sockaddr_in _remoteAddress;
const std::string _requestUri;
+ Server& _server;
const Verb _verb;
std::vector<uint8_t> _content;
HeaderMap _headers;
@@ -44,47 +45,52 @@
public:
PageRequest(
- const sockaddr_in& remoteAddress,
- const std::string& requestUri,
- Verb verb,
- HeaderMap&& headers);
+ const sockaddr_in& remoteAddress,
+ const std::string& requestUri,
+ Server& server,
+ Verb verb,
+ HeaderMap&& headers);
- virtual Verb verb() const {
+ virtual Server& server() const override {
+ return _server;
+ }
+
+ virtual Verb verb() const override {
return _verb;
}
- virtual std::shared_ptr<Credentials> credentials() const {
+ virtual std::shared_ptr<Credentials> credentials() const override {
return _credentials;
}
- virtual const sockaddr_in& getRemoteAddress() const {
+ virtual const sockaddr_in& getRemoteAddress() const override {
return _remoteAddress;
}
- virtual const std::string& getRequestUri() const {
+ virtual const std::string& getRequestUri() const override {
return _requestUri;
}
- virtual size_t contentLength() const {
+ virtual size_t contentLength() const override {
return _contentLength;
}
- virtual const uint8_t* content() const {
- return _contentLength > 0 ? &_content[0] : NULL;
+ virtual const uint8_t* content() const override {
+ return _contentLength > 0 ? &_content[0] : nullptr;
}
- virtual bool hasHeader(const std::string& name) const {
+ virtual bool hasHeader(const std::string& name) const override {
return _headers.find(name) != _headers.end();
}
- virtual std::string getHeader(const std::string& name) const {
+ virtual std::string getHeader(const std::string& name) const override {
auto iter = _headers.find(name);
return iter == _headers.end() ? std::string() : iter->second;
}
bool consumeContent(std::vector<uint8_t>& buffer);
- int getIntHeader(const std::string& name) const;
+ size_t getUintHeader(const std::string& name) const;
};
-} // namespace seasocks
+} // namespace seasocks
diff --git a/third_party/seasocks/src/main/c/internal/Version.h b/third_party/seasocks/src/main/c/internal/RaiiFd.h
similarity index 62%
copy from third_party/seasocks/src/main/c/internal/Version.h
copy to third_party/seasocks/src/main/c/internal/RaiiFd.h
index 366f8ea..0b93bd5 100644
--- a/third_party/seasocks/src/main/c/internal/Version.h
+++ b/third_party/seasocks/src/main/c/internal/RaiiFd.h
@@ -1,31 +1,58 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUnamespace seasocks {
#pragma once
-#ifndef SEASOCKS_VERSION_STRING
-// This stops Eclipse freaking out as it doesn't know this is set on GCC command line.
-#define SEASOCKS_VERSION_STRING "SeaSocks/unversioned"
-#endif
\ No newline at end of file
+#include <unistd.h>
+
+namespace seasocks {
+
+class RaiiFd {
+ int fd_;
+
+public:
+ explicit RaiiFd(int fd)
+ : fd_(fd) {
+ }
+
+ RaiiFd(const RaiiFd&) = delete;
+ RaiiFd& operator=(const RaiiFd&) = delete;
+
+ ~RaiiFd() {
+ if (fd_ != -1) {
+ ::close(fd_);
+ }
+ }
+
+ bool ok() const {
+ return fd_ != -1;
+ }
+
+ operator int() const {
+ return fd_;
+ }
+};
+
+}
diff --git a/third_party/seasocks/src/main/c/md5/md5.cpp b/third_party/seasocks/src/main/c/md5/md5.cpp
index 4ad3606..64c1f02 100644
--- a/third_party/seasocks/src/main/c/md5/md5.cpp
+++ b/third_party/seasocks/src/main/c/md5/md5.cpp
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
/*
@@ -78,88 +78,88 @@
#include "md5/md5.h"
-#include <string.h>
+#include <cstring>
-#undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */
+#undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */
#ifdef ARCH_IS_BIG_ENDIAN
-# define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
+#define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
#else
-# define BYTE_ORDER 0
+#define BYTE_ORDER 0
#endif
-#define T_MASK ((md5_word_t)~0)
+#define T_MASK ((md5_word_t) ~0)
#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
-#define T3 0x242070db
+#define T3 0x242070db
#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
-#define T6 0x4787c62a
+#define T6 0x4787c62a
#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
-#define T9 0x698098d8
+#define T9 0x698098d8
#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
-#define T13 0x6b901122
+#define T13 0x6b901122
#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
-#define T16 0x49b40821
+#define T16 0x49b40821
#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
-#define T19 0x265e5a51
+#define T19 0x265e5a51
#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
-#define T22 0x02441453
+#define T22 0x02441453
#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
-#define T25 0x21e1cde6
+#define T25 0x21e1cde6
#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
-#define T28 0x455a14ed
+#define T28 0x455a14ed
#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
-#define T31 0x676f02d9
+#define T31 0x676f02d9
#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
-#define T35 0x6d9d6122
+#define T35 0x6d9d6122
#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
-#define T38 0x4bdecfa9
+#define T38 0x4bdecfa9
#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
-#define T41 0x289b7ec6
+#define T41 0x289b7ec6
#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
-#define T44 0x04881d05
+#define T44 0x04881d05
#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
-#define T47 0x1fa27cf8
+#define T47 0x1fa27cf8
#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
-#define T50 0x432aff97
+#define T50 0x432aff97
#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
-#define T53 0x655b59c3
+#define T53 0x655b59c3
#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
-#define T57 0x6fa87e4f
+#define T57 0x6fa87e4f
#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
-#define T60 0x4e0811a1
+#define T60 0x4e0811a1
#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
-#define T63 0x2ad7d2bb
+#define T63 0x2ad7d2bb
#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
static void
-md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
-{
+md5_process(md5_state_t* pms, const md5_byte_t* data /*[64]*/) {
md5_word_t
- a = pms->abcd[0], b = pms->abcd[1],
- c = pms->abcd[2], d = pms->abcd[3];
+ a = pms->abcd[0],
+ b = pms->abcd[1],
+ c = pms->abcd[2], d = pms->abcd[3];
md5_word_t t;
#if BYTE_ORDER > 0
/* Define storage only for big-endian CPUs. */
@@ -167,56 +167,56 @@
#else
/* Define storage for little-endian or both types of CPUs. */
md5_word_t xbuf[16];
- const md5_word_t *X;
+ const md5_word_t* X;
#endif
{
#if BYTE_ORDER == 0
- /*
+ /*
* Determine dynamically whether this is a big-endian or
* little-endian machine, since we can use a more efficient
* algorithm on the latter.
*/
- static const int w = 1;
+ static const int w = 1;
- if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
+ if (*((const md5_byte_t*) &w)) /* dynamic little-endian */
#endif
-#if BYTE_ORDER <= 0 /* little-endian */
- {
- /*
+#if BYTE_ORDER <= 0 /* little-endian */
+ {
+ /*
* On little-endian machines, we can process properly aligned
* data without copying it.
*/
- if (!((data - (const md5_byte_t *)0) & 3)) {
- /* data are properly aligned */
- X = (const md5_word_t *)data;
- } else {
- /* not aligned */
- memcpy(xbuf, data, 64);
- X = xbuf;
+ if (!((data - (const md5_byte_t*) 0) & 3)) {
+ /* data are properly aligned */
+ X = (const md5_word_t*) data;
+ } else {
+ /* not aligned */
+ memcpy(xbuf, data, 64);
+ X = xbuf;
+ }
}
- }
#endif
#if BYTE_ORDER == 0
- else /* dynamic big-endian */
+ else /* dynamic big-endian */
#endif
-#if BYTE_ORDER >= 0 /* big-endian */
- {
- /*
+#if BYTE_ORDER >= 0 /* big-endian */
+ {
+ /*
* On big-endian machines, we must arrange the bytes in the
* right order.
*/
- const md5_byte_t *xp = data;
- int i;
+ const md5_byte_t* xp = data;
+ int i;
-# if BYTE_ORDER == 0
- X = xbuf; /* (dynamic only) */
-# else
-# define xbuf X /* (static only) */
-# endif
- for (i = 0; i < 16; ++i, xp += 4)
- xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
- }
+#if BYTE_ORDER == 0
+ X = xbuf; /* (dynamic only) */
+#else
+#define xbuf X /* (static only) */
+#endif
+ for (i = 0; i < 16; ++i, xp += 4)
+ xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
+ }
#endif
}
@@ -226,107 +226,107 @@
/* Let [abcd k s i] denote the operation
a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
-#define SET(a, b, c, d, k, s, Ti)\
- t = a + F(b,c,d) + X[k] + Ti;\
- a = ROTATE_LEFT(t, s) + b
+#define SET(a, b, c, d, k, s, Ti) \
+ t = a + F(b, c, d) + X[k] + Ti; \
+ a = ROTATE_LEFT(t, s) + b
/* Do the following 16 operations. */
- SET(a, b, c, d, 0, 7, T1);
- SET(d, a, b, c, 1, 12, T2);
- SET(c, d, a, b, 2, 17, T3);
- SET(b, c, d, a, 3, 22, T4);
- SET(a, b, c, d, 4, 7, T5);
- SET(d, a, b, c, 5, 12, T6);
- SET(c, d, a, b, 6, 17, T7);
- SET(b, c, d, a, 7, 22, T8);
- SET(a, b, c, d, 8, 7, T9);
- SET(d, a, b, c, 9, 12, T10);
+ SET(a, b, c, d, 0, 7, T1);
+ SET(d, a, b, c, 1, 12, T2);
+ SET(c, d, a, b, 2, 17, T3);
+ SET(b, c, d, a, 3, 22, T4);
+ SET(a, b, c, d, 4, 7, T5);
+ SET(d, a, b, c, 5, 12, T6);
+ SET(c, d, a, b, 6, 17, T7);
+ SET(b, c, d, a, 7, 22, T8);
+ SET(a, b, c, d, 8, 7, T9);
+ SET(d, a, b, c, 9, 12, T10);
SET(c, d, a, b, 10, 17, T11);
SET(b, c, d, a, 11, 22, T12);
- SET(a, b, c, d, 12, 7, T13);
+ SET(a, b, c, d, 12, 7, T13);
SET(d, a, b, c, 13, 12, T14);
SET(c, d, a, b, 14, 17, T15);
SET(b, c, d, a, 15, 22, T16);
#undef SET
- /* Round 2. */
- /* Let [abcd k s i] denote the operation
+ /* Round 2. */
+ /* Let [abcd k s i] denote the operation
a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
- t = a + G(b,c,d) + X[k] + Ti;\
- a = ROTATE_LEFT(t, s) + b
- /* Do the following 16 operations. */
- SET(a, b, c, d, 1, 5, T17);
- SET(d, a, b, c, 6, 9, T18);
+#define SET(a, b, c, d, k, s, Ti) \
+ t = a + G(b, c, d) + X[k] + Ti; \
+ a = ROTATE_LEFT(t, s) + b
+ /* Do the following 16 operations. */
+ SET(a, b, c, d, 1, 5, T17);
+ SET(d, a, b, c, 6, 9, T18);
SET(c, d, a, b, 11, 14, T19);
- SET(b, c, d, a, 0, 20, T20);
- SET(a, b, c, d, 5, 5, T21);
- SET(d, a, b, c, 10, 9, T22);
+ SET(b, c, d, a, 0, 20, T20);
+ SET(a, b, c, d, 5, 5, T21);
+ SET(d, a, b, c, 10, 9, T22);
SET(c, d, a, b, 15, 14, T23);
- SET(b, c, d, a, 4, 20, T24);
- SET(a, b, c, d, 9, 5, T25);
- SET(d, a, b, c, 14, 9, T26);
- SET(c, d, a, b, 3, 14, T27);
- SET(b, c, d, a, 8, 20, T28);
- SET(a, b, c, d, 13, 5, T29);
- SET(d, a, b, c, 2, 9, T30);
- SET(c, d, a, b, 7, 14, T31);
+ SET(b, c, d, a, 4, 20, T24);
+ SET(a, b, c, d, 9, 5, T25);
+ SET(d, a, b, c, 14, 9, T26);
+ SET(c, d, a, b, 3, 14, T27);
+ SET(b, c, d, a, 8, 20, T28);
+ SET(a, b, c, d, 13, 5, T29);
+ SET(d, a, b, c, 2, 9, T30);
+ SET(c, d, a, b, 7, 14, T31);
SET(b, c, d, a, 12, 20, T32);
#undef SET
- /* Round 3. */
- /* Let [abcd k s t] denote the operation
+ /* Round 3. */
+ /* Let [abcd k s t] denote the operation
a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define SET(a, b, c, d, k, s, Ti)\
- t = a + H(b,c,d) + X[k] + Ti;\
- a = ROTATE_LEFT(t, s) + b
- /* Do the following 16 operations. */
- SET(a, b, c, d, 5, 4, T33);
- SET(d, a, b, c, 8, 11, T34);
+#define SET(a, b, c, d, k, s, Ti) \
+ t = a + H(b, c, d) + X[k] + Ti; \
+ a = ROTATE_LEFT(t, s) + b
+ /* Do the following 16 operations. */
+ SET(a, b, c, d, 5, 4, T33);
+ SET(d, a, b, c, 8, 11, T34);
SET(c, d, a, b, 11, 16, T35);
SET(b, c, d, a, 14, 23, T36);
- SET(a, b, c, d, 1, 4, T37);
- SET(d, a, b, c, 4, 11, T38);
- SET(c, d, a, b, 7, 16, T39);
+ SET(a, b, c, d, 1, 4, T37);
+ SET(d, a, b, c, 4, 11, T38);
+ SET(c, d, a, b, 7, 16, T39);
SET(b, c, d, a, 10, 23, T40);
- SET(a, b, c, d, 13, 4, T41);
- SET(d, a, b, c, 0, 11, T42);
- SET(c, d, a, b, 3, 16, T43);
- SET(b, c, d, a, 6, 23, T44);
- SET(a, b, c, d, 9, 4, T45);
+ SET(a, b, c, d, 13, 4, T41);
+ SET(d, a, b, c, 0, 11, T42);
+ SET(c, d, a, b, 3, 16, T43);
+ SET(b, c, d, a, 6, 23, T44);
+ SET(a, b, c, d, 9, 4, T45);
SET(d, a, b, c, 12, 11, T46);
SET(c, d, a, b, 15, 16, T47);
- SET(b, c, d, a, 2, 23, T48);
+ SET(b, c, d, a, 2, 23, T48);
#undef SET
- /* Round 4. */
- /* Let [abcd k s t] denote the operation
+ /* Round 4. */
+ /* Let [abcd k s t] denote the operation
a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
#define I(x, y, z) ((y) ^ ((x) | ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
- t = a + I(b,c,d) + X[k] + Ti;\
- a = ROTATE_LEFT(t, s) + b
- /* Do the following 16 operations. */
- SET(a, b, c, d, 0, 6, T49);
- SET(d, a, b, c, 7, 10, T50);
+#define SET(a, b, c, d, k, s, Ti) \
+ t = a + I(b, c, d) + X[k] + Ti; \
+ a = ROTATE_LEFT(t, s) + b
+ /* Do the following 16 operations. */
+ SET(a, b, c, d, 0, 6, T49);
+ SET(d, a, b, c, 7, 10, T50);
SET(c, d, a, b, 14, 15, T51);
- SET(b, c, d, a, 5, 21, T52);
- SET(a, b, c, d, 12, 6, T53);
- SET(d, a, b, c, 3, 10, T54);
+ SET(b, c, d, a, 5, 21, T52);
+ SET(a, b, c, d, 12, 6, T53);
+ SET(d, a, b, c, 3, 10, T54);
SET(c, d, a, b, 10, 15, T55);
- SET(b, c, d, a, 1, 21, T56);
- SET(a, b, c, d, 8, 6, T57);
+ SET(b, c, d, a, 1, 21, T56);
+ SET(a, b, c, d, 8, 6, T57);
SET(d, a, b, c, 15, 10, T58);
- SET(c, d, a, b, 6, 15, T59);
+ SET(c, d, a, b, 6, 15, T59);
SET(b, c, d, a, 13, 21, T60);
- SET(a, b, c, d, 4, 6, T61);
+ SET(a, b, c, d, 4, 6, T61);
SET(d, a, b, c, 11, 10, T62);
- SET(c, d, a, b, 2, 15, T63);
- SET(b, c, d, a, 9, 21, T64);
+ SET(c, d, a, b, 2, 15, T63);
+ SET(b, c, d, a, 9, 21, T64);
#undef SET
- /* Then perform the following additions. (That is increment each
+ /* Then perform the following additions. (That is increment each
of the four registers by the value it had before this block
was started.) */
pms->abcd[0] += a;
@@ -336,13 +336,10 @@
}
#ifdef __cplusplus
-extern "C"
-{
+extern "C" {
#endif
-void
-md5_init(md5_state_t *pms)
-{
+void md5_init(md5_state_t* pms) {
pms->count[0] = pms->count[1] = 0;
pms->abcd[0] = 0x67452301;
pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
@@ -350,67 +347,62 @@
pms->abcd[3] = 0x10325476;
}
-void
-md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
-{
- const md5_byte_t *p = data;
+void md5_append(md5_state_t* pms, const md5_byte_t* data, int nbytes) {
+ const md5_byte_t* p = data;
int left = nbytes;
int offset = (pms->count[0] >> 3) & 63;
md5_word_t nbits = (md5_word_t)(nbytes << 3);
if (nbytes <= 0)
- return;
+ return;
/* Update the message length. */
pms->count[1] += nbytes >> 29;
pms->count[0] += nbits;
if (pms->count[0] < nbits)
- pms->count[1]++;
+ pms->count[1]++;
/* Process an initial partial block. */
if (offset) {
- int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
+ int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
- memcpy(pms->buf + offset, p, copy);
- if (offset + copy < 64)
- return;
- p += copy;
- left -= copy;
- md5_process(pms, pms->buf);
+ memcpy(pms->buf + offset, p, copy);
+ if (offset + copy < 64)
+ return;
+ p += copy;
+ left -= copy;
+ md5_process(pms, pms->buf);
}
/* Process full blocks. */
for (; left >= 64; p += 64, left -= 64)
- md5_process(pms, p);
+ md5_process(pms, p);
/* Process a final partial block. */
if (left)
- memcpy(pms->buf, p, left);
+ memcpy(pms->buf, p, left);
}
-void
-md5_finish(md5_state_t *pms, md5_byte_t digest[16])
-{
+void md5_finish(md5_state_t* pms, md5_byte_t digest[16]) {
static const md5_byte_t pad[64] = {
- 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
- };
+ 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
md5_byte_t data[8];
int i;
/* Save the length before padding. */
for (i = 0; i < 8; ++i)
- data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
+ data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
/* Pad to 56 bytes mod 64. */
md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
/* Append the length. */
md5_append(pms, data, 8);
for (i = 0; i < 16; ++i)
- digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
+ digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
}
#ifdef __cplusplus
-} /* end extern "C" */
+} /* end extern "C" */
#endif
diff --git a/third_party/seasocks/src/main/c/md5/md5.h b/third_party/seasocks/src/main/c/md5/md5.h
index 3b88587..11ebd36 100644
--- a/third_party/seasocks/src/main/c/md5/md5.h
+++ b/third_party/seasocks/src/main/c/md5/md5.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
/*
@@ -73,7 +73,7 @@
*/
#ifndef md5_INCLUDED
-# define md5_INCLUDED
+#define md5_INCLUDED
/*
* This package supports both compile-time and run-time determination of CPU
@@ -85,32 +85,31 @@
* efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
*/
-typedef unsigned char md5_byte_t; /* 8-bit byte */
-typedef unsigned int md5_word_t; /* 32-bit word */
+using md5_byte_t = unsigned char; /* 8-bit byte */
+using md5_word_t = unsigned int; /* 32-bit word */
/* Define the state of the MD5 Algorithm. */
typedef struct md5_state_s {
- md5_word_t count[2]; /* message length in bits, lsw first */
- md5_word_t abcd[4]; /* digest buffer */
- md5_byte_t buf[64]; /* accumulate block */
+ md5_word_t count[2]; /* message length in bits, lsw first */
+ md5_word_t abcd[4]; /* digest buffer */
+ md5_byte_t buf[64]; /* accumulate block */
} md5_state_t;
#ifdef __cplusplus
-extern "C"
-{
+extern "C" {
#endif
/* Initialize the algorithm. */
-void md5_init(md5_state_t *pms);
+void md5_init(md5_state_t* pms);
/* Append a string to the message. */
-void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
+void md5_append(md5_state_t* pms, const md5_byte_t* data, int nbytes);
/* Finish the message and return the digest. */
-void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
+void md5_finish(md5_state_t* pms, md5_byte_t digest[16]);
#ifdef __cplusplus
-} /* end extern "C" */
+} /* end extern "C" */
#endif
#endif /* md5_INCLUDED */
diff --git a/third_party/seasocks/src/main/c/seasocks/Connection.h b/third_party/seasocks/src/main/c/seasocks/Connection.h
index c1aa996..3ffb5a1 100644
--- a/third_party/seasocks/src/main/c/seasocks/Connection.h
+++ b/third_party/seasocks/src/main/c/seasocks/Connection.h
@@ -1,43 +1,47 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
#include "seasocks/ResponseCode.h"
#include "seasocks/WebSocket.h"
+#include "seasocks/ResponseWriter.h"
+#include "seasocks/TransferEncoding.h"
+#include "seasocks/ZlibContext.h"
#include <netinet/in.h>
#include <sys/socket.h>
-#include <inttypes.h>
+#include <cinttypes>
#include <list>
#include <memory>
#include <string>
#include <vector>
+
namespace seasocks {
class Logger;
@@ -48,17 +52,19 @@
class Connection : public WebSocket {
public:
Connection(
- std::shared_ptr<Logger> logger,
- ServerImpl& server,
- int fd,
- const sockaddr_in& address);
+ std::shared_ptr<Logger> logger,
+ ServerImpl& server,
+ int fd,
+ const sockaddr_in& address);
virtual ~Connection();
bool write(const void* data, size_t size, bool flush);
void handleDataReadyForRead();
void handleDataReadyForWrite();
- int getFd() const { return _fd; }
+ int getFd() const {
+ return _fd;
+ }
// From WebSocket.
virtual void send(const char* webSocketResponse) override;
@@ -67,24 +73,43 @@
// From Request.
virtual std::shared_ptr<Credentials> credentials() const override;
- virtual const sockaddr_in& getRemoteAddress() const override { return _address; }
+ virtual const sockaddr_in& getRemoteAddress() const override {
+ return _address;
+ }
virtual const std::string& getRequestUri() const override;
- virtual Request::Verb verb() const override { return Request::WebSocket; }
- virtual size_t contentLength() const override { return 0; }
- virtual const uint8_t* content() const override { return NULL; }
+ virtual Request::Verb verb() const override {
+ return Request::Verb::WebSocket;
+ }
+ virtual size_t contentLength() const override {
+ return 0;
+ }
+ virtual const uint8_t* content() const override {
+ return nullptr;
+ }
virtual bool hasHeader(const std::string&) const override;
virtual std::string getHeader(const std::string&) const override;
+ virtual Server& server() const override;
void setLinger();
- size_t inputBufferSize() const { return _inBuf.size(); }
- size_t outputBufferSize() const { return _outBuf.size(); }
+ size_t inputBufferSize() const {
+ return _inBuf.size();
+ }
+ size_t outputBufferSize() const {
+ return _outBuf.size();
+ }
- size_t bytesReceived() const { return _bytesReceived; }
- size_t bytesSent() const { return _bytesSent; }
+ size_t bytesReceived() const {
+ return _bytesReceived;
+ }
+ size_t bytesSent() const {
+ return _bytesSent;
+ }
// For testing:
- std::vector<uint8_t>& getInputBuffer() { return _inBuf; }
+ std::vector<uint8_t>& getInputBuffer() {
+ return _inBuf;
+ }
void handleHixieWebSocket();
void handleHybiWebSocket();
void setHandler(std::shared_ptr<WebSocket::Handler> handler) {
@@ -92,6 +117,11 @@
}
void handleNewData();
+
+ Connection(Connection& other) = delete;
+ Connection& operator=(Connection& other) = delete;
+
+
private:
void finalise();
bool closed() const;
@@ -121,31 +151,45 @@
bool sendBadRequest(const std::string& reason);
bool sendISE(const std::string& error);
- void sendHybi(int opcode, const uint8_t* webSocketResponse, size_t messageLength);
+ void sendHybi(uint8_t opcode, const uint8_t* webSocketResponse,
+ size_t messageLength);
+ void sendHybiData(const uint8_t* webSocketResponse, size_t messageLength);
+
bool sendResponse(std::shared_ptr<Response> response);
bool processHeaders(uint8_t* first, uint8_t* last);
bool sendData(const std::string& type, const char* start, size_t size);
+ bool sendHeader(const std::string& type, size_t size);
+
+ // Delegated from ResponseWriter.
+ struct Writer;
+ void begin(ResponseCode responseCode, TransferEncoding encoding);
+ void header(const std::string& header, const std::string& value);
+ void payload(const void* data, size_t size, bool flush);
+ void finish(bool keepConnectionOpen);
+ void error(ResponseCode responseCode, const std::string& payload);
struct Range {
long start;
long end;
- size_t length() const { return end - start + 1; }
+ size_t length() const {
+ return end - start + 1;
+ }
};
bool parseRange(const std::string& rangeStr, Range& range) const;
bool parseRanges(const std::string& range, std::list<Range>& ranges) const;
bool sendStaticData();
- int safeSend(const void* data, size_t size);
+ ssize_t safeSend(const void* data, size_t size);
void bufferResponseAndCommonHeaders(ResponseCode code);
std::list<Range> processRangesForStaticData(const std::list<Range>& ranges, long fileSize);
std::shared_ptr<Logger> _logger;
- ServerImpl &_server;
+ ServerImpl& _server;
int _fd;
bool _shutdown;
bool _hadSendError;
@@ -159,19 +203,31 @@
std::shared_ptr<WebSocket::Handler> _webSocketHandler;
bool _shutdownByUser;
std::unique_ptr<PageRequest> _request;
+ std::shared_ptr<Response> _response;
+ TransferEncoding _transferEncoding;
+ unsigned _chunk;
+ std::shared_ptr<Writer> _writer;
- enum State {
+ void parsePerMessageDeflateHeader(const std::string& header);
+ bool _perMessageDeflate = false;
+ ZlibContext zlibContext;
+
+ void pickProtocol();
+
+ enum class State {
INVALID,
READING_HEADERS,
READING_WEBSOCKET_KEY3,
HANDLING_HIXIE_WEBSOCKET,
HANDLING_HYBI_WEBSOCKET,
BUFFERING_POST_DATA,
+ AWAITING_RESPONSE_BEGIN,
+ SENDING_RESPONSE_HEADERS,
+ SENDING_RESPONSE_BODY
};
State _state;
- Connection(Connection& other) = delete;
- Connection& operator =(Connection& other) = delete;
+ void writeChunkHeader(size_t size);
};
-} // namespace seasocks
+} // namespace seasocks
diff --git a/third_party/seasocks/src/main/c/seasocks/Credentials.h b/third_party/seasocks/src/main/c/seasocks/Credentials.h
index 06532c2..385f55b 100644
--- a/third_party/seasocks/src/main/c/seasocks/Credentials.h
+++ b/third_party/seasocks/src/main/c/seasocks/Credentials.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
@@ -53,21 +53,25 @@
*/
std::map<std::string, std::string> attributes;
- Credentials(): authenticated(false) {}
+ Credentials()
+ : authenticated(false), username(), groups(), attributes() {
+ }
};
-inline std::ostream &operator<<(std::ostream &os, const Credentials& credentials) {
+inline std::ostream& operator<<(std::ostream& os, const Credentials& credentials) {
os << "{authenticated:" << credentials.authenticated << ", username:'" << credentials.username << "', groups: {";
for (auto it = credentials.groups.begin(); it != credentials.groups.end(); ++it) {
- if (it != credentials.groups.begin()) os << ", ";
+ if (it != credentials.groups.begin())
+ os << ", ";
os << *it;
}
os << "}, attrs: {";
for (auto it = credentials.attributes.begin(); it != credentials.attributes.end(); ++it) {
- if (it != credentials.attributes.begin()) os << ", ";
+ if (it != credentials.attributes.begin())
+ os << ", ";
os << it->first << "=" << it->second;
}
return os << "}}";
}
-} // namespace seasocks
+} // namespace seasocks
diff --git a/third_party/seasocks/src/main/c/seasocks/IgnoringLogger.h b/third_party/seasocks/src/main/c/seasocks/IgnoringLogger.h
index c1d4b1e..6e5afa0 100644
--- a/third_party/seasocks/src/main/c/seasocks/IgnoringLogger.h
+++ b/third_party/seasocks/src/main/c/seasocks/IgnoringLogger.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
@@ -31,8 +31,8 @@
class IgnoringLogger : public Logger {
public:
- virtual void log(Level level, const char* message) {
+ virtual void log(Level /*level*/, const char* /*message*/) override {
}
};
-} // namespace seasocks
+} // namespace seasocks
diff --git a/third_party/seasocks/src/main/c/seasocks/Logger.h b/third_party/seasocks/src/main/c/seasocks/Logger.h
index 317c54a..ea06410 100644
--- a/third_party/seasocks/src/main/c/seasocks/Logger.h
+++ b/third_party/seasocks/src/main/c/seasocks/Logger.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
@@ -32,15 +32,15 @@
*/
class Logger {
public:
- virtual ~Logger() {}
+ virtual ~Logger() = default;
- enum Level {
- DEBUG, // NB DEBUG is usually opted-out of at compile-time.
- ACCESS, // Used to log page requests etc
- INFO,
- WARNING,
- ERROR,
- SEVERE,
+ enum class Level {
+ Debug, // NB Debug is usually opted-out of at compile-time.
+ Access, // Used to log page requests etc
+ Info,
+ Warning,
+ Error,
+ Severe,
};
virtual void log(Level level, const char* message) = 0;
@@ -54,15 +54,22 @@
static const char* levelToString(Level level) {
switch (level) {
- case DEBUG: return "debug";
- case ACCESS: return "access";
- case INFO: return "info";
- case WARNING: return "warning";
- case ERROR: return "ERROR";
- case SEVERE: return "SEVERE";
- default: return "???";
+ case Level::Debug:
+ return "debug";
+ case Level::Access:
+ return "access";
+ case Level::Info:
+ return "info";
+ case Level::Warning:
+ return "warning";
+ case Level::Error:
+ return "ERROR";
+ case Level::Severe:
+ return "SEVERE";
+ default:
+ return "???";
}
}
};
-} // namespace seasocks
+} // namespace seasocks
diff --git a/third_party/seasocks/src/main/c/seasocks/PageHandler.h b/third_party/seasocks/src/main/c/seasocks/PageHandler.h
index d9e671d..cc43c21 100644
--- a/third_party/seasocks/src/main/c/seasocks/PageHandler.h
+++ b/third_party/seasocks/src/main/c/seasocks/PageHandler.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
@@ -37,7 +37,7 @@
class PageHandler {
public:
- virtual ~PageHandler() {}
+ virtual ~PageHandler() = default;
virtual std::shared_ptr<Response> handle(const Request& request) = 0;
};
diff --git a/third_party/seasocks/src/main/c/seasocks/PrintfLogger.h b/third_party/seasocks/src/main/c/seasocks/PrintfLogger.h
index f08b1b0..c134896 100644
--- a/third_party/seasocks/src/main/c/seasocks/PrintfLogger.h
+++ b/third_party/seasocks/src/main/c/seasocks/PrintfLogger.h
@@ -1,45 +1,45 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
#include "seasocks/Logger.h"
-#include <stdio.h>
+#include <cstdio>
namespace seasocks {
class PrintfLogger : public Logger {
public:
- PrintfLogger(Level minLevelToLog = Level::DEBUG) : minLevelToLog(minLevelToLog) {
+ explicit PrintfLogger(Level minLevelToLog_ = Level::Debug)
+ : minLevelToLog(minLevelToLog_) {
}
- ~PrintfLogger() {
- }
+ ~PrintfLogger() = default;
- virtual void log(Level level, const char* message) {
+ virtual void log(Level level, const char* message) override {
if (level >= minLevelToLog) {
printf("%s: %s\n", levelToString(level), message);
}
@@ -48,4 +48,4 @@
Level minLevelToLog;
};
-} // namespace seasocks
+} // namespace seasocks
diff --git a/third_party/seasocks/src/main/c/seasocks/Request.cpp b/third_party/seasocks/src/main/c/seasocks/Request.cpp
index 63be5a6..6d8b5a8 100644
--- a/third_party/seasocks/src/main/c/seasocks/Request.cpp
+++ b/third_party/seasocks/src/main/c/seasocks/Request.cpp
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "seasocks/Request.h"
@@ -30,23 +30,38 @@
namespace seasocks {
const char* Request::name(Verb v) {
- switch(v) {
- case Invalid: return "Invalid";
- case WebSocket: return "WebSocket";
- case Get: return "Get";
- case Put: return "Put";
- case Post: return "Post";
- case Delete: return "Delete";
- default: return "???";
+ switch (v) {
+ case Verb::Invalid:
+ return "Invalid";
+ case Verb::WebSocket:
+ return "WebSocket";
+ case Verb::Get:
+ return "Get";
+ case Verb::Put:
+ return "Put";
+ case Verb::Post:
+ return "Post";
+ case Verb::Delete:
+ return "Delete";
+ case Verb::Head:
+ return "Head";
+ default:
+ return "???";
}
}
Request::Verb Request::verb(const char* verb) {
- if (std::strcmp(verb, "GET") == 0) return Request::Get;
- if (std::strcmp(verb, "PUT") == 0) return Request::Put;
- if (std::strcmp(verb, "POST") == 0) return Request::Post;
- if (std::strcmp(verb, "DELETE") == 0) return Request::Delete;
- return Request::Invalid;
+ if (std::strcmp(verb, "GET") == 0)
+ return Request::Verb::Get;
+ if (std::strcmp(verb, "PUT") == 0)
+ return Request::Verb::Put;
+ if (std::strcmp(verb, "POST") == 0)
+ return Request::Verb::Post;
+ if (std::strcmp(verb, "DELETE") == 0)
+ return Request::Verb::Delete;
+ if (std::strcmp(verb, "HEAD") == 0)
+ return Request::Verb::Head;
+ return Request::Verb::Invalid;
}
-} // namespace seasocks
+} // namespace seasocks
diff --git a/third_party/seasocks/src/main/c/seasocks/Request.h b/third_party/seasocks/src/main/c/seasocks/Request.h
index 7c0e78a..d7d9402 100644
--- a/third_party/seasocks/src/main/c/seasocks/Request.h
+++ b/third_party/seasocks/src/main/c/seasocks/Request.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
@@ -34,23 +34,28 @@
namespace seasocks {
+class Server;
+
class Request {
public:
- virtual ~Request() {}
+ virtual ~Request() = default;
- enum Verb {
+ enum class Verb {
Invalid,
WebSocket,
Get,
Put,
Post,
Delete,
+ Head,
};
+ virtual Server& server() const = 0;
+
virtual Verb verb() const = 0;
static const char* name(Verb v);
- static Verb verb(const char *verb);
+ static Verb verb(const char* verb);
/**
* Returns the credentials associated with this request.
@@ -70,4 +75,4 @@
virtual std::string getHeader(const std::string& name) const = 0;
};
-} // namespace seasocks
+} // namespace seasocks
diff --git a/third_party/seasocks/src/main/c/seasocks/Response.h b/third_party/seasocks/src/main/c/seasocks/Response.h
index 02cf03b..df523ce 100644
--- a/third_party/seasocks/src/main/c/seasocks/Response.h
+++ b/third_party/seasocks/src/main/c/seasocks/Response.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2015, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
@@ -33,20 +33,15 @@
namespace seasocks {
+class ResponseWriter;
+
class Response {
public:
- virtual ~Response() {}
- virtual ResponseCode responseCode() const = 0;
+ virtual ~Response() = default;
+ virtual void handle(std::shared_ptr<ResponseWriter> writer) = 0;
- virtual const char* payload() const = 0;
- virtual size_t payloadSize() const = 0;
-
- virtual std::string contentType() const = 0;
-
- virtual bool keepConnectionAlive() const = 0;
-
- typedef std::multimap<std::string, std::string> Headers;
- virtual Headers getAdditionalHeaders() const = 0;
+ // Called when the connection this response is being sent on is closed.
+ virtual void cancel() = 0;
static std::shared_ptr<Response> unhandled();
diff --git a/third_party/seasocks/src/main/c/seasocks/ResponseBuilder.cpp b/third_party/seasocks/src/main/c/seasocks/ResponseBuilder.cpp
index f9f9b29..bd1dcc2 100644
--- a/third_party/seasocks/src/main/c/seasocks/ResponseBuilder.cpp
+++ b/third_party/seasocks/src/main/c/seasocks/ResponseBuilder.cpp
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "seasocks/ResponseBuilder.h"
@@ -29,12 +29,11 @@
namespace seasocks {
-ResponseBuilder::ResponseBuilder(ResponseCode code) :
- _code(code),
- _contentType("text/plain"),
- _keepAlive(true),
- _stream(new std::ostringstream) {
-
+ResponseBuilder::ResponseBuilder(ResponseCode code)
+ : _code(code),
+ _contentType("text/plain"),
+ _keepAlive(true),
+ _stream(std::make_shared<std::ostringstream>()) {
}
ResponseBuilder& ResponseBuilder::asHtml() {
@@ -84,7 +83,7 @@
}
std::shared_ptr<Response> ResponseBuilder::build() {
- return std::shared_ptr<Response>(new ConcreteResponse(_code, _stream->str(), _contentType, _headers, _keepAlive));
+ return std::make_shared<ConcreteResponse>(_code, _stream->str(), _contentType, _headers, _keepAlive);
}
}
diff --git a/third_party/seasocks/src/main/c/seasocks/ResponseBuilder.h b/third_party/seasocks/src/main/c/seasocks/ResponseBuilder.h
index 0a268e8..40484c1 100644
--- a/third_party/seasocks/src/main/c/seasocks/ResponseBuilder.h
+++ b/third_party/seasocks/src/main/c/seasocks/ResponseBuilder.h
@@ -1,31 +1,32 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
-#include "seasocks/Response.h"
+#include "seasocks/SynchronousResponse.h"
+#include "seasocks/ToString.h"
#include <sstream>
#include <string>
@@ -36,10 +37,11 @@
ResponseCode _code;
std::string _contentType;
bool _keepAlive;
- Response::Headers _headers;
+ SynchronousResponse::Headers _headers;
std::shared_ptr<std::ostringstream> _stream;
+
public:
- ResponseBuilder(ResponseCode code = ResponseCode::Ok);
+ explicit ResponseBuilder(ResponseCode code = ResponseCode::Ok);
ResponseBuilder& asHtml();
ResponseBuilder& asText();
@@ -54,20 +56,20 @@
ResponseBuilder& setsCookie(const std::string& cookie, const std::string& value);
ResponseBuilder& withHeader(const std::string& name, const std::string& value);
- template<typename T>
+ template <typename T>
ResponseBuilder& withHeader(const std::string& name, const T& t) {
return withHeader(name, toString(t));
}
ResponseBuilder& addHeader(const std::string& name, const std::string& value);
- template<typename T>
+ template <typename T>
ResponseBuilder& addHeader(const std::string& name, const T& t) {
return addHeader(name, toString(t));
}
- template<typename T>
- ResponseBuilder& operator << (T&& t) {
- (*_stream) << std::forward(t);
+ template <typename T>
+ ResponseBuilder& operator<<(T&& t) {
+ (*_stream) << std::forward<T>(t);
return *this;
}
diff --git a/third_party/seasocks/src/main/c/seasocks/ResponseCode.cpp b/third_party/seasocks/src/main/c/seasocks/ResponseCode.cpp
index 71e88f6..fed00ad 100644
--- a/third_party/seasocks/src/main/c/seasocks/ResponseCode.cpp
+++ b/third_party/seasocks/src/main/c/seasocks/ResponseCode.cpp
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "seasocks/ResponseCode.h"
@@ -33,7 +33,9 @@
const char* name(ResponseCode code) {
switch (code) {
-#define SEASOCKS_DEFINE_RESPONSECODE(CODE,SYMBOLICNAME,STRINGNAME) case ResponseCode::SYMBOLICNAME: return STRINGNAME;
+#define SEASOCKS_DEFINE_RESPONSECODE(CODE, SYMBOLICNAME, STRINGNAME) \
+ case ResponseCode::SYMBOLICNAME: \
+ return STRINGNAME;
#include "seasocks/ResponseCodeDefs.h"
#undef SEASOCKS_DEFINE_RESPONSECODE
diff --git a/third_party/seasocks/src/main/c/seasocks/ResponseCode.h b/third_party/seasocks/src/main/c/seasocks/ResponseCode.h
index eab3463..2d1916b 100644
--- a/third_party/seasocks/src/main/c/seasocks/ResponseCode.h
+++ b/third_party/seasocks/src/main/c/seasocks/ResponseCode.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
@@ -29,7 +29,7 @@
namespace seasocks {
-#define SEASOCKS_DEFINE_RESPONSECODE(CODE,SYMBOLICNAME,STRINGNAME) SYMBOLICNAME = CODE,
+#define SEASOCKS_DEFINE_RESPONSECODE(CODE, SYMBOLICNAME, STRINGNAME) SYMBOLICNAME = CODE,
enum class ResponseCode {
#include "seasocks/ResponseCodeDefs.h"
diff --git a/third_party/seasocks/src/main/c/seasocks/ResponseCodeDefs.h b/third_party/seasocks/src/main/c/seasocks/ResponseCodeDefs.h
index 9b9878d..382af8c 100644
--- a/third_party/seasocks/src/main/c/seasocks/ResponseCodeDefs.h
+++ b/third_party/seasocks/src/main/c/seasocks/ResponseCodeDefs.h
@@ -1,32 +1,32 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
// Not a normal header file - no header guards on purpose.
// Do not directly include! Use ResponseCode.h instead
-#ifdef SEASOCKS_DEFINE_RESPONSECODE // workaround for header check
+#ifdef SEASOCKS_DEFINE_RESPONSECODE // workaround for header check
SEASOCKS_DEFINE_RESPONSECODE(100, Continue, "Continue")
SEASOCKS_DEFINE_RESPONSECODE(101, WebSocketProtocolHandshake, "WebSocket Protocol Handshake")
diff --git a/third_party/seasocks/src/main/c/seasocks/ResponseWriter.h b/third_party/seasocks/src/main/c/seasocks/ResponseWriter.h
new file mode 100644
index 0000000..a0d2982
--- /dev/null
+++ b/third_party/seasocks/src/main/c/seasocks/ResponseWriter.h
@@ -0,0 +1,71 @@
+// Copyright (c) 2013-2017, Matt Godbolt
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include "seasocks/ResponseCode.h"
+#include "seasocks/TransferEncoding.h"
+
+#include <string>
+
+namespace seasocks {
+
+// An interface to write a response to a Request. All methods must be called
+// from the Seasocks main thread. Safe in the presence of closed connections:
+// writes to connections that have closed are silently dropped. Responses that
+// wish to take note of closed connections must use their cancel() callback.
+class ResponseWriter {
+public:
+ virtual ~ResponseWriter() = default;
+
+ // Begins a request with the given code. If you want to generate a "normal"
+ // seasocks error, see 'error' below. After beginning, it is expected you
+ // will call 'header' zero or more times, then 'payload' zero or more times,
+ // then 'finish' exactly once. Using a transfer encoding other than Raw will
+ // automatically cause the appropriate header to be sent.
+ virtual void begin(ResponseCode responseCode,
+ TransferEncoding encoding = TransferEncoding::Raw) = 0;
+ // Add a header. Must be called after 'begin' and before 'payload'. May be
+ // called as many times as needed.
+ virtual void header(const std::string& header, const std::string& value) = 0;
+ // Add some payload data. Must be called after 'begin' and any 'header' calls.
+ // May be called multiple times. The flush parameter controls whether the
+ // data should be sent immediately, or buffered to be sent with a subsequent
+ // call to 'payload', or 'finish'.
+ virtual void payload(const void* data, size_t size, bool flush = true) = 0;
+ // Finish a response.
+ virtual void finish(bool keepConnectionOpen) = 0;
+
+ // Send an error back to the user. No calls to 'header' or 'payload'
+ // or 'finish' should be executed. If you wish to serve your own error document
+ // then use the normal 'begin'/'header'/'payload'/'finish' process but with
+ // an error code. This routine is to get Seasocks to generate its own error.
+ virtual void error(ResponseCode responseCode, const std::string& payload) = 0;
+ // Check whether this writer is still active; i.e. the underlying connection
+ // is still open.
+ virtual bool isActive() const = 0;
+};
+
+}
diff --git a/third_party/seasocks/src/main/c/seasocks/Server.h b/third_party/seasocks/src/main/c/seasocks/Server.h
index 4629a43..63e54ab 100644
--- a/third_party/seasocks/src/main/c/seasocks/Server.h
+++ b/third_party/seasocks/src/main/c/seasocks/Server.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -32,6 +32,7 @@
#include <atomic>
#include <cstdint>
+#include <functional>
#include <list>
#include <map>
#include <memory>
@@ -49,24 +50,13 @@
class Server : private ServerImpl {
public:
- Server(std::shared_ptr<Logger> logger);
+ explicit Server(std::shared_ptr<Logger> logger);
virtual ~Server();
void addPageHandler(std::shared_ptr<PageHandler> handler);
void addWebSocketHandler(const char* endpoint, std::shared_ptr<WebSocket::Handler> handler,
- bool allowCrossOriginRequests = false);
-
- // If we haven't heard anything ever on a connection for this long, kill it.
- // This is possibly caused by bad WebSocket implementation in Chrome.
- void setLameConnectionTimeoutSeconds(int seconds);
-
- // Sets the maximum number of TCP level keepalives that we can miss before
- // we let the OS consider the connection dead. We configure keepalives every second,
- // so this is also the minimum number of seconds it takes to notice a badly-behaved
- // dead connection, e.g. a laptop going into sleep mode or a hard-crashed machine.
- // A value of 0 disables keep alives, which is the default.
- void setMaxKeepAliveDrops(int maxKeepAliveDrops);
+ bool allowCrossOriginRequests = false);
// Serves static content from the given port on the current thread, until terminate is called.
// Roughly equivalent to startListening(port); setStaticPath(staticPath); loop();
@@ -81,6 +71,10 @@
// Returns true if all was ok.
bool startListening(int port);
+ // Starts listening on a unix domain socket.
+ // Returns true if all was ok.
+ bool startListeningUnix(const char* socketPath);
+
// Sets the path to server static content from.
void setStaticPath(const char* staticPath);
@@ -102,42 +96,77 @@
// Returns a file descriptor that can be polled for changes (e.g. by
// placing it in an epoll set. The poll() method above only need be called
// when this file descriptor is readable.
- int fd() const { return _epollFd; }
+ int fd() const {
+ return _epollFd;
+ }
// Terminate any loop() or poll(). May be called from any thread.
void terminate();
+ // If we haven't heard anything ever on a connection for this long, kill it.
+ // This is possibly caused by bad WebSocket implementation in Chrome.
+ void setLameConnectionTimeoutSeconds(int seconds);
+
+ // Sets the maximum number of TCP level keepalives that we can miss before
+ // we let the OS consider the connection dead. We configure keepalives every second,
+ // so this is also the minimum number of seconds it takes to notice a badly-behaved
+ // dead connection, e.g. a laptop going into sleep mode or a hard-crashed machine.
+ // A value of 0 disables keep alives, which is the default.
+ void setMaxKeepAliveDrops(int maxKeepAliveDrops);
+
+ // Set the maximum amount of data we'll buffer for a client before we close the
+ // connection assuming the client can't keep up with the data rate. Default
+ // is available here too.
+ static constexpr size_t DefaultClientBufferSize = 16 * 1024 * 1024u;
+ void setClientBufferSize(size_t bytesToBuffer);
+ size_t clientBufferSize() const override {
+ return _clientBufferSize;
+ }
+
+ void setPerMessageDeflateEnabled(bool enabled);
+ bool getPerMessageDeflateEnabled() {
+ return _perMessageDeflateEnabled;
+ }
+
class Runnable {
public:
- virtual ~Runnable() {}
+ virtual ~Runnable() = default;
virtual void run() = 0;
};
- // Execute a task on the SeaSocks thread.
+ // Execute a task on the Seasocks thread.
void execute(std::shared_ptr<Runnable> runnable);
+ using Executable = std::function<void()>;
+ void execute(Executable toExecute);
private:
// From ServerImpl
virtual void remove(Connection* connection) override;
virtual bool subscribeToWriteEvents(Connection* connection) override;
virtual bool unsubscribeFromWriteEvents(Connection* connection) override;
- virtual const std::string& getStaticPath() const override { return _staticPath; }
+ virtual const std::string& getStaticPath() const override {
+ return _staticPath;
+ }
virtual std::shared_ptr<WebSocket::Handler> getWebSocketHandler(const char* endpoint) const override;
- virtual bool isCrossOriginAllowed(const std::string &endpoint) const override;
- virtual std::shared_ptr<Response> handle(const Request &request) override;
+ virtual bool isCrossOriginAllowed(const std::string& endpoint) const override;
+ virtual std::shared_ptr<Response> handle(const Request& request) override;
virtual std::string getStatsDocument() const override;
virtual void checkThread() const override;
+ virtual Server& server() override {
+ return *this;
+ }
bool makeNonBlocking(int fd) const;
bool configureSocket(int fd) const;
void handleAccept();
- std::shared_ptr<Runnable> popNextRunnable();
void processEventQueue();
+ void runExecutables();
void shutdown();
void checkAndDispatchEpoll(int epollMillis);
void handlePipe();
- enum NewState { KeepOpen, Close };
+ enum class NewState { KeepOpen,
+ Close };
NewState handleConnectionEvents(Connection* connection, uint32_t events);
// Connections, mapped to initial connection time.
@@ -148,8 +177,12 @@
int _eventFd;
int _maxKeepAliveDrops;
int _lameConnectionTimeoutSeconds;
+ size_t _clientBufferSize;
time_t _nextDeadConnectionCheck;
+ // Compression settings
+ bool _perMessageDeflateEnabled = false;
+
struct WebSocketHandlerEntry {
std::shared_ptr<WebSocket::Handler> handler;
bool allowCrossOrigin;
@@ -159,8 +192,8 @@
std::list<std::shared_ptr<PageHandler>> _pageHandlers;
- std::mutex _pendingRunnableMutex;
- std::list<std::shared_ptr<Runnable>> _pendingRunnables;
+ std::mutex _pendingExecutableMutex;
+ std::list<Executable> _pendingExecutables;
pid_t _threadId;
@@ -169,4 +202,4 @@
std::atomic<bool> _expectedTerminate;
};
-} // namespace seasocks
+} // namespace seasocks
diff --git a/third_party/seasocks/src/main/c/seasocks/ServerImpl.h b/third_party/seasocks/src/main/c/seasocks/ServerImpl.h
index e7dd46a..20b4780 100644
--- a/third_party/seasocks/src/main/c/seasocks/ServerImpl.h
+++ b/third_party/seasocks/src/main/c/seasocks/ServerImpl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -34,21 +34,24 @@
class Connection;
class Request;
class Response;
+class Server;
// Internal implementation used to give access to internals to Connections.
class ServerImpl {
public:
- virtual ~ServerImpl() {}
+ virtual ~ServerImpl() = default;
virtual void remove(Connection* connection) = 0;
virtual bool subscribeToWriteEvents(Connection* connection) = 0;
virtual bool unsubscribeFromWriteEvents(Connection* connection) = 0;
virtual const std::string& getStaticPath() const = 0;
virtual std::shared_ptr<WebSocket::Handler> getWebSocketHandler(const char* endpoint) const = 0;
- virtual bool isCrossOriginAllowed(const std::string &endpoint) const = 0;
- virtual std::shared_ptr<Response> handle(const Request &request) = 0;
+ virtual bool isCrossOriginAllowed(const std::string& endpoint) const = 0;
+ virtual std::shared_ptr<Response> handle(const Request& request) = 0;
virtual std::string getStatsDocument() const = 0;
virtual void checkThread() const = 0;
+ virtual Server& server() = 0;
+ virtual size_t clientBufferSize() const = 0;
};
}
diff --git a/third_party/seasocks/src/main/c/seasocks/SimpleResponse.h b/third_party/seasocks/src/main/c/seasocks/SimpleResponse.h
new file mode 100644
index 0000000..b627ca5
--- /dev/null
+++ b/third_party/seasocks/src/main/c/seasocks/SimpleResponse.h
@@ -0,0 +1,82 @@
+// Copyright (c) 2013-2017, Martin Charles
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include "seasocks/StreamingResponse.h"
+
+namespace seasocks {
+
+class SimpleResponse : public StreamingResponse {
+ ResponseCode _responseCode;
+ std::shared_ptr<std::istream> _stream;
+ const Headers _headers;
+ const bool _keepAlive;
+ const bool _flushInstantly;
+ const size_t _bufferSize;
+ const TransferEncoding _transferEncoding;
+
+public:
+ static constexpr size_t DefaultBufferSize = 16 * 1024 * 1024u;
+
+ SimpleResponse(ResponseCode responseCode, std::shared_ptr<std::istream> stream,
+ const Headers& headers, bool keepAlive = true, bool flushInstantly = false,
+ size_t bufferSize = DefaultBufferSize,
+ TransferEncoding transferEncoding = TransferEncoding::Raw)
+ : _responseCode(responseCode), _stream(stream), _headers(headers),
+ _keepAlive(keepAlive), _flushInstantly(flushInstantly),
+ _bufferSize(bufferSize), _transferEncoding(transferEncoding) {
+ }
+
+ virtual std::shared_ptr<std::istream> getStream() const override {
+ return _stream;
+ }
+
+ virtual Headers getHeaders() const override {
+ return _headers;
+ }
+
+ virtual ResponseCode responseCode() const override {
+ return _responseCode;
+ }
+
+ virtual bool keepConnectionAlive() const override {
+ return _keepAlive;
+ }
+
+ virtual bool flushInstantly() const override {
+ return _flushInstantly;
+ }
+
+ virtual size_t getBufferSize() const override {
+ return _bufferSize;
+ }
+
+ virtual TransferEncoding transferEncoding() const override {
+ return _transferEncoding;
+ }
+};
+
+}
diff --git a/third_party/seasocks/src/main/c/seasocks/StreamingResponse.cpp b/third_party/seasocks/src/main/c/seasocks/StreamingResponse.cpp
new file mode 100644
index 0000000..939b710
--- /dev/null
+++ b/third_party/seasocks/src/main/c/seasocks/StreamingResponse.cpp
@@ -0,0 +1,69 @@
+// Copyright (c) 2013-2017, Martin Charles
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+#include "seasocks/StreamingResponse.h"
+#include "seasocks/ToString.h"
+#include "seasocks/StringUtil.h"
+
+using namespace seasocks;
+
+void StreamingResponse::handle(std::shared_ptr<ResponseWriter> writer) {
+ writer->begin(responseCode(), transferEncoding());
+
+ auto headers = getHeaders();
+ for (auto& header : headers) {
+ writer->header(header.first, header.second);
+ }
+
+ std::shared_ptr<std::istream> stream = getStream();
+
+ auto bufSize = getBufferSize();
+ bool flush = flushInstantly();
+ std::unique_ptr<char[]> buffer(new char[bufSize]);
+
+ while (!closed) {
+ // blocks until buffer is full or eof is reached
+ stream->read(buffer.get(), bufSize);
+
+ bool isEof = stream->eof();
+ bool isGood = stream->good();
+ if (isGood || isEof) {
+ // everything is fine, push data to client
+ writer->payload(buffer.get(), stream->gcount(), flush);
+ }
+
+ if (!isGood) {
+ // EOF or error occured
+ // ignore the error since we can't access it
+ closed = true;
+ }
+ };
+
+ writer->finish(keepConnectionAlive());
+}
+
+void StreamingResponse::cancel() {
+ closed = true;
+}
diff --git a/third_party/seasocks/src/main/c/seasocks/StreamingResponse.h b/third_party/seasocks/src/main/c/seasocks/StreamingResponse.h
new file mode 100644
index 0000000..becd5e0
--- /dev/null
+++ b/third_party/seasocks/src/main/c/seasocks/StreamingResponse.h
@@ -0,0 +1,60 @@
+// Copyright (c) 2013-2017, Martin Charles
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include "seasocks/Response.h"
+#include "seasocks/ResponseWriter.h"
+#include "seasocks/TransferEncoding.h"
+
+#include <iosfwd>
+
+namespace seasocks {
+
+// A low level way to write create responses. This class doesn't meddle with or
+// assume anything based on the headers.
+class StreamingResponse : public Response {
+ bool closed = false;
+
+public:
+ virtual ~StreamingResponse() = default;
+ virtual void handle(std::shared_ptr<ResponseWriter> writer) override;
+ virtual void cancel() override;
+
+ virtual std::shared_ptr<std::istream> getStream() const = 0;
+
+ typedef std::multimap<std::string, std::string> Headers;
+ virtual Headers getHeaders() const = 0;
+
+ virtual ResponseCode responseCode() const = 0;
+
+ virtual bool keepConnectionAlive() const = 0;
+ virtual bool flushInstantly() const = 0;
+
+ virtual size_t getBufferSize() const = 0;
+ virtual TransferEncoding transferEncoding() const = 0;
+};
+
+}
diff --git a/third_party/seasocks/src/main/c/seasocks/StringUtil.h b/third_party/seasocks/src/main/c/seasocks/StringUtil.h
index 3109104..df2d38a 100644
--- a/third_party/seasocks/src/main/c/seasocks/StringUtil.h
+++ b/third_party/seasocks/src/main/c/seasocks/StringUtil.h
@@ -1,32 +1,33 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
#include <netinet/in.h>
+#include <ctime>
#include <string>
#include <vector>
@@ -35,6 +36,7 @@
char* skipWhitespace(char* str);
char* skipNonWhitespace(char* str);
char* shift(char*& str);
+std::string trimWhitespace(const std::string& str);
std::string getLastError();
std::string formatAddress(const sockaddr_in& address);
@@ -43,6 +45,11 @@
void replace(std::string& string, const std::string& find, const std::string& replace);
-bool caseInsensitiveSame(const std::string &lhs, const std::string &rhs);
+bool caseInsensitiveSame(const std::string& lhs, const std::string& rhs);
-} // namespace seasocks
+std::string webtime(time_t time);
+
+std::string now();
+
+
+} // namespace seasocks
diff --git a/third_party/seasocks/src/main/c/seasocks/SynchronousResponse.cpp b/third_party/seasocks/src/main/c/seasocks/SynchronousResponse.cpp
new file mode 100644
index 0000000..99ecf80
--- /dev/null
+++ b/third_party/seasocks/src/main/c/seasocks/SynchronousResponse.cpp
@@ -0,0 +1,67 @@
+// Copyright (c) 2013-2017, Matt Godbolt
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+#include "seasocks/SynchronousResponse.h"
+#include "seasocks/ToString.h"
+#include "seasocks/StringUtil.h"
+
+using namespace seasocks;
+
+void SynchronousResponse::handle(std::shared_ptr<ResponseWriter> writer) {
+ auto rc = responseCode();
+ if (!isOk(rc)) {
+ writer->error(rc, std::string(payload(), payloadSize()));
+ return;
+ }
+
+ writer->begin(responseCode());
+
+ writer->header("Content-Length", toString(payloadSize()));
+ writer->header("Content-Type", contentType());
+ writer->header("Connection", keepConnectionAlive() ? "keep-alive" : "close");
+ writer->header("Last-Modified", now());
+ writer->header("Pragma", "no-cache");
+
+ auto headers = getAdditionalHeaders();
+
+ if (headers.find("Cache-Control") == headers.end()) {
+ writer->header("Cache-Control", "no-store");
+ }
+
+ if (headers.find("Expires") == headers.end()) {
+ writer->header("Expires", now());
+ }
+
+ for (auto& header : headers) {
+ writer->header(header.first, header.second);
+ }
+
+ writer->payload(payload(), payloadSize());
+
+ writer->finish(keepConnectionAlive());
+}
+
+void SynchronousResponse::cancel() {
+}
diff --git a/third_party/seasocks/src/main/c/seasocks/SynchronousResponse.h b/third_party/seasocks/src/main/c/seasocks/SynchronousResponse.h
new file mode 100644
index 0000000..c145a48
--- /dev/null
+++ b/third_party/seasocks/src/main/c/seasocks/SynchronousResponse.h
@@ -0,0 +1,52 @@
+// Copyright (c) 2013-2017, Matt Godbolt
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include "seasocks/Response.h"
+#include "seasocks/ResponseWriter.h"
+
+namespace seasocks {
+
+class SynchronousResponse : public Response {
+public:
+ virtual ~SynchronousResponse() = default;
+ virtual void handle(std::shared_ptr<ResponseWriter> writer) override;
+ virtual void cancel() override;
+
+ virtual ResponseCode responseCode() const = 0;
+
+ virtual const char* payload() const = 0;
+ virtual size_t payloadSize() const = 0;
+
+ virtual std::string contentType() const = 0;
+
+ virtual bool keepConnectionAlive() const = 0;
+
+ typedef std::multimap<std::string, std::string> Headers;
+ virtual Headers getAdditionalHeaders() const = 0;
+};
+
+}
\ No newline at end of file
diff --git a/third_party/seasocks/src/main/c/seasocks/ToString.h b/third_party/seasocks/src/main/c/seasocks/ToString.h
index 40f607e..2ccb747 100644
--- a/third_party/seasocks/src/main/c/seasocks/ToString.h
+++ b/third_party/seasocks/src/main/c/seasocks/ToString.h
@@ -1,40 +1,59 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
#include <sstream>
#include <string>
+#include <type_traits>
namespace seasocks {
-template<typename T>
+template <typename T, typename std::enable_if<!std::is_integral<typename std::decay<T>::type>::value, int>::type = 0>
std::string toString(const T& obj) {
std::stringstream str;
+ str.imbue(std::locale("C"));
str << obj;
return str.str();
}
+template <typename T, typename std::enable_if<std::is_integral<typename std::decay<T>::type>::value, int>::type = 0>
+inline std::string toString(T&& value) {
+ return std::to_string(std::forward<T>(value));
+}
+
+inline std::string toString(const char* str) {
+ return str;
+}
+
+inline std::string toString(const std::string& str) {
+ return str;
+}
+
+inline std::string toString(char c) {
+ return std::string(1, c);
+}
+
}
diff --git a/third_party/seasocks/src/main/c/internal/Version.h b/third_party/seasocks/src/main/c/seasocks/TransferEncoding.h
similarity index 73%
rename from third_party/seasocks/src/main/c/internal/Version.h
rename to third_party/seasocks/src/main/c/seasocks/TransferEncoding.h
index 366f8ea..40b8abb 100644
--- a/third_party/seasocks/src/main/c/internal/Version.h
+++ b/third_party/seasocks/src/main/c/seasocks/TransferEncoding.h
@@ -1,31 +1,31 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
-#ifndef SEASOCKS_VERSION_STRING
-// This stops Eclipse freaking out as it doesn't know this is set on GCC command line.
-#define SEASOCKS_VERSION_STRING "SeaSocks/unversioned"
-#endif
\ No newline at end of file
+enum class TransferEncoding {
+ Raw,
+ Chunked
+};
diff --git a/third_party/seasocks/src/main/c/seasocks/WebSocket.h b/third_party/seasocks/src/main/c/seasocks/WebSocket.h
index f52509a..ef4e7e9 100644
--- a/third_party/seasocks/src/main/c/seasocks/WebSocket.h
+++ b/third_party/seasocks/src/main/c/seasocks/WebSocket.h
@@ -1,32 +1,33 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
#include "seasocks/Request.h"
+#include <string>
#include <vector>
namespace seasocks {
@@ -40,6 +41,14 @@
*/
virtual void send(const char* data) = 0;
/**
+ * Send the given text data. Must be called on the seasocks thread.
+ * See Server::execute for how to run work on the seasocks
+ * thread externally.
+ */
+ void send(const std::string& data) {
+ send(data.c_str());
+ }
+ /**
* Send the given binary data. Must be called on the seasocks thread.
* See Server::execute for how to run work on the seasocks
* thread externally.
@@ -57,7 +66,7 @@
*/
class Handler {
public:
- virtual ~Handler() { }
+ virtual ~Handler() = default;
/**
* Called on the seasocks thread during initial connection.
@@ -66,21 +75,30 @@
/**
* Called on the seasocks thread with upon receipt of a full text WebSocket message.
*/
- virtual void onData(WebSocket* connection, const char* data) {}
+ virtual void onData(WebSocket*, const char*) {
+ }
/**
* Called on the seasocks thread with upon receipt of a full binary WebSocket message.
*/
- virtual void onData(WebSocket* connection, const uint8_t* data, size_t length) {}
+ virtual void onData(WebSocket*, const uint8_t*, size_t) {
+ }
/**
* Called on the seasocks thread when the socket has been
*/
virtual void onDisconnect(WebSocket* connection) = 0;
+ /**
+ * Choose a protocol before accepting a connection: return < 0 to reject the connection, else return the ordinal
+ * in the vector of string protocols.
+ */
+ virtual ssize_t chooseProtocol(const std::vector<std::string>&) const {
+ return 0;
+ }
};
protected:
// To delete a WebSocket, just close it. It is owned by the Server, and
// the server will delete it when it's finished.
- virtual ~WebSocket() {}
+ virtual ~WebSocket() = default;
};
-} // namespace seasocks
+} // namespace seasocks
diff --git a/third_party/seasocks/src/main/c/seasocks/ZlibContext.cpp b/third_party/seasocks/src/main/c/seasocks/ZlibContext.cpp
new file mode 100644
index 0000000..8933d4d
--- /dev/null
+++ b/third_party/seasocks/src/main/c/seasocks/ZlibContext.cpp
@@ -0,0 +1,144 @@
+// Copyright (c) 2013-2017, Matt Godbolt
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+#include "seasocks/ZlibContext.h"
+
+#include <memory>
+#include <stdexcept>
+
+#include <zlib.h>
+
+namespace seasocks {
+
+struct ZlibContext::Impl {
+ z_stream deflateStream;
+ z_stream inflateStream;
+ bool streamsInitialised = false;
+ uint8_t buffer[16384];
+
+ Impl(int deflateBits, int inflateBits, int memLevel) {
+ int ret;
+
+ deflateStream.zalloc = Z_NULL;
+ deflateStream.zfree = Z_NULL;
+ deflateStream.opaque = Z_NULL;
+
+ ret = ::deflateInit2(
+ &deflateStream,
+ Z_DEFAULT_COMPRESSION,
+ Z_DEFLATED,
+ deflateBits * -1,
+ memLevel,
+ Z_DEFAULT_STRATEGY);
+
+ if (ret != Z_OK) {
+ throw std::runtime_error("error initialising zlib deflater");
+ }
+
+ inflateStream.zalloc = Z_NULL;
+ inflateStream.zfree = Z_NULL;
+ inflateStream.opaque = Z_NULL;
+ inflateStream.avail_in = 0;
+ inflateStream.next_in = Z_NULL;
+
+ ret = ::inflateInit2(
+ &inflateStream,
+ inflateBits * -1);
+
+ if (ret != Z_OK) {
+ ::deflateEnd(&deflateStream);
+ throw std::runtime_error("error initialising zlib inflater");
+ }
+
+ streamsInitialised = true;
+ }
+
+ ~Impl() {
+ if (!streamsInitialised)
+ return;
+ ::deflateEnd(&deflateStream);
+ ::inflateEnd(&inflateStream);
+ }
+
+ void deflate(const uint8_t* input, size_t inputLen, std::vector<uint8_t>& output) {
+ deflateStream.next_in = (unsigned char*) input;
+ deflateStream.avail_in = inputLen;
+
+ do {
+ deflateStream.next_out = buffer;
+ deflateStream.avail_out = sizeof(buffer);
+
+ (void) ::deflate(&deflateStream, Z_SYNC_FLUSH);
+
+ output.insert(output.end(), buffer, buffer + sizeof(buffer) - deflateStream.avail_out);
+ } while (deflateStream.avail_out == 0);
+
+ // Remove 4-byte tail end prior to transmission (see RFC 7692, section 7.2.1)
+ output.resize(output.size() - 4);
+ }
+
+ bool inflate(std::vector<uint8_t>& input, std::vector<uint8_t>& output, int& zlibError) {
+ // Append 4 octets prior to decompression (see RFC 7692, section 7.2.2)
+ uint8_t tail_end[4] = {0x00, 0x00, 0xff, 0xff};
+ input.insert(input.end(), tail_end, tail_end + 4);
+
+ inflateStream.next_in = input.data();
+ inflateStream.avail_in = input.size();
+
+ do {
+ inflateStream.next_out = buffer;
+ inflateStream.avail_out = sizeof(buffer);
+
+ int ret = ::inflate(&inflateStream, Z_SYNC_FLUSH);
+
+ if (ret != Z_OK && ret != Z_STREAM_END) {
+ zlibError = ret;
+ return false;
+ }
+
+ output.insert(output.end(), buffer, buffer + sizeof(buffer) - inflateStream.avail_out);
+ } while (inflateStream.avail_out == 0);
+
+ return true;
+ }
+};
+
+ZlibContext::ZlibContext() = default;
+
+ZlibContext::~ZlibContext() = default;
+
+void ZlibContext::initialise(int deflateBits, int inflateBits, int memLevel) {
+ _impl = std::make_unique<Impl>(deflateBits, inflateBits, memLevel);
+}
+
+void ZlibContext::deflate(const uint8_t* input, size_t inputLen, std::vector<uint8_t>& output) {
+ return _impl->deflate(input, inputLen, output);
+}
+
+bool ZlibContext::inflate(std::vector<uint8_t>& input, std::vector<uint8_t>& output, int& zlibError) {
+ return _impl->inflate(input, output, zlibError);
+}
+
+}
\ No newline at end of file
diff --git a/third_party/seasocks/src/main/c/seasocks/ZlibContext.h b/third_party/seasocks/src/main/c/seasocks/ZlibContext.h
new file mode 100644
index 0000000..6463dc9
--- /dev/null
+++ b/third_party/seasocks/src/main/c/seasocks/ZlibContext.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <cstdint>
+#include <cstdlib>
+#include <memory>
+#include <vector>
+
+namespace seasocks {
+
+class ZlibContext {
+public:
+ ZlibContext(const ZlibContext&) = delete;
+ ZlibContext& operator=(const ZlibContext&) = delete;
+
+ ZlibContext();
+ ~ZlibContext();
+ void initialise(int deflateBits = 15, int inflateBits = 15, int memLevel = 6);
+
+ void deflate(const uint8_t* input, size_t inputLen, std::vector<uint8_t>& output);
+
+ // WARNING: inflate() alters input
+ bool inflate(std::vector<uint8_t>& input, std::vector<uint8_t>& output, int& zlibError);
+
+private:
+ struct Impl;
+ std::unique_ptr<Impl> _impl;
+};
+
+} // namespace seasocks
diff --git a/third_party/seasocks/src/main/c/seasocks/ZlibContextDisabled.cpp b/third_party/seasocks/src/main/c/seasocks/ZlibContextDisabled.cpp
new file mode 100644
index 0000000..744d024
--- /dev/null
+++ b/third_party/seasocks/src/main/c/seasocks/ZlibContextDisabled.cpp
@@ -0,0 +1,53 @@
+// Copyright (c) 2013-2017, Matt Godbolt
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+#include "seasocks/ZlibContext.h"
+
+#include <stdexcept>
+
+namespace seasocks {
+
+struct ZlibContext::Impl {
+};
+
+ZlibContext::ZlibContext() {
+}
+
+ZlibContext::~ZlibContext() {
+}
+
+void ZlibContext::initialise(int, int, int) {
+ throw std::runtime_error("Not compiled with zlib support");
+}
+
+void ZlibContext::deflate(const uint8_t*, size_t, std::vector<uint8_t>&) {
+ throw std::runtime_error("Not compiled with zlib support");
+}
+
+bool ZlibContext::inflate(std::vector<uint8_t>&, std::vector<uint8_t>&, int&) {
+ throw std::runtime_error("Not compiled with zlib support");
+}
+
+}
\ No newline at end of file
diff --git a/third_party/seasocks/src/main/c/seasocks/util/CrackedUri.h b/third_party/seasocks/src/main/c/seasocks/util/CrackedUri.h
index 681ea42..85982c9 100644
--- a/third_party/seasocks/src/main/c/seasocks/util/CrackedUri.h
+++ b/third_party/seasocks/src/main/c/seasocks/util/CrackedUri.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
@@ -36,10 +36,14 @@
std::unordered_multimap<std::string, std::string> _queryParams;
public:
- CrackedUri(const std::string& uri);
+ explicit CrackedUri(const std::string& uri);
- const std::vector<std::string>& path() const { return _path; }
- const std::unordered_multimap<std::string, std::string> queryParams() const { return _queryParams; }
+ const std::vector<std::string>& path() const {
+ return _path;
+ }
+ const std::unordered_multimap<std::string, std::string> queryParams() const {
+ return _queryParams;
+ }
bool hasParam(const std::string& param) const;
diff --git a/third_party/seasocks/src/main/c/seasocks/util/CrackedUriPageHandler.h b/third_party/seasocks/src/main/c/seasocks/util/CrackedUriPageHandler.h
index cf8c362..4d6b32d 100644
--- a/third_party/seasocks/src/main/c/seasocks/util/CrackedUriPageHandler.h
+++ b/third_party/seasocks/src/main/c/seasocks/util/CrackedUriPageHandler.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
@@ -35,11 +35,11 @@
class CrackedUriPageHandler {
public:
- virtual ~CrackedUriPageHandler() {}
+ virtual ~CrackedUriPageHandler() = default;
virtual std::shared_ptr<Response> handle(const CrackedUri& uri, const Request& request) = 0;
- typedef std::shared_ptr<CrackedUriPageHandler> Ptr;
+ using Ptr = std::shared_ptr<CrackedUriPageHandler>;
};
}
diff --git a/third_party/seasocks/src/main/c/seasocks/util/Html.h b/third_party/seasocks/src/main/c/seasocks/util/Html.h
index 6b3e887..b74beb8 100644
--- a/third_party/seasocks/src/main/c/seasocks/util/Html.h
+++ b/third_party/seasocks/src/main/c/seasocks/util/Html.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
@@ -47,30 +47,33 @@
void append() {
}
- template<typename T, typename... Args>
- void append(const T& t, Args&& ...args) {
+ template <typename T, typename... Args>
+ void append(const T& t, Args&&... args) {
operator<<(t);
append(std::forward<Args>(args)...);
}
- Element() : _isTextNode(true), _needsClose(false) {}
+ Element()
+ : _isTextNode(true), _needsClose(false) {
+ }
+
public:
- template<typename... Args>
- Element(const std::string& name, bool needsClose, Args&&... args) :
- _isTextNode(false),
- _needsClose(needsClose),
- _nameOrText(name) {
+ template <typename... Args>
+ Element(const std::string& name, bool needsClose, Args&&... args)
+ : _isTextNode(false),
+ _needsClose(needsClose),
+ _nameOrText(name) {
append(std::forward<Args>(args)...);
}
- template<typename T>
+ template <typename T>
static Element textElement(const T& text) {
Element e;
e._nameOrText = toString(text);
return e;
}
- template<typename T>
+ template <typename T>
Element& addAttribute(const char* attr, const T& value) {
_attributes += std::string(" ") + attr + "=\"" + toString(value) + "\"";
return *this;
@@ -100,39 +103,39 @@
return addAttribute("id", id);
}
- Element& operator <<(const char* child) {
+ Element& operator<<(const char* child) {
_children.push_back(textElement(child));
return *this;
}
- Element& operator <<(const std::string& child) {
+ Element& operator<<(const std::string& child) {
_children.push_back(textElement(child));
return *this;
}
- Element& operator <<(const Element& child) {
+ Element& operator<<(const Element& child) {
_children.push_back(child);
return *this;
}
- template<class T>
+ template <class T>
typename std::enable_if<std::is_integral<T>::value || std::is_floating_point<T>::value, Element&>::type
- operator <<(const T& child) {
+ operator<<(const T& child) {
_children.push_back(textElement(child));
return *this;
}
- friend std::ostream& operator << (std::ostream& os, const Element& elem) {
+ friend std::ostream& operator<<(std::ostream& os, const Element& elem) {
if (elem._isTextNode) {
os << elem._nameOrText;
- for (auto it = elem._children.cbegin(); it != elem._children.cend(); ++it) {
- os << *it;
+ for (const auto& it : elem._children) {
+ os << it;
}
return os;
}
os << "<" << elem._nameOrText << elem._attributes << ">";
- for (auto it = elem._children.cbegin(); it != elem._children.cend(); ++it) {
- os << *it;
+ for (const auto& it : elem._children) {
+ os << it;
}
if (elem._needsClose) {
os << "</" << elem._nameOrText << ">";
@@ -140,7 +143,7 @@
return os;
}
- template<typename C, typename F>
+ template <typename C, typename F>
Element& addAll(const C& container, F functor) {
for (auto it = container.cbegin(); it != container.cend(); ++it) {
operator<<(functor(*it));
@@ -155,7 +158,11 @@
}
};
-#define HTMLELEM(XX) template<typename... Args> inline Element XX(Args&&... args) { return Element(#XX, true, std::forward<Args>(args)...); }
+#define HTMLELEM(XX) \
+ template <typename... Args> \
+ inline Element XX(Args&&... args) { \
+ return Element(#XX, true, std::forward<Args>(args)...); \
+ }
HTMLELEM(html)
HTMLELEM(head)
HTMLELEM(title)
@@ -180,27 +187,40 @@
HTMLELEM(button)
#undef HTMLELEM
-inline Element empty() { return Element::textElement(""); }
+inline Element empty() {
+ return Element::textElement("");
+}
-template<typename T>
-inline Element text(const T& t) { return Element::textElement(t); }
+template <typename T>
+inline Element text(const T& t) {
+ return Element::textElement(t);
+}
-inline Element img(const std::string& src) { return Element("img", false).addAttribute("src", src); }
+inline Element img(const std::string& src) {
+ return Element("img", false).addAttribute("src", src);
+}
-inline Element checkbox() { return Element("input", false).addAttribute("type", "checkbox"); }
+inline Element checkbox() {
+ return Element("input", false).addAttribute("type", "checkbox");
+}
-inline Element externalScript(const std::string& src) { return Element("script", true).addAttribute("src", src).addAttribute("type", "text/javascript"); }
+inline Element externalScript(const std::string& src) {
+ return Element("script", true).addAttribute("src", src).addAttribute("type", "text/javascript");
+}
-inline Element inlineScript(const std::string& script) { return Element("script", true, script).addAttribute("type", "text/javascript"); }
+inline Element inlineScript(const std::string& script) {
+ return Element("script", true, script).addAttribute("type", "text/javascript");
+}
inline Element link(const std::string& href, const std::string& rel) {
return Element("link", false).addAttribute("href", href).addAttribute("rel", rel);
}
-template<typename...Args> inline Element a(const std::string& href, Args&&... args) {
+template <typename... Args>
+inline Element a(const std::string& href, Args&&... args) {
return Element("a", true, std::forward<Args>(args)...).addAttribute("href", href);
}
-} // namespace html
+} // namespace html
-} // namespace seasocks
+} // namespace seasocks
diff --git a/third_party/seasocks/src/main/c/seasocks/util/Json.h b/third_party/seasocks/src/main/c/seasocks/util/Json.h
index c8a69dc..812e2d1 100644
--- a/third_party/seasocks/src/main/c/seasocks/util/Json.h
+++ b/third_party/seasocks/src/main/c/seasocks/util/Json.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
@@ -38,7 +38,8 @@
///////////////////////////////////
-inline void jsonToStream(std::ostream& str) {}
+inline void jsonToStream(std::ostream& /*str*/) {
+}
void jsonToStream(std::ostream& str, const char* t);
@@ -48,54 +49,52 @@
jsonToStream(str, t.c_str());
}
-template<typename O>
+template <typename O>
class is_jsonable {
- template<typename OO>
+ template <typename OO>
static auto test(int)
- -> decltype(&OO::jsonToStream, std::true_type());
+ -> decltype(&OO::jsonToStream, std::true_type());
- template<typename>
+ template <typename>
static auto test(...) -> std::false_type;
public:
static constexpr bool value = decltype(test<O>(0))::value;
};
-template<typename T>
+template <typename T>
class is_streamable {
- template<typename TT>
+ template <typename TT>
static auto test(int)
- -> decltype(std::declval<std::ostream&>() << std::declval<TT>(), std::true_type());
+ -> decltype(std::declval<std::ostream&>() << std::declval<TT>(), std::true_type());
- template<typename>
+ template <typename>
static auto test(...) -> std::false_type;
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
-template<typename T>
+template <typename T>
typename std::enable_if<std::is_fundamental<T>::value, void>::type
jsonToStream(std::ostream& str, const T& t) {
str << t;
}
-template<typename T>
+template <typename T>
typename std::enable_if<is_jsonable<T>::value, void>::type
jsonToStream(std::ostream& str, const T& t) {
t.jsonToStream(str);
}
-template<typename T>
+template <typename T>
typename std::enable_if<
- !std::is_fundamental<T>::value
- && is_streamable<T>::value
- && !is_jsonable<T>::value, void>::type
+ !std::is_fundamental<T>::value && is_streamable<T>::value && !is_jsonable<T>::value, void>::type
jsonToStream(std::ostream& str, const T& t) {
str << '"' << t << '"';
}
-template<typename T, typename ... Args>
+template <typename T, typename... Args>
void jsonToStream(std::ostream& str, const T& t, Args&&... args) {
static_assert(sizeof...(Args) > 0, "Cannot stream an object with no jsonToStream or operator<< method.");
jsonToStream(str, t);
@@ -105,27 +104,28 @@
///////////////////////////////////
-inline void jsonKeyPairToStream(std::ostream& str) {}
+inline void jsonKeyPairToStream(std::ostream& /*str*/) {
+}
-template<typename T>
+template <typename T>
void jsonKeyPairToStream(std::ostream& str, const char* key, const T& value) {
jsonToStream(str, key);
str << ":";
jsonToStream(str, value);
}
-template<typename T>
+template <typename T>
void jsonKeyPairToStream(std::ostream& str, const std::string& key, const T& value) {
jsonKeyPairToStream(str, key.c_str(), value);
}
-template<typename T>
-void jsonKeyPairToStream(std::ostream& str, const T&) {
- static_assert(!std::is_same<T, T>::value, // To make the assertion depend on T
- "Requires an even number of parameters. If you're trying to build a map from an existing std::map or similar, use makeMapFromContainer");
+template <typename T>
+void jsonKeyPairToStream(std::ostream&, const T&) {
+ static_assert(!std::is_same<T, T>::value, // To make the assertion depend on T
+ "Requires an even number of parameters. If you're trying to build a map from an existing std::map or similar, use makeMapFromContainer");
}
-template<typename K, typename V, typename... Args>
+template <typename K, typename V, typename... Args>
void jsonKeyPairToStream(std::ostream& str, const K& key, const V& value, Args&&... args) {
jsonKeyPairToStream(str, key, value);
str << ",";
@@ -133,10 +133,14 @@
}
struct JsonnedString : std::string {
- JsonnedString() {}
- JsonnedString(const std::string& s) : std::string(s) {}
- JsonnedString(const std::stringstream& str) : std::string(str.str()) {}
- void jsonToStream(std::ostream &o) const {
+ JsonnedString() = default;
+ JsonnedString(const std::string& s)
+ : std::string(s) {
+ }
+ JsonnedString(const std::stringstream& str)
+ : std::string(str.str()) {
+ }
+ void jsonToStream(std::ostream& o) const {
o << *this;
}
};
@@ -145,12 +149,14 @@
struct EpochTimeAsLocal {
time_t t;
- EpochTimeAsLocal(time_t t) : t(t) {}
- void jsonToStream(std::ostream &o) const;
+ EpochTimeAsLocal(time_t time)
+ : t(time) {
+ }
+ void jsonToStream(std::ostream& o) const;
};
static_assert(is_jsonable<EpochTimeAsLocal>::value, "Internal stream problem");
-template<typename... Args>
+template <typename... Args>
JsonnedString makeMap(Args&&... args) {
std::stringstream str;
str << '{';
@@ -159,13 +165,14 @@
return JsonnedString(str);
}
-template<typename T>
+template <typename T>
JsonnedString makeMapFromContainer(const T& m) {
std::stringstream str;
str << "{";
bool first = true;
- for (const auto &it : m) {
- if (!first) str << ",";
+ for (const auto& it : m) {
+ if (!first)
+ str << ",";
first = false;
jsonKeyPairToStream(str, it.first, it.second);
}
@@ -173,7 +180,7 @@
return JsonnedString(str);
}
-template<typename ... Args>
+template <typename... Args>
JsonnedString makeArray(Args&&... args) {
std::stringstream str;
str << '[';
@@ -182,12 +189,12 @@
return JsonnedString(str);
}
-template<typename T>
-JsonnedString makeArrayFromContainer(const T &list) {
+template <typename T>
+JsonnedString makeArrayFromContainer(const T& list) {
std::stringstream str;
str << '[';
bool first = true;
- for (const auto &s : list) {
+ for (const auto& s : list) {
if (!first) {
str << ',';
}
@@ -198,12 +205,12 @@
return JsonnedString(str);
}
-template<typename T>
-JsonnedString makeArray(const std::initializer_list<T> &list) {
+template <typename T>
+JsonnedString makeArray(const std::initializer_list<T>& list) {
std::stringstream str;
str << '[';
bool first = true;
- for (const auto &s : list) {
+ for (const auto& s : list) {
if (!first) {
str << ',';
}
@@ -214,7 +221,7 @@
return JsonnedString(str);
}
-template<typename ... Args>
+template <typename... Args>
JsonnedString makeExecString(const char* function, Args&&... args) {
std::stringstream str;
str << function << '(';
@@ -223,8 +230,8 @@
return JsonnedString(str);
}
-template<typename T>
-JsonnedString to_json(const T &obj) {
+template <typename T>
+JsonnedString to_json(const T& obj) {
std::stringstream str;
jsonToStream(str, obj);
return str.str();
diff --git a/third_party/seasocks/src/main/c/seasocks/util/PathHandler.h b/third_party/seasocks/src/main/c/seasocks/util/PathHandler.h
index 275f829..054e544 100644
--- a/third_party/seasocks/src/main/c/seasocks/util/PathHandler.h
+++ b/third_party/seasocks/src/main/c/seasocks/util/PathHandler.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
@@ -45,24 +45,30 @@
std::vector<CrackedUriPageHandler::Ptr> _handlers;
public:
- PathHandler(const std::string &path) : _path(path) {}
- template<typename... Args>
- PathHandler(const std::string &path, Args&&... args) : _path(path) {
+ PathHandler(const std::string& path)
+ : _path(path), _handlers() {
+ }
+ template <typename... Args>
+ PathHandler(const std::string& path, Args&&... args)
+ : _path(path), _handlers() {
addMany(std::forward<Args>(args)...);
}
CrackedUriPageHandler::Ptr add(const CrackedUriPageHandler::Ptr& handler);
- void addMany() {}
- void addMany(const CrackedUriPageHandler::Ptr& handler) { add(handler); }
- template<typename... Rest>
+ void addMany() {
+ }
+ void addMany(const CrackedUriPageHandler::Ptr& handler) {
+ add(handler);
+ }
+ template <typename... Rest>
void addMany(const CrackedUriPageHandler::Ptr& handler, Rest&&... rest) {
add(handler);
addMany(std::forward<Rest>(rest)...);
}
virtual std::shared_ptr<Response> handle(
- const CrackedUri& uri, const Request& request) override;
+ const CrackedUri& uri, const Request& request) override;
};
}
diff --git a/third_party/seasocks/src/main/c/seasocks/util/RootPageHandler.h b/third_party/seasocks/src/main/c/seasocks/util/RootPageHandler.h
index 2c2ce1a..7fa84c7 100644
--- a/third_party/seasocks/src/main/c/seasocks/util/RootPageHandler.h
+++ b/third_party/seasocks/src/main/c/seasocks/util/RootPageHandler.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#pragma once
diff --git a/third_party/seasocks/src/main/c/seasocks/util/StaticResponseHandler.h b/third_party/seasocks/src/main/c/seasocks/util/StaticResponseHandler.h
index ff6c5e7..61ef847 100644
--- a/third_party/seasocks/src/main/c/seasocks/util/StaticResponseHandler.h
+++ b/third_party/seasocks/src/main/c/seasocks/util/StaticResponseHandler.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include <seasocks/util/CrackedUriPageHandler.h>
@@ -37,11 +37,12 @@
public:
StaticResponseHandler(const std::string& path, std::shared_ptr<Response> response)
- : _path(path), _response(response) {}
+ : _path(path), _response(response) {
+ }
virtual std::shared_ptr<Response> handle(
- const CrackedUri& uri,
- const Request&) override {
+ const CrackedUri& uri,
+ const Request&) override {
if (uri.path().size() != 1 || uri.path()[0] != _path)
return Response::unhandled();
return _response;
diff --git a/third_party/seasocks/src/main/c/sha1/sha1.cpp b/third_party/seasocks/src/main/c/sha1/sha1.cpp
index 9a42766..33269c0 100644
--- a/third_party/seasocks/src/main/c/sha1/sha1.cpp
+++ b/third_party/seasocks/src/main/c/sha1/sha1.cpp
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
// DO NOT REFORMAT <- for tidy
@@ -66,7 +66,7 @@
#include "sha1.h"
-/*
+/*
* SHA1
*
* Description:
@@ -81,32 +81,11 @@
* Comments:
*
*/
-SHA1::SHA1()
-{
+SHA1::SHA1() {
Reset();
}
-/*
- * ~SHA1
- *
- * Description:
- * This is the destructor for the sha1 class
- *
- * Parameters:
- * None.
- *
- * Returns:
- * Nothing.
- *
- * Comments:
- *
- */
-SHA1::~SHA1()
-{
- // The destructor does nothing
-}
-
-/*
+/*
* Reset
*
* Description:
@@ -122,23 +101,22 @@
* Comments:
*
*/
-void SHA1::Reset()
-{
- Length_Low = 0;
- Length_High = 0;
+void SHA1::Reset() {
+ Length_Low = 0;
+ Length_High = 0;
Message_Block_Index = 0;
- H[0] = 0x67452301;
- H[1] = 0xEFCDAB89;
- H[2] = 0x98BADCFE;
- H[3] = 0x10325476;
- H[4] = 0xC3D2E1F0;
+ H[0] = 0x67452301;
+ H[1] = 0xEFCDAB89;
+ H[2] = 0x98BADCFE;
+ H[3] = 0x10325476;
+ H[4] = 0xC3D2E1F0;
- Computed = false;
- Corrupted = false;
+ Computed = false;
+ Corrupted = false;
}
-/*
+/*
* Result
*
* Description:
@@ -156,30 +134,26 @@
* Comments:
*
*/
-bool SHA1::Result(unsigned *message_digest_array)
-{
- int i; // Counter
+bool SHA1::Result(unsigned* message_digest_array) {
+ int i; // Counter
- if (Corrupted)
- {
+ if (Corrupted) {
return false;
}
- if (!Computed)
- {
+ if (!Computed) {
PadMessage();
Computed = true;
}
- for(i = 0; i < 5; i++)
- {
+ for (i = 0; i < 5; i++) {
message_digest_array[i] = H[i];
}
return true;
}
-/*
+/*
* Input
*
* Description:
@@ -197,38 +171,31 @@
* Comments:
*
*/
-void SHA1::Input( const unsigned char *message_array,
- unsigned length)
-{
- if (!length)
- {
+void SHA1::Input(const unsigned char* message_array,
+ unsigned length) {
+ if (!length) {
return;
}
- if (Computed || Corrupted)
- {
+ if (Computed || Corrupted) {
Corrupted = true;
return;
}
- while(length-- && !Corrupted)
- {
+ while (length-- && !Corrupted) {
Message_Block[Message_Block_Index++] = (*message_array & 0xFF);
Length_Low += 8;
- Length_Low &= 0xFFFFFFFF; // Force it to 32 bits
- if (Length_Low == 0)
- {
+ Length_Low &= 0xFFFFFFFF; // Force it to 32 bits
+ if (Length_Low == 0) {
Length_High++;
- Length_High &= 0xFFFFFFFF; // Force it to 32 bits
- if (Length_High == 0)
- {
- Corrupted = true; // Message is too long
+ Length_High &= 0xFFFFFFFF; // Force it to 32 bits
+ if (Length_High == 0) {
+ Corrupted = true; // Message is too long
}
}
- if (Message_Block_Index == 64)
- {
+ if (Message_Block_Index == 64) {
ProcessMessageBlock();
}
@@ -236,7 +203,7 @@
}
}
-/*
+/*
* Input
*
* Description:
@@ -256,13 +223,12 @@
* Comments:
*
*/
-void SHA1::Input( const char *message_array,
- unsigned length)
-{
- Input((unsigned char *) message_array, length);
+void SHA1::Input(const char* message_array,
+ unsigned length) {
+ Input((unsigned char*) message_array, length);
}
-/*
+/*
* Input
*
* Description:
@@ -278,12 +244,11 @@
* Comments:
*
*/
-void SHA1::Input(unsigned char message_element)
-{
+void SHA1::Input(unsigned char message_element) {
Input(&message_element, 1);
}
-/*
+/*
* Input
*
* Description:
@@ -299,12 +264,11 @@
* Comments:
*
*/
-void SHA1::Input(char message_element)
-{
- Input((unsigned char *) &message_element, 1);
+void SHA1::Input(char message_element) {
+ Input((unsigned char*) &message_element, 1);
}
-/*
+/*
* operator<<
*
* Description:
@@ -322,12 +286,10 @@
* Each character is assumed to hold 8 bits of information.
*
*/
-SHA1& SHA1::operator<<(const char *message_array)
-{
- const char *p = message_array;
+SHA1& SHA1::operator<<(const char* message_array) {
+ const char* p = message_array;
- while(*p)
- {
+ while (*p) {
Input(*p);
p++;
}
@@ -335,7 +297,7 @@
return *this;
}
-/*
+/*
* operator<<
*
* Description:
@@ -353,12 +315,10 @@
* Each character is assumed to hold 8 bits of information.
*
*/
-SHA1& SHA1::operator<<(const unsigned char *message_array)
-{
- const unsigned char *p = message_array;
+SHA1& SHA1::operator<<(const unsigned char* message_array) {
+ const unsigned char* p = message_array;
- while(*p)
- {
+ while (*p) {
Input(*p);
p++;
}
@@ -366,7 +326,7 @@
return *this;
}
-/*
+/*
* operator<<
*
* Description:
@@ -383,14 +343,13 @@
* The character is assumed to hold 8 bits of information.
*
*/
-SHA1& SHA1::operator<<(const char message_element)
-{
- Input((unsigned char *) &message_element, 1);
+SHA1& SHA1::operator<<(const char message_element) {
+ Input((unsigned char*) &message_element, 1);
return *this;
}
-/*
+/*
* operator<<
*
* Description:
@@ -407,14 +366,13 @@
* The character is assumed to hold 8 bits of information.
*
*/
-SHA1& SHA1::operator<<(const unsigned char message_element)
-{
+SHA1& SHA1::operator<<(const unsigned char message_element) {
Input(&message_element, 1);
return *this;
}
-/*
+/*
* ProcessMessageBlock
*
* Description:
@@ -433,33 +391,29 @@
* in the publication.
*
*/
-void SHA1::ProcessMessageBlock()
-{
- const unsigned K[] = { // Constants defined for SHA-1
- 0x5A827999,
- 0x6ED9EBA1,
- 0x8F1BBCDC,
- 0xCA62C1D6
- };
- int t; // Loop counter
- unsigned temp; // Temporary word value
- unsigned W[80]; // Word sequence
- unsigned A, B, C, D, E; // Word buffers
+void SHA1::ProcessMessageBlock() {
+ const unsigned K[] = {// Constants defined for SHA-1
+ 0x5A827999,
+ 0x6ED9EBA1,
+ 0x8F1BBCDC,
+ 0xCA62C1D6};
+ int t; // Loop counter
+ unsigned temp; // Temporary word value
+ unsigned W[80]; // Word sequence
+ unsigned A, B, C, D, E; // Word buffers
/*
* Initialize the first 16 words in the array W
*/
- for(t = 0; t < 16; t++)
- {
+ for (t = 0; t < 16; t++) {
W[t] = ((unsigned) Message_Block[t * 4]) << 24;
W[t] |= ((unsigned) Message_Block[t * 4 + 1]) << 16;
W[t] |= ((unsigned) Message_Block[t * 4 + 2]) << 8;
W[t] |= ((unsigned) Message_Block[t * 4 + 3]);
}
- for(t = 16; t < 80; t++)
- {
- W[t] = CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]);
+ for (t = 16; t < 80; t++) {
+ W[t] = CircularShift(1, W[t - 3] ^ W[t - 8] ^ W[t - 14] ^ W[t - 16]);
}
A = H[0];
@@ -468,47 +422,43 @@
D = H[3];
E = H[4];
- for(t = 0; t < 20; t++)
- {
- temp = CircularShift(5,A) + ((B & C) | ((~B) & D)) + E + W[t] + K[0];
+ for (t = 0; t < 20; t++) {
+ temp = CircularShift(5, A) + ((B & C) | ((~B) & D)) + E + W[t] + K[0];
temp &= 0xFFFFFFFF;
E = D;
D = C;
- C = CircularShift(30,B);
+ C = CircularShift(30, B);
B = A;
A = temp;
}
- for(t = 20; t < 40; t++)
- {
- temp = CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1];
+ for (t = 20; t < 40; t++) {
+ temp = CircularShift(5, A) + (B ^ C ^ D) + E + W[t] + K[1];
temp &= 0xFFFFFFFF;
E = D;
D = C;
- C = CircularShift(30,B);
+ C = CircularShift(30, B);
B = A;
A = temp;
}
- for(t = 40; t < 60; t++)
- {
- temp = CircularShift(5,A) +
+ for (t = 40; t < 60; t++) {
+ temp = CircularShift(5, A) +
((B & C) | (B & D) | (C & D)) + E + W[t] + K[2];
temp &= 0xFFFFFFFF;
E = D;
D = C;
- C = CircularShift(30,B);
+ C = CircularShift(30, B);
B = A;
A = temp;
}
- for(t = 60; t < 80; t++)
- {
- temp = CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3];
+ for (t = 60; t < 80; t++) {
+ temp = CircularShift(5, A) + (B ^ C ^ D) + E + W[t] + K[3];
temp &= 0xFFFFFFFF;
E = D;
D = C;
- C = CircularShift(30,B);
+ C = CircularShift(30, B);
B = A;
A = temp;
}
@@ -522,7 +472,7 @@
Message_Block_Index = 0;
}
-/*
+/*
* PadMessage
*
* Description:
@@ -543,36 +493,28 @@
* Comments:
*
*/
-void SHA1::PadMessage()
-{
+void SHA1::PadMessage() {
/*
* Check to see if the current message block is too small to hold
* the initial padding bits and length. If so, we will pad the
* block, process it, and then continue padding into a second block.
*/
- if (Message_Block_Index > 55)
- {
+ if (Message_Block_Index > 55) {
Message_Block[Message_Block_Index++] = 0x80;
- while(Message_Block_Index < 64)
- {
+ while (Message_Block_Index < 64) {
Message_Block[Message_Block_Index++] = 0;
}
ProcessMessageBlock();
- while(Message_Block_Index < 56)
- {
+ while (Message_Block_Index < 56) {
Message_Block[Message_Block_Index++] = 0;
}
- }
- else
- {
+ } else {
Message_Block[Message_Block_Index++] = 0x80;
- while(Message_Block_Index < 56)
- {
+ while (Message_Block_Index < 56) {
Message_Block[Message_Block_Index++] = 0;
}
-
}
/*
@@ -581,17 +523,17 @@
Message_Block[56] = (Length_High >> 24) & 0xFF;
Message_Block[57] = (Length_High >> 16) & 0xFF;
Message_Block[58] = (Length_High >> 8) & 0xFF;
- Message_Block[59] = (Length_High) & 0xFF;
+ Message_Block[59] = (Length_High) &0xFF;
Message_Block[60] = (Length_Low >> 24) & 0xFF;
Message_Block[61] = (Length_Low >> 16) & 0xFF;
Message_Block[62] = (Length_Low >> 8) & 0xFF;
- Message_Block[63] = (Length_Low) & 0xFF;
+ Message_Block[63] = (Length_Low) &0xFF;
ProcessMessageBlock();
}
-/*
+/*
* CircularShift
*
* Description:
@@ -609,7 +551,6 @@
* Comments:
*
*/
-unsigned SHA1::CircularShift(int bits, unsigned word)
-{
- return ((word << bits) & 0xFFFFFFFF) | ((word & 0xFFFFFFFF) >> (32-bits));
+unsigned SHA1::CircularShift(int bits, unsigned word) {
+ return ((word << bits) & 0xFFFFFFFF) | ((word & 0xFFFFFFFF) >> (32 - bits));
}
diff --git a/third_party/seasocks/src/main/c/sha1/sha1.h b/third_party/seasocks/src/main/c/sha1/sha1.h
index 3c7d896..c9d6b29 100644
--- a/third_party/seasocks/src/main/c/sha1/sha1.h
+++ b/third_party/seasocks/src/main/c/sha1/sha1.h
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
// DO NOT REFORMAT <- for tidy
@@ -50,65 +50,60 @@
#ifndef _SHA1_H_
#define _SHA1_H_
-class SHA1
-{
+class SHA1 {
- public:
+public:
+ SHA1();
- SHA1();
- virtual ~SHA1();
-
- /*
+ /*
* Re-initialize the class
*/
- void Reset();
+ void Reset();
- /*
+ /*
* Returns the message digest
*/
- bool Result(unsigned *message_digest_array);
+ bool Result(unsigned* message_digest_array);
- /*
+ /*
* Provide input to SHA1
*/
- void Input( const unsigned char *message_array,
- unsigned length);
- void Input( const char *message_array,
- unsigned length);
- void Input(unsigned char message_element);
- void Input(char message_element);
- SHA1& operator<<(const char *message_array);
- SHA1& operator<<(const unsigned char *message_array);
- SHA1& operator<<(const char message_element);
- SHA1& operator<<(const unsigned char message_element);
+ void Input(const unsigned char* message_array,
+ unsigned length);
+ void Input(const char* message_array,
+ unsigned length);
+ void Input(unsigned char message_element);
+ void Input(char message_element);
+ SHA1& operator<<(const char* message_array);
+ SHA1& operator<<(const unsigned char* message_array);
+ SHA1& operator<<(const char message_element);
+ SHA1& operator<<(const unsigned char message_element);
- private:
-
- /*
+private:
+ /*
* Process the next 512 bits of the message
*/
- void ProcessMessageBlock();
+ void ProcessMessageBlock();
- /*
+ /*
* Pads the current message block to 512 bits
*/
- void PadMessage();
+ void PadMessage();
- /*
+ /*
* Performs a circular left shift operation
*/
- inline unsigned CircularShift(int bits, unsigned word);
+ inline unsigned CircularShift(int bits, unsigned word);
- unsigned H[5]; // Message digest buffers
+ unsigned H[5]; // Message digest buffers
- unsigned Length_Low; // Message length in bits
- unsigned Length_High; // Message length in bits
+ unsigned Length_Low; // Message length in bits
+ unsigned Length_High; // Message length in bits
- unsigned char Message_Block[64]; // 512-bit message blocks
- int Message_Block_Index; // Index into message block array
+ unsigned char Message_Block[64]; // 512-bit message blocks
+ int Message_Block_Index; // Index into message block array
- bool Computed; // Is the digest computed?
- bool Corrupted; // Is the message digest corruped?
-
+ bool Computed; // Is the digest computed?
+ bool Corrupted; // Is the message digest corruped?
};
#endif
diff --git a/third_party/seasocks/src/main/c/util/CrackedUri.cpp b/third_party/seasocks/src/main/c/util/CrackedUri.cpp
index 1da757f..7f0b242 100644
--- a/third_party/seasocks/src/main/c/util/CrackedUri.cpp
+++ b/third_party/seasocks/src/main/c/util/CrackedUri.cpp
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "seasocks/StringUtil.h"
@@ -30,10 +30,10 @@
#include <sstream>
#include <stdexcept>
-#define THROW(stuff) \
- do {\
- std::ostringstream err; \
- err << stuff; \
+#define THROW(stuff) \
+ do { \
+ std::ostringstream err; \
+ err << stuff; \
throw std::runtime_error(err.str()); \
} while (0);
@@ -49,7 +49,9 @@
size_t pos = 0;
while (pos < uri.size()) {
pos = uri.find('%', pos);
- if (pos == uri.npos) break;
+ if (pos == std::string::npos) {
+ break;
+ }
if (pos + 2 > uri.size()) {
THROW("Truncated uri: '" << uri << "'");
}
@@ -74,7 +76,7 @@
auto endOfPath = uri.find('?');
std::string path;
std::string remainder;
- if (endOfPath == uri.npos) {
+ if (endOfPath == std::string::npos) {
path = uri.substr(1);
} else {
path = uri.substr(1, endOfPath - 1);
@@ -85,9 +87,11 @@
std::transform(_path.begin(), _path.end(), _path.begin(), unescape);
auto splitRemainder = split(remainder, '&');
- for (auto iter = splitRemainder.cbegin(); iter != splitRemainder.cend(); ++iter) {
- if (iter->empty()) continue;
- auto split = seasocks::split(*iter, '=');
+ for (const auto& iter : splitRemainder) {
+ if (iter.empty()) {
+ continue;
+ }
+ auto split = seasocks::split(iter, '=');
std::transform(split.begin(), split.end(), split.begin(), unescape);
if (split.size() == 1) {
_queryParams.insert(std::make_pair(split[0], std::string()));
@@ -110,8 +114,9 @@
std::vector<std::string> CrackedUri::allQueryParams(const std::string& param) const {
std::vector<std::string> params;
- for (auto iter = _queryParams.find(param); iter != _queryParams.end() && iter->first == param; ++iter)
+ for (auto iter = _queryParams.find(param); iter != _queryParams.end() && iter->first == param; ++iter) {
params.push_back(iter->second);
+ }
return params;
}
diff --git a/third_party/seasocks/src/main/c/util/Json.cpp b/third_party/seasocks/src/main/c/util/Json.cpp
index 48c74d7..7fcf64e 100644
--- a/third_party/seasocks/src/main/c/util/Json.cpp
+++ b/third_party/seasocks/src/main/c/util/Json.cpp
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "seasocks/util/Json.h"
@@ -33,23 +33,34 @@
str << '"';
for (; *t; ++t) {
switch (*t) {
- default:
- if (*t >= 32) {
+ default:
+ if (static_cast<unsigned char>(*t) >= 32) {
+ str << *t;
+ } else {
+ str << "\\u" << std::setw(4)
+ << std::setfill('0') << std::hex << static_cast<int>(*t);
+ }
+ break;
+ case 8:
+ str << "\\b";
+ break;
+ case 9:
+ str << "\\t";
+ break;
+ case 10:
+ str << "\\n";
+ break;
+ case 12:
+ str << "\\f";
+ break;
+ case 13:
+ str << "\\r";
+ break;
+ case '"':
+ case '\\':
+ str << '\\';
str << *t;
- } else {
- str << "\\u" << std::setw(4)
- << std::setfill('0') << std::hex << (int)*t;
- }
- break;
- case 8: str << "\\b"; break;
- case 9: str << "\\t"; break;
- case 10: str << "\\n"; break;
- case 12: str << "\\f"; break;
- case 13: str << "\\r"; break;
- case '"': case '\\':
- str << '\\';
- str << *t;
- break;
+ break;
}
}
str << '"';
@@ -59,7 +70,7 @@
str << (b ? "true" : "false");
}
-void EpochTimeAsLocal::jsonToStream(std::ostream &o) const {
+void EpochTimeAsLocal::jsonToStream(std::ostream& o) const {
o << "new Date(" << t * 1000 << ").toLocaleString()";
}
diff --git a/third_party/seasocks/src/main/c/util/PathHandler.cpp b/third_party/seasocks/src/main/c/util/PathHandler.cpp
index 4f9b60f..75a0f14 100644
--- a/third_party/seasocks/src/main/c/util/PathHandler.cpp
+++ b/third_party/seasocks/src/main/c/util/PathHandler.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -37,15 +37,19 @@
}
std::shared_ptr<Response> PathHandler::handle(
- const CrackedUri& uri, const Request& request) {
- const auto &path = uri.path();
- if (path.empty() || path[0] != _path) return Response::unhandled();
+ const CrackedUri& uri, const Request& request) {
+ const auto& path = uri.path();
+ if (path.empty() || path[0] != _path) {
+ return Response::unhandled();
+ }
auto shiftedUri = uri.shift();
- for (const auto &it : _handlers) {
+ for (const auto& it : _handlers) {
auto response = it->handle(shiftedUri, request);
- if (response != Response::unhandled()) return response;
+ if (response != Response::unhandled()) {
+ return response;
+ }
}
return Response::unhandled();
}
diff --git a/third_party/seasocks/src/main/c/util/RootPageHandler.cpp b/third_party/seasocks/src/main/c/util/RootPageHandler.cpp
index f6b4f52..b639654 100644
--- a/third_party/seasocks/src/main/c/util/RootPageHandler.cpp
+++ b/third_party/seasocks/src/main/c/util/RootPageHandler.cpp
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "seasocks/util/RootPageHandler.h"
@@ -31,11 +31,9 @@
using namespace seasocks;
-RootPageHandler::RootPageHandler() {
-}
+RootPageHandler::RootPageHandler() = default;
-RootPageHandler::~RootPageHandler() {
-}
+RootPageHandler::~RootPageHandler() = default;
CrackedUriPageHandler::Ptr RootPageHandler::add(const CrackedUriPageHandler::Ptr& handler) {
_handlers.emplace_back(handler);
@@ -44,9 +42,11 @@
std::shared_ptr<Response> RootPageHandler::handle(const Request& request) {
CrackedUri uri(request.getRequestUri());
- for (const auto &it : _handlers) {
+ for (const auto& it : _handlers) {
auto response = it->handle(uri, request);
- if (response != Response::unhandled()) return response;
+ if (response != Response::unhandled()) {
+ return response;
+ }
}
return Response::unhandled();
}
diff --git a/third_party/seasocks/src/main/web/CMakeLists.txt b/third_party/seasocks/src/main/web/CMakeLists.txt
new file mode 100644
index 0000000..2779890
--- /dev/null
+++ b/third_party/seasocks/src/main/web/CMakeLists.txt
@@ -0,0 +1,21 @@
+set(SCRIPT "${PROJECT_SOURCE_DIR}/scripts/gen_embedded.py")
+
+
+set(EMBEDDED_FILES
+ ${CMAKE_CURRENT_SOURCE_DIR}/_404.png
+ ${CMAKE_CURRENT_SOURCE_DIR}/_error.css
+ ${CMAKE_CURRENT_SOURCE_DIR}/_error.html
+ ${CMAKE_CURRENT_SOURCE_DIR}/favicon.ico
+ ${CMAKE_CURRENT_SOURCE_DIR}/_jquery.min.js
+ ${CMAKE_CURRENT_SOURCE_DIR}/_seasocks.css
+ ${CMAKE_CURRENT_SOURCE_DIR}/_stats.html
+)
+
+
+add_custom_command(OUTPUT Embedded.cpp
+ COMMAND ${PYTHON_BIN} ${SCRIPT} -o Embedded.cpp -f ${EMBEDDED_FILES}
+ COMMENT "Generating embedded content"
+ )
+add_library(embedded OBJECT Embedded.cpp)
+target_include_directories(embedded PUBLIC $<TARGET_PROPERTY:seasocks,INTERFACE_INCLUDE_DIRECTORIES>)
+set_property(TARGET embedded PROPERTY POSITION_INDEPENDENT_CODE TRUE)
diff --git a/third_party/seasocks/src/main/web/_error.html b/third_party/seasocks/src/main/web/_error.html
index ecf5e32..ccf730d 100644
--- a/third_party/seasocks/src/main/web/_error.html
+++ b/third_party/seasocks/src/main/web/_error.html
@@ -10,6 +10,6 @@
<div class="info">%%BODY%%</div>
</div>
- <div class="footer">Powered by <a href="https://github.com/mattgodbolt/seasocks">SeaSocks</a></div>
+ <div class="footer">Powered by <a href="https://github.com/mattgodbolt/seasocks">Seasocks</a></div>
</body>
</html>
diff --git a/third_party/seasocks/src/main/web/_stats.html b/third_party/seasocks/src/main/web/_stats.html
index d34e932..aec19c6 100644
--- a/third_party/seasocks/src/main/web/_stats.html
+++ b/third_party/seasocks/src/main/web/_stats.html
@@ -1,6 +1,6 @@
<html DOCTYPE=html>
<head>
- <title>SeaSocks Stats</title>
+ <title>Seasocks Stats</title>
<link href="/_seasocks.css" rel="stylesheet">
<script src="/_jquery.min.js" type="text/javascript"></script>
<script>
@@ -25,7 +25,7 @@
});
</script>
</head>
-<body><h1>SeaSocks Stats</h1></body>
+<body><h1>Seasocks Stats</h1></body>
<h2>Connections</h2>
<table id="cx">
diff --git a/third_party/seasocks/src/test/c/CMakeLists.txt b/third_party/seasocks/src/test/c/CMakeLists.txt
new file mode 100644
index 0000000..930eab8
--- /dev/null
+++ b/third_party/seasocks/src/test/c/CMakeLists.txt
@@ -0,0 +1,29 @@
+add_library(Catch INTERFACE)
+target_include_directories(Catch INTERFACE "catch")
+
+set(TESTS "AllTests")
+
+add_executable(AllTests
+ test_main.cpp
+ ConnectionTests.cpp
+ CrackedUriTests.cpp
+ HeaderMapTests.cpp
+ HtmlTests.cpp
+ HybiTests.cpp
+ JsonTests.cpp
+ MockServerImpl.h
+ ServerTests.cpp
+ ToStringTests.cpp
+ EmbeddedContentTests.cpp
+ ResponseBuilderTests.cpp
+ ResponseTests.cpp
+ StringUtilTests.cpp
+ )
+
+add_test(NAME ${TESTS} COMMAND ${TESTS})
+target_link_libraries(${TESTS} PRIVATE seasocks Catch)
+
+add_custom_target(unittest ${TESTS}
+ COMMENT "Running unittests\n\n"
+ VERBATIM
+ )
diff --git a/third_party/seasocks/src/test/c/ConnectionTests.cpp b/third_party/seasocks/src/test/c/ConnectionTests.cpp
index ee73681..bd0c537 100644
--- a/third_party/seasocks/src/test/c/ConnectionTests.cpp
+++ b/third_party/seasocks/src/test/c/ConnectionTests.cpp
@@ -1,89 +1,87 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "MockServerImpl.h"
#include "seasocks/Connection.h"
#include "seasocks/IgnoringLogger.h"
-#include <gmock/gmock.h>
+#include <catch2/catch.hpp>
#include <iostream>
#include <sstream>
-#include <string.h>
+#include <cstring>
#include <string>
using namespace seasocks;
-class TestHandler: public WebSocket::Handler {
+class TestHandler : public WebSocket::Handler {
public:
int _stage;
- TestHandler() :
- _stage(0) {
+ TestHandler()
+ : _stage(0) {
}
~TestHandler() {
if (_stage != 2) {
- ADD_FAILURE() << "Invalid state";
+ FAIL("Invalid state");
}
}
- virtual void onConnect(WebSocket*) {
+ virtual void onConnect(WebSocket*) override {
}
- virtual void onData(WebSocket*, const char* data) {
+ virtual void onData(WebSocket*, const char* data) override {
if (_stage == 0) {
- ASSERT_STREQ(data, "a");
+ CHECK(strcmp(data, "a") == 0);
} else if (_stage == 1) {
- ASSERT_STREQ(data, "b");
+ CHECK(strcmp(data, "b") == 0);
} else {
- FAIL() << "unexpected state";
+ FAIL("unexpected state");
}
++_stage;
}
- virtual void onDisconnect(WebSocket*) {
+ virtual void onDisconnect(WebSocket*) override {
}
};
-TEST(ConnectionTests, shouldBreakHixieMessagesApartInSameBuffer) {
- sockaddr_in addr = { AF_INET, 0x1234, { 0x01020304 } };
- std::shared_ptr<Logger> logger(new IgnoringLogger);
- testing::NiceMock<MockServerImpl> mockServer;
+TEST_CASE("Connection tests", "[ConnectionTests]") {
+ sockaddr_in addr;
+ addr.sin_family = AF_INET;
+ addr.sin_port = 0x1234;
+ addr.sin_addr.s_addr = 0x01020304;
+ auto logger = std::make_shared<IgnoringLogger>();
+ MockServerImpl mockServer;
Connection connection(logger, mockServer, -1, addr);
- connection.setHandler(
- std::shared_ptr<WebSocket::Handler>(new TestHandler));
- uint8_t foo[] = { 0x00, 'a', 0xff, 0x00, 'b', 0xff };
- connection.getInputBuffer().assign(&foo[0], &foo[sizeof(foo)]);
- connection.handleHixieWebSocket();
- SUCCEED();
-}
-TEST(ConnectionTests, shouldAcceptMultipleConnectionTypes) {
- sockaddr_in addr = { AF_INET, 0x1234, { 0x01020304 } };
- std::shared_ptr<Logger> logger(new IgnoringLogger);
- testing::NiceMock<MockServerImpl> mockServer;
- Connection connection(logger, mockServer, -1, addr);
- const uint8_t message[] = "GET /ws-test HTTP/1.1\r\nConnection: keep-alive, Upgrade\r\nUpgrade: websocket\r\n\r\n";
- connection.getInputBuffer().assign(&message[0], &message[sizeof(message)]);
- EXPECT_CALL(mockServer, getWebSocketHandler(testing::StrEq("/ws-test")))
- .WillOnce(testing::Return(std::shared_ptr<WebSocket::Handler>()));
- connection.handleNewData();
+ SECTION("should break hixie messages apart in same buffer") {
+ connection.setHandler(std::make_shared<TestHandler>());
+ uint8_t foo[] = {0x00, 'a', 0xff, 0x00, 'b', 0xff};
+ connection.getInputBuffer().assign(&foo[0], &foo[sizeof(foo)]);
+ connection.handleHixieWebSocket();
+ }
+ SECTION("shouldAcceptMultipleConnectionTypes") {
+ const uint8_t message[] = "GET /ws-test HTTP/1.1\r\nConnection: keep-alive, Upgrade\r\nUpgrade: websocket\r\n\r\n";
+ connection.getInputBuffer().assign(&message[0], &message[sizeof(message)]);
+ mockServer.handlers["/ws-test"] = std::shared_ptr<WebSocket::Handler>();
+ connection.handleNewData();
+ }
}
diff --git a/third_party/seasocks/src/test/c/CrackedUriTests.cpp b/third_party/seasocks/src/test/c/CrackedUriTests.cpp
index a9243f6..c46b62e 100644
--- a/third_party/seasocks/src/test/c/CrackedUriTests.cpp
+++ b/third_party/seasocks/src/test/c/CrackedUriTests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -24,124 +24,123 @@
// POSSIBILITY OF SUCH DAMAGE.
#include "seasocks/util/CrackedUri.h"
+#include <algorithm>
-#include <gmock/gmock.h>
+#include <catch2/catch.hpp>
-using namespace testing;
using namespace seasocks;
-using namespace std;
namespace {
-TEST(CrackedUriTests, shouldHandleRoot) {
+TEST_CASE("shouldHandleRoot", "[CrackedUriTests]") {
CrackedUri uri("/");
- EXPECT_EQ(vector<string>(), uri.path());
- EXPECT_TRUE(uri.queryParams().empty());
+ CHECK(uri.path() == std::vector<std::string>());
+ CHECK(uri.queryParams().empty());
}
-TEST(CrackedUriTests, shouldHandleTopLevel) {
+TEST_CASE("shouldHandleTopLevel", "[CrackedUriTests]") {
CrackedUri uri("/monkey");
- vector<string> expected = { "monkey" };
- EXPECT_EQ(expected, uri.path());
- EXPECT_TRUE(uri.queryParams().empty());
+ std::vector<std::string> expected = {"monkey"};
+ CHECK(uri.path() == expected);
+ CHECK(uri.queryParams().empty());
}
-TEST(CrackedUriTests, shouldHandleSimplePaths) {
+TEST_CASE("shouldHandleSimplePaths", "[CrackedUriTests]") {
CrackedUri uri("/foo/bar/baz/bungo");
- vector<string> expected = { "foo", "bar", "baz", "bungo" };
- EXPECT_EQ(expected, uri.path());
- EXPECT_TRUE(uri.queryParams().empty());
+ std::vector<std::string> expected = {"foo", "bar", "baz", "bungo"};
+ CHECK(uri.path() == expected);
+ CHECK(uri.queryParams().empty());
}
-TEST(CrackedUriTests, shouldTreatTrailingSlashAsNewPage) {
+TEST_CASE("shouldTreatTrailingSlashAsNewPage", "[CrackedUriTests]") {
CrackedUri uri("/ooh/a/directory/");
- vector<string> expected = { "ooh", "a", "directory", "" };
- EXPECT_EQ(expected, uri.path());
- EXPECT_TRUE(uri.queryParams().empty());
+ std::vector<std::string> expected = {"ooh", "a", "directory", ""};
+ CHECK(uri.path() == expected);
+ CHECK(uri.queryParams().empty());
}
-TEST(CrackedUriTests, shouldHandleRootWithQuery) {
+TEST_CASE("shouldHandleRootWithQuery", "[CrackedUriTests]") {
CrackedUri uri("/?a=spotch");
- EXPECT_EQ(vector<string>(), uri.path());
- ASSERT_FALSE(uri.queryParams().empty());
- EXPECT_TRUE(uri.hasParam("a"));
- EXPECT_EQ("spotch", uri.queryParam("a"));
+ CHECK(uri.path() == std::vector<std::string>());
+ REQUIRE_FALSE(uri.queryParams().empty());
+ CHECK(uri.hasParam("a"));
+ CHECK(uri.queryParam("a") == "spotch");
}
-TEST(CrackedUriTests, shouldHonorDefaults) {
+TEST_CASE("shouldHonorDefaults", "[CrackedUriTests]") {
CrackedUri uri("/?a=spotch");
- EXPECT_EQ("monkey", uri.queryParam("notThere", "monkey"));
+ CHECK(uri.queryParam("notThere", "monkey") == "monkey");
}
-TEST(CrackedUriTests, shouldHandleEmptyParams) {
+TEST_CASE("shouldHandleEmptyParams", "[CrackedUriTests]") {
CrackedUri uri("/?a&b&c");
- EXPECT_EQ("", uri.queryParam("a", "notEmptyDefault"));
- EXPECT_EQ("", uri.queryParam("b", "notEmptyDefault"));
- EXPECT_EQ("", uri.queryParam("c", "notEmptyDefault"));
+ CHECK(uri.queryParam("a", "notEmptyDefault") == "");
+ CHECK(uri.queryParam("b", "notEmptyDefault") == "");
+ CHECK(uri.queryParam("c", "notEmptyDefault") == "");
}
-TEST(CrackedUriTests, shouldHandleDuplicateParams) {
+TEST_CASE("shouldHandleDuplicateParams", "[CrackedUriTests]") {
CrackedUri uri("/?a=a&q=10&q=5&z=yibble&q=100&q=blam");
- vector<string> expected = { "10", "5", "100", "blam" };
+ std::vector<std::string> expected = {"10", "5", "100", "blam"};
sort(expected.begin(), expected.end());
auto params = uri.allQueryParams("q");
sort(params.begin(), params.end());
- EXPECT_EQ(expected, params);
+ CHECK(params == expected);
}
-TEST(CrackedUriTests, shouldHandlePathWithQuery) {
+TEST_CASE("shouldHandlePathWithQuery", "[CrackedUriTests]") {
CrackedUri uri("/badger/badger/badger/mushroom?q=snake");
- vector<string> expected = { "badger", "badger", "badger", "mushroom" };
- EXPECT_EQ(expected, uri.path());
- ASSERT_FALSE(uri.queryParams().empty());
- EXPECT_TRUE(uri.hasParam("q"));
- EXPECT_EQ("snake", uri.queryParam("q"));
+ std::vector<std::string> expected = {"badger", "badger", "badger", "mushroom"};
+ CHECK(uri.path() == expected);
+ REQUIRE_FALSE(uri.queryParams().empty());
+ CHECK(uri.hasParam("q"));
+ CHECK(uri.queryParam("q") == "snake");
}
-TEST(CrackedUriTests, shouldUnescapePaths) {
+TEST_CASE("shouldUnescapePaths", "[CrackedUriTests]") {
CrackedUri uri("/foo+bar/baz%2f/%40%4F");
- vector<string> expected = { "foo bar", "baz/", "@O" };
- EXPECT_EQ(expected, uri.path());
+ std::vector<std::string> expected = {"foo bar", "baz/", "@O"};
+ CHECK(uri.path() == expected);
}
-TEST(CrackedUriTests, shouldUnescapeQueries) {
+TEST_CASE("shouldUnescapeQueries", "[CrackedUriTests]") {
CrackedUri uri("/?q=a+b&t=%20%20&p=%41");
- EXPECT_EQ("a b", uri.queryParam("q"));
- EXPECT_EQ(" ", uri.queryParam("t"));
- EXPECT_EQ("A", uri.queryParam("p"));
+ CHECK(uri.queryParam("q") == "a b");
+ CHECK(uri.queryParam("t") == " ");
+ CHECK(uri.queryParam("p") == "A");
}
-TEST(CrackedUriTests, shouldThrowOnRubbish) {
- EXPECT_THROW(CrackedUri(""), exception);
- EXPECT_THROW(CrackedUri("rubbish"), exception);
- EXPECT_THROW(CrackedUri("../../.."), exception);
- EXPECT_THROW(CrackedUri("/?a===b"), exception);
- EXPECT_THROW(CrackedUri("/%"), exception);
- EXPECT_THROW(CrackedUri("/%a"), exception);
- EXPECT_THROW(CrackedUri("/%qq"), exception);
+TEST_CASE("shouldThrowOnRubbish", "[CrackedUriTests]") {
+ CHECK_THROWS(CrackedUri(""));
+ CHECK_THROWS(CrackedUri("rubbish"));
+ CHECK_THROWS(CrackedUri("../../.."));
+ CHECK_THROWS(CrackedUri("/?a===b"));
+ CHECK_THROWS(CrackedUri("/%"));
+ CHECK_THROWS(CrackedUri("/%a"));
+ CHECK_THROWS(CrackedUri("/%qq"));
}
-TEST(CrackedUriTests, shouldShift) {
+TEST_CASE("shouldShift", "[CrackedUriTests]") {
CrackedUri uri("/a/b/c.html");
- vector<string> expected1 = {"a", "b", "c.html"};
- EXPECT_EQ(expected1, uri.path());
+ std::vector<std::string> expected1 = {"a", "b", "c.html"};
+ CHECK(uri.path() == expected1);
uri = uri.shift();
- vector<string> expected2 = {"b", "c.html"};
- EXPECT_EQ(expected2, uri.path());
+ std::vector<std::string> expected2 = {"b", "c.html"};
+ CHECK(uri.path() == expected2);
uri = uri.shift();
- vector<string> expected3 = {"c.html"};
- EXPECT_EQ(expected3, uri.path());
+ std::vector<std::string> expected3 = {"c.html"};
+ CHECK(uri.path() == expected3);
uri = uri.shift();
- vector<string> expected4 = {""};
- EXPECT_EQ(expected4, uri.path());
+ std::vector<std::string> expected4 = {""};
+ CHECK(uri.path() == expected4);
uri = uri.shift();
- EXPECT_EQ(expected4, uri.path());
+ CHECK(uri.path() == expected4);
}
}
diff --git a/third_party/seasocks/src/test/c/EmbeddedContentTests.cpp b/third_party/seasocks/src/test/c/EmbeddedContentTests.cpp
new file mode 100644
index 0000000..b539c57
--- /dev/null
+++ b/third_party/seasocks/src/test/c/EmbeddedContentTests.cpp
@@ -0,0 +1,24 @@
+
+#include "internal/Embedded.h"
+#include <catch2/catch.hpp>
+
+TEST_CASE("findEmbeddedContent returns nullptr if not found", "[EmbeddedContentTests]") {
+ const auto* content = findEmbeddedContent("/not-included");
+ CHECK(content == nullptr);
+}
+
+TEST_CASE("generated content not empty", "[EmbeddedContentTests]") {
+ const auto* content = findEmbeddedContent("/_404.png");
+ CHECK(content != nullptr);
+ CHECK(content->length > 0);
+}
+
+TEST_CASE("all files generated", "[EmbeddedContentTests]") {
+ CHECK(findEmbeddedContent("/_404.png") != nullptr);
+ CHECK(findEmbeddedContent("/_error.css") != nullptr);
+ CHECK(findEmbeddedContent("/_error.html") != nullptr);
+ CHECK(findEmbeddedContent("/favicon.ico") != nullptr);
+ CHECK(findEmbeddedContent("/_jquery.min.js") != nullptr);
+ CHECK(findEmbeddedContent("/_seasocks.css") != nullptr);
+ CHECK(findEmbeddedContent("/_stats.html") != nullptr);
+}
diff --git a/third_party/seasocks/src/test/c/HeaderMapTests.cpp b/third_party/seasocks/src/test/c/HeaderMapTests.cpp
index a889739..c9e48f1 100644
--- a/third_party/seasocks/src/test/c/HeaderMapTests.cpp
+++ b/third_party/seasocks/src/test/c/HeaderMapTests.cpp
@@ -1,49 +1,43 @@
#include "internal/HeaderMap.h"
-
#include "internal/Config.h"
-
-#include <gmock/gmock.h>
+#include <catch2/catch.hpp>
using namespace seasocks;
namespace {
-void emplace(HeaderMap &map, const char *header, const char *value) {
-#if HAVE_UNORDERED_MAP_EMPLACE
+void emplace(HeaderMap& map, const char* header, const char* value) {
map.emplace(header, value);
-#else
- map.insert(std::make_pair(header, value));
-#endif
}
-TEST(HeaderMapTests, shouldConstruct) {
+TEST_CASE("shouldConstruct", "[HeaderMapTests]") {
HeaderMap map;
- EXPECT_TRUE(map.empty());
+ CHECK(map.empty());
}
-TEST(HeaderMapTests, shouldStoreAndRetrieve) {
+TEST_CASE("shouldStoreAndRetrieve", "[HeaderMapTests]") {
HeaderMap map;
emplace(map, "Foo", "Bar");
- EXPECT_EQ(1, map.size());
- EXPECT_EQ("Bar", map.at("Foo"));
+ CHECK(map.size() == 1);
+ CHECK(map.at("Foo") == "Bar");
emplace(map, "Baz", "Moo");
- EXPECT_EQ(2, map.size());
- EXPECT_EQ("Bar", map.at("Foo"));
- EXPECT_EQ("Moo", map.at("Baz"));
+ CHECK(map.size() == 2);
+ CHECK(map.at("Foo") == "Bar");
+ CHECK(map.at("Baz") == "Moo");
}
-TEST(HeaderMapTests, shouldBeCaseInsensitive) {
+TEST_CASE("shouldBeCaseInsensitive", "[HeaderMapTests]") {
HeaderMap map;
emplace(map, "Foo", "Bar");
- EXPECT_EQ("Bar", map.at("FOO"));
- EXPECT_EQ("Bar", map.at("foO"));
+ CHECK(map.at("FOO") == "Bar");
+ CHECK(map.at("foO") == "Bar");
}
-TEST(HeaderMapTests, shouldPreserveOriginalCase) {
+TEST_CASE("shouldPreserveOriginalCase", "[HeaderMapTests]") {
HeaderMap map;
emplace(map, "Foo", "Bar");
auto it = map.find("Foo");
- EXPECT_EQ("Foo", it->first);
+ CHECK(it->first == "Foo");
}
}
diff --git a/third_party/seasocks/src/test/c/HtmlTests.cpp b/third_party/seasocks/src/test/c/HtmlTests.cpp
index 1df7156..2229c74 100644
--- a/third_party/seasocks/src/test/c/HtmlTests.cpp
+++ b/third_party/seasocks/src/test/c/HtmlTests.cpp
@@ -1,74 +1,78 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "seasocks/util/Html.h"
-#include <gmock/gmock.h>
+#include <catch2/catch.hpp>
using namespace seasocks;
using namespace seasocks::html;
-TEST(HtmlTests, shouldRenderASimpleDocument) {
+TEST_CASE("shouldRenderASimpleDocument", "[HtmlTests]") {
auto document = html::html(head(title("Hello")), body(h1("A header"), "This is a document"));
- EXPECT_EQ("<html><head><title>Hello</title></head><body><h1>A header</h1>This is a document</body></html>", document.str());
+ CHECK(document.str() == "<html><head><title>Hello</title></head><body><h1>A header</h1>This is a document</body></html>");
}
-TEST(HtmlTests, shouldAllowAppending) {
+TEST_CASE("shouldAllowAppending", "[HtmlTests]") {
auto list = ul();
list << li("Element 1") << li("Element 2");
- EXPECT_EQ("<ul><li>Element 1</li><li>Element 2</li></ul>", list.str());
+ CHECK(list.str() == "<ul><li>Element 1</li><li>Element 2</li></ul>");
}
-TEST(HtmlTests, shouldAllowCommaSeparation) {
+TEST_CASE("shouldAllowCommaSeparation", "[HtmlTests]") {
auto list = ul(li("Element 1"), li("Element 2"));
- EXPECT_EQ("<ul><li>Element 1</li><li>Element 2</li></ul>", list.str());
+ CHECK(list.str() == "<ul><li>Element 1</li><li>Element 2</li></ul>");
}
-TEST(HtmlTests, shouldHandleAttributes) {
+TEST_CASE("shouldHandleAttributes", "[HtmlTests]") {
auto elem = span("Some text").clazz("class");
- EXPECT_EQ("<span class=\"class\">Some text</span>", elem.str());
+ CHECK(elem.str() == "<span class=\"class\">Some text</span>");
}
-TEST(HtmlTests, shouldAppendLikeAStreamFromEmpty) {
+TEST_CASE("shouldAppendLikeAStreamFromEmpty", "[HtmlTests]") {
auto elem = empty() << "Text " << 1 << ' ' << 10.23;
- EXPECT_EQ("Text 1 10.23", elem.str());
+ CHECK(elem.str() == "Text 1 10.23");
}
-TEST(HtmlTests, shouldNotNeedExtraMarkupForTextNodes) {
+TEST_CASE("shouldAppendLikeAStreamFromEmptyWithSingleInt", "[HtmlTests]") {
+ auto elem = empty() << 1;
+ CHECK(elem.str() == "1");
+}
+
+TEST_CASE("shouldNotNeedExtraMarkupForTextNodes", "[HtmlTests]") {
auto elem = text("This ") << text("is") << text(" a test") << ".";
- EXPECT_EQ("This is a test.", elem.str());
+ CHECK(elem.str() == "This is a test.");
}
-TEST(HtmlTests, shouldWorkWithAnchors) {
+TEST_CASE("shouldWorkWithAnchors", "[HtmlTests]") {
auto elem = a("http://google.com/?q=badgers", div(span("foo")));
- EXPECT_EQ("<a href=\"http://google.com/?q=badgers\"><div><span>foo</span></div></a>", elem.str());
+ CHECK(elem.str() == "<a href=\"http://google.com/?q=badgers\"><div><span>foo</span></div></a>");
}
-TEST(HtmlTests, shouldAddAll) {
- std::vector<std::string> strings = { "Hi", "Moo", "Foo" };
+TEST_CASE("shouldAddAll", "[HtmlTests]") {
+ std::vector<std::string> strings = {"Hi", "Moo", "Foo"};
auto list = ul().addAll(strings, [](const std::string& s) { return li(s); });
- EXPECT_EQ("<ul><li>Hi</li><li>Moo</li><li>Foo</li></ul>", list.str());
-
+ CHECK(list.str() == "<ul><li>Hi</li><li>Moo</li><li>Foo</li></ul>");
}
diff --git a/third_party/seasocks/src/test/c/HybiTests.cpp b/third_party/seasocks/src/test/c/HybiTests.cpp
index ab270eb..0be6ab2 100644
--- a/third_party/seasocks/src/test/c/HybiTests.cpp
+++ b/third_party/seasocks/src/test/c/HybiTests.cpp
@@ -1,26 +1,26 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "internal/HybiAccept.h"
@@ -28,11 +28,11 @@
#include "seasocks/IgnoringLogger.h"
-#include <gmock/gmock.h>
+#include <catch2/catch.hpp>
#include <iostream>
#include <sstream>
-#include <string.h>
+#include <cstring>
#include <string>
using namespace seasocks;
@@ -40,16 +40,16 @@
static IgnoringLogger ignore;
void testSingleString(
- HybiPacketDecoder::MessageState expectedState,
- const char* expectedPayload,
- const std::vector<uint8_t>& v,
- uint32_t size = 0) {
+ HybiPacketDecoder::MessageState expectedState,
+ const char* expectedPayload,
+ const std::vector<uint8_t>& v,
+ uint32_t size = 0) {
HybiPacketDecoder decoder(ignore, v);
std::vector<uint8_t> decoded;
- ASSERT_EQ(expectedState, decoder.decodeNextMessage(decoded));
- ASSERT_EQ(expectedPayload, std::string(reinterpret_cast<const char*>(&decoded[0]), decoded.size()));
- ASSERT_EQ(HybiPacketDecoder::NoMessage, decoder.decodeNextMessage(decoded));
- ASSERT_EQ(size ? size : v.size(), decoder.numBytesDecoded());
+ CHECK(decoder.decodeNextMessage(decoded) == expectedState);
+ CHECK(std::string(reinterpret_cast<const char*>(&decoded[0]), decoded.size()) == expectedPayload);
+ CHECK(decoder.decodeNextMessage(decoded) == HybiPacketDecoder::MessageState::NoMessage);
+ CHECK(decoder.numBytesDecoded() == (size ? size : v.size()));
}
void testLongString(size_t size, std::vector<uint8_t> v) {
@@ -58,88 +58,92 @@
}
HybiPacketDecoder decoder(ignore, v);
std::vector<uint8_t> decoded;
- ASSERT_EQ(HybiPacketDecoder::TextMessage, decoder.decodeNextMessage(decoded));
- ASSERT_EQ(size, decoded.size());
+ CHECK(decoder.decodeNextMessage(decoded) == HybiPacketDecoder::MessageState::TextMessage);
+ REQUIRE(decoded.size() == size);
for (size_t i = 0; i < size; ++i) {
- ASSERT_EQ('A', decoded[i]);
+ REQUIRE(decoded[i] == 'A');
}
- ASSERT_EQ(HybiPacketDecoder::NoMessage, decoder.decodeNextMessage(decoded));
- ASSERT_EQ(v.size(), decoder.numBytesDecoded());
+ CHECK(decoder.decodeNextMessage(decoded) == HybiPacketDecoder::MessageState::NoMessage);
+ CHECK(decoder.numBytesDecoded() == v.size());
}
-TEST(HybiTests, textExamples) {
+TEST_CASE("textExamples", "[HybiTests]") {
// CF. http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10 #4.7
- testSingleString(HybiPacketDecoder::TextMessage, "Hello", {0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f});
- testSingleString(HybiPacketDecoder::TextMessage, "Hello", {0x81, 0x85, 0x37, 0xfa, 0x21, 0x3d, 0x7f, 0x9f, 0x4d, 0x51, 0x58});
- testSingleString(HybiPacketDecoder::Ping, "Hello", {0x89, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f});
+ testSingleString(HybiPacketDecoder::MessageState::TextMessage, "Hello", {0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f});
+ testSingleString(HybiPacketDecoder::MessageState::TextMessage, "Hello", {0x81, 0x85, 0x37, 0xfa, 0x21, 0x3d, 0x7f, 0x9f, 0x4d, 0x51, 0x58});
+ testSingleString(HybiPacketDecoder::MessageState::Ping, "Hello", {0x89, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f});
}
-TEST(HybiTests, withPartialMessageFollowing) {
- testSingleString(HybiPacketDecoder::TextMessage, "Hello", {0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x81}, 7);
- testSingleString(HybiPacketDecoder::TextMessage, "Hello", {0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x81, 0x05}, 7);
- testSingleString(HybiPacketDecoder::TextMessage, "Hello", {0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x81, 0x05, 0x48}, 7);
- testSingleString(HybiPacketDecoder::TextMessage, "Hello", {0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c}, 7);
+TEST_CASE("withPartialMessageFollowing", "[HybiTests]") {
+ testSingleString(HybiPacketDecoder::MessageState::TextMessage, "Hello", {0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x81}, 7);
+ testSingleString(HybiPacketDecoder::MessageState::TextMessage, "Hello", {0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x81, 0x05}, 7);
+ testSingleString(HybiPacketDecoder::MessageState::TextMessage, "Hello", {0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x81, 0x05, 0x48}, 7);
+ testSingleString(HybiPacketDecoder::MessageState::TextMessage, "Hello", {0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c}, 7);
}
-TEST(HybiTests, binaryMessage) {
- std::vector<uint8_t> packet { 0x82, 0x03, 0x00, 0x01, 0x02 };
- std::vector<uint8_t> expected_body { 0x00, 0x01, 0x02 };
+TEST_CASE("binaryMessage", "[HybiTests]") {
+ std::vector<uint8_t> packet{0x82, 0x03, 0x00, 0x01, 0x02};
+ std::vector<uint8_t> expected_body{0x00, 0x01, 0x02};
HybiPacketDecoder decoder(ignore, packet);
std::vector<uint8_t> decoded;
- ASSERT_EQ(HybiPacketDecoder::BinaryMessage, decoder.decodeNextMessage(decoded));
- ASSERT_EQ(expected_body, decoded);
- ASSERT_EQ(HybiPacketDecoder::NoMessage, decoder.decodeNextMessage(decoded));
- ASSERT_EQ(packet.size(), decoder.numBytesDecoded());
+ CHECK(decoder.decodeNextMessage(decoded) == HybiPacketDecoder::MessageState::BinaryMessage);
+ CHECK(decoded == expected_body);
+ CHECK(decoder.decodeNextMessage(decoded) == HybiPacketDecoder::MessageState::NoMessage);
+ CHECK(decoder.numBytesDecoded() == packet.size());
}
-TEST(HybiTests, withTwoMessages) {
- std::vector<uint8_t> data {
+TEST_CASE("withTwoMessages", "[HybiTests]") {
+ std::vector<uint8_t> data{
0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f,
0x81, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x62, 0x79, 0x65};
HybiPacketDecoder decoder(ignore, data);
std::vector<uint8_t> decoded;
- ASSERT_EQ(HybiPacketDecoder::TextMessage, decoder.decodeNextMessage(decoded));
- ASSERT_EQ("Hello", std::string(reinterpret_cast<const char*>(&decoded[0]), decoded.size()));
- ASSERT_EQ(HybiPacketDecoder::TextMessage, decoder.decodeNextMessage(decoded));
- ASSERT_EQ("Goodbye", std::string(reinterpret_cast<const char*>(&decoded[0]), decoded.size()));
- ASSERT_EQ(HybiPacketDecoder::NoMessage, decoder.decodeNextMessage(decoded));
- ASSERT_EQ(data.size(), decoder.numBytesDecoded());
+ CHECK(decoder.decodeNextMessage(decoded) == HybiPacketDecoder::MessageState::TextMessage);
+ CHECK(std::string(reinterpret_cast<const char*>(&decoded[0]), decoded.size()) == "Hello");
+ CHECK(decoder.decodeNextMessage(decoded) == HybiPacketDecoder::MessageState::TextMessage);
+ CHECK(std::string(reinterpret_cast<const char*>(&decoded[0]), decoded.size()) == "Goodbye");
+ CHECK(decoder.decodeNextMessage(decoded) == HybiPacketDecoder::MessageState::NoMessage);
+ CHECK(decoder.numBytesDecoded() == data.size());
}
-TEST(HybiTests, withTwoMessagesOneBeingMaskedd) {
- std::vector<uint8_t> data {
- 0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f, // hello
- 0x81, 0x85, 0x37, 0xfa, 0x21, 0x3d, 0x7f, 0x9f, 0x4d, 0x51, 0x58 // also hello
+TEST_CASE("withTwoMessagesOneBeingMaskedd", "[HybiTests]") {
+ std::vector<uint8_t> data{
+ 0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f, // hello
+ 0x81, 0x85, 0x37, 0xfa, 0x21, 0x3d, 0x7f, 0x9f, 0x4d, 0x51, 0x58 // also hello
};
HybiPacketDecoder decoder(ignore, data);
std::vector<uint8_t> decoded;
- ASSERT_EQ(HybiPacketDecoder::TextMessage, decoder.decodeNextMessage(decoded));
- ASSERT_EQ("Hello", std::string(reinterpret_cast<const char*>(&decoded[0]), decoded.size()));
- ASSERT_EQ(HybiPacketDecoder::TextMessage, decoder.decodeNextMessage(decoded));
- ASSERT_EQ("Hello", std::string(reinterpret_cast<const char*>(&decoded[0]), decoded.size()));
- ASSERT_EQ(HybiPacketDecoder::NoMessage, decoder.decodeNextMessage(decoded));
- ASSERT_EQ(data.size(), decoder.numBytesDecoded());
+ CHECK(decoder.decodeNextMessage(decoded) == HybiPacketDecoder::MessageState::TextMessage);
+ CHECK(std::string(reinterpret_cast<const char*>(&decoded[0]), decoded.size()) == "Hello");
+ CHECK(decoder.decodeNextMessage(decoded) == HybiPacketDecoder::MessageState::TextMessage);
+ CHECK(std::string(reinterpret_cast<const char*>(&decoded[0]), decoded.size()) == "Hello");
+ CHECK(decoder.decodeNextMessage(decoded) == HybiPacketDecoder::MessageState::NoMessage);
+ CHECK(decoder.numBytesDecoded() == data.size());
}
-TEST(HybiTests, regressionBug) {
+TEST_CASE("regressionBug", "[HybiTests]") {
// top bit set of second byte of message used to trigger a MASK decode of the remainder
- std::vector<uint8_t> data {
- 0x82, 0x05, 0x80, 0x81, 0x82, 0x83, 0x84
- };
- std::vector<uint8_t> expected_body { 0x80, 0x81, 0x82, 0x83, 0x84 };
+ std::vector<uint8_t> data{
+ 0x82, 0x05, 0x80, 0x81, 0x82, 0x83, 0x84};
+ std::vector<uint8_t> expected_body{0x80, 0x81, 0x82, 0x83, 0x84};
HybiPacketDecoder decoder(ignore, data);
std::vector<uint8_t> decoded;
- ASSERT_EQ(HybiPacketDecoder::BinaryMessage, decoder.decodeNextMessage(decoded));
- ASSERT_EQ(expected_body, decoded);
- ASSERT_EQ(data.size(), decoder.numBytesDecoded());
+ CHECK(decoder.decodeNextMessage(decoded) == HybiPacketDecoder::MessageState::BinaryMessage);
+ CHECK(decoded == expected_body);
+ CHECK(decoder.numBytesDecoded() == data.size());
}
-TEST(HybiTests, longStringExamples) {
+TEST_CASE("longStringExamples", "[HybiTests]") {
// These are the binary examples, but cast as strings.
testLongString(256, {0x81, 0x7E, 0x01, 0x00});
testLongString(65536, {0x81, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00});
}
-TEST(HybiTests, accept) {
- ASSERT_EQ("s3pPLMBiTxaQ9kYGzzhZRbK+xOo=", getAcceptKey("dGhlIHNhbXBsZSBub25jZQ=="));
+TEST_CASE("accept", "[HybiTests]") {
+ CHECK(getAcceptKey("dGhlIHNhbXBsZSBub25jZQ==") == "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=");
+}
+
+TEST_CASE("pings and pongs", "[HybiTests]") {
+ testSingleString(HybiPacketDecoder::MessageState::Ping, "Hello", {0x89, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f});
+ testSingleString(HybiPacketDecoder::MessageState::Pong, "Hello", {0x8a, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f});
}
diff --git a/third_party/seasocks/src/test/c/JsonTests.cpp b/third_party/seasocks/src/test/c/JsonTests.cpp
index b284b50..56f50c6 100644
--- a/third_party/seasocks/src/test/c/JsonTests.cpp
+++ b/third_party/seasocks/src/test/c/JsonTests.cpp
@@ -1,131 +1,144 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
#include "seasocks/util/Json.h"
-#include <gmock/gmock.h>
+#include <catch2/catch.hpp>
+
#include <ostream>
#include <map>
#include <unordered_map>
-using namespace testing;
using namespace seasocks;
namespace {
-TEST(JsonTests, shouldHandleMaps) {
- EXPECT_EQ("{\"monkey\":12}", makeMap("monkey", 12));
+TEST_CASE("shouldHandleMaps", "[JsonTests]") {
+ CHECK(makeMap("monkey", 12) == "{\"monkey\":12}");
}
-TEST(JsonTests, shouldHandleQuotedStrings) {
- EXPECT_EQ("{\"key\":\"I have \\\"quotes\\\"\"}",
- makeMap("key", "I have \"quotes\""));
+TEST_CASE("shouldHandleQuotedStrings", "[JsonTests]") {
+ CHECK(makeMap("key", "I have \"quotes\"") ==
+ "{\"key\":\"I have \\\"quotes\\\"\"}");
}
-TEST(JsonTests, shouldHandleNewLinesInStrings) {
+TEST_CASE("shouldHandleNewLinesInStrings", "[JsonTests]") {
std::stringstream str;
jsonToStream(str, "I have\nnew\rlines");
- EXPECT_EQ("\"I have\\nnew\\rlines\"", str.str());
+ CHECK(str.str() == "\"I have\\nnew\\rlines\"");
}
-TEST(JsonTests, shouldHandleCrazyChars) {
+TEST_CASE("shouldHandleAsciiStrings", "[JsonTests]") {
+ std::stringstream str;
+ jsonToStream(str, "0123xyz!$%(/)=_-");
+ CHECK(str.str() == R"("0123xyz!$%(/)=_-")");
+}
+
+TEST_CASE("shouldHandleCrazyChars", "[JsonTests]") {
std::stringstream str;
jsonToStream(str, "\x01\x02\x1f");
- EXPECT_EQ("\"\\u0001\\u0002\\u001f\"", str.str());
+ CHECK(str.str() == "\"\\u0001\\u0002\\u001f\"");
}
-TEST(JsonTests, shouldHandleDate) {
+TEST_CASE("shouldHandleDate", "[JsonTests]") {
std::stringstream str;
jsonToStream(str, EpochTimeAsLocal(209001600));
- EXPECT_EQ("new Date(209001600000).toLocaleString()", str.str());
+ CHECK(str.str() == "new Date(209001600000).toLocaleString()");
+}
+
+TEST_CASE("shouldHandleNonAsciiChars", "[JsonTests]") {
+ std::stringstream str;
+ jsonToStream(str, "§");
+ CHECK(str.str() == R"("§")");
}
struct Object {
- void jsonToStream(std::ostream &ostr) const {
+ void jsonToStream(std::ostream& ostr) const {
ostr << makeMap("object", true);
}
// Clang is pernickity about this. We don't want use this function
// but it's here to catch errors where we accidentally use it instead of the
// jsonToStream.
- friend std::ostream &operator << (std::ostream &o, const Object &ob) {
+ friend std::ostream& operator<<(std::ostream& o, const Object&) {
return o << "Not this one";
}
};
struct Object2 {
- friend std::ostream &operator << (std::ostream &o, const Object2 &ob) {
+ friend std::ostream& operator<<(std::ostream& o, const Object2&) {
return o << "This is object 2";
}
};
static_assert(is_streamable<Object2>::value, "Should be streamable");
-TEST(JsonTests, shouldHandleCustomObjects) {
- EXPECT_EQ(R"({"obj":{"object":true}})", makeMap("obj", Object()));
+TEST_CASE("shouldHandleCustomObjects", "[JsonTests]") {
+ CHECK(makeMap("obj", Object()) == R"({"obj":{"object":true}})");
Object o;
- EXPECT_EQ(R"({"obj":{"object":true}})", makeMap("obj", o));
- EXPECT_EQ(R"({"obj":"This is object 2"})", makeMap("obj", Object2()));
+ CHECK(makeMap("obj", o) == R"({"obj":{"object":true}})");
+ CHECK(makeMap("obj", Object2()) == R"({"obj":"This is object 2"})");
Object2 o2;
- EXPECT_EQ(R"({"obj":"This is object 2"})", makeMap("obj", o2));
+ CHECK(makeMap("obj", o2) == R"({"obj":"This is object 2"})");
// Putting a clang-specific pragma to thwart the unused warning in Object
// upsets GCC...so we just put a test for this to ensure it's used.
std::ostringstream ost;
ost << Object();
- EXPECT_EQ("Not this one", ost.str()); // See comment
+ CHECK(ost.str() == "Not this one"); // See comment
}
-TEST(JsonTests, to_json) {
- EXPECT_EQ("1", to_json(1));
- EXPECT_EQ("3.14", to_json(3.14));
- EXPECT_EQ("\"hello\"", to_json("hello"));
- EXPECT_EQ(R"({"object":true})", to_json(Object()));
- EXPECT_EQ(R"("This is object 2")", to_json(Object2()));
-}
-TEST(JsonTests, handlesArrays) {
- EXPECT_EQ(R"([])", makeArray());
- EXPECT_EQ(R"([1])", makeArray(1));
- EXPECT_EQ(R"([1,2,3])", makeArray(1, 2, 3));
- EXPECT_EQ(R"([1,2,3])", makeArray({1, 2, 3}));
- EXPECT_EQ(R"(["abc"])", makeArray("abc"));
- EXPECT_EQ(R"(["a","b","c"])", makeArray("a", "b", "c"));
- EXPECT_EQ(R"(["a","b","c"])", makeArray({"a", "b", "c"}));
- std::vector<JsonnedString> strs = { to_json(false), to_json(true) };
- EXPECT_EQ(R"([false,true])", makeArrayFromContainer(strs));
+TEST_CASE("to_json", "[JsonTests]") {
+ CHECK(to_json(1) == "1");
+ CHECK(to_json(3.14) == "3.14");
+ CHECK(to_json("hello") == "\"hello\"");
+ CHECK(to_json(Object()) == R"({"object":true})");
+ CHECK(to_json(Object2()) == R"("This is object 2")");
}
-TEST(JsonTests, handlesMaps) {
+TEST_CASE("handlesArrays", "[JsonTests]") {
+ CHECK(makeArray() == R"([])");
+ CHECK(makeArray(1) == R"([1])");
+ CHECK(makeArray(1, 2, 3) == R"([1,2,3])");
+ CHECK(makeArray({1, 2, 3}) == R"([1,2,3])");
+ CHECK(makeArray("abc") == R"(["abc"])");
+ CHECK(makeArray("a", "b", "c") == R"(["a","b","c"])");
+ CHECK(makeArray({"a", "b", "c"}) == R"(["a","b","c"])");
+ std::vector<JsonnedString> strs = {to_json(false), to_json(true)};
+ CHECK(makeArrayFromContainer(strs) == R"([false,true])");
+}
+
+TEST_CASE("handlesMaps", "[JsonTests]") {
+ using namespace Catch::Matchers;
+
std::map<std::string, JsonnedString> ordMap;
ordMap["hello"] = to_json(true);
ordMap["goodbye"] = to_json(false);
- EXPECT_EQ(R"({"goodbye":false,"hello":true})", makeMapFromContainer(ordMap));
+ CHECK(makeMapFromContainer(ordMap) == R"({"goodbye":false,"hello":true})");
std::map<std::string, JsonnedString> unordMap;
unordMap["hello"] = to_json(true);
unordMap["goodbye"] = to_json(false);
- EXPECT_THAT(makeMapFromContainer(unordMap), AnyOf(
- Eq(R"({"goodbye":false,"hello":true})"),
- Eq(R"({"hello":true,"goodbye":false})")));
+ CHECK_THAT(makeMapFromContainer(unordMap), Catch::Equals(R"({"goodbye":false,"hello":true})") || Catch::Equals(R"({"hello":true,"goodbye":false})"));
}
}
diff --git a/third_party/seasocks/src/test/c/MockServerImpl.h b/third_party/seasocks/src/test/c/MockServerImpl.h
index 42546b5..604a9f3 100644
--- a/third_party/seasocks/src/test/c/MockServerImpl.h
+++ b/third_party/seasocks/src/test/c/MockServerImpl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -27,23 +27,52 @@
#include "seasocks/ServerImpl.h"
-#include <gmock/gmock.h>
+#include <stdexcept>
+#include <unordered_map>
namespace seasocks {
class MockServerImpl : public ServerImpl {
public:
- virtual ~MockServerImpl() {}
+ virtual ~MockServerImpl() = default;
- MOCK_METHOD1(remove, void(Connection* connection));
- MOCK_METHOD1(subscribeToWriteEvents, bool(Connection* connection));
- MOCK_METHOD1(unsubscribeFromWriteEvents, bool(Connection* connection));
- MOCK_CONST_METHOD0(getStaticPath, const std::string&());
- MOCK_CONST_METHOD1(getWebSocketHandler, std::shared_ptr<WebSocket::Handler>(const char *));
- MOCK_CONST_METHOD1(isCrossOriginAllowed, bool(const std::string&));
- MOCK_METHOD1(handle, std::shared_ptr<Response>(const Request &));
- MOCK_CONST_METHOD0(getStatsDocument, std::string());
- MOCK_CONST_METHOD0(checkThread, void());
+ std::string staticPath;
+ std::unordered_map<std::string, std::shared_ptr<WebSocket::Handler>> handlers;
+
+ void remove(Connection* /*connection*/) override {
+ }
+ bool subscribeToWriteEvents(Connection* /*connection*/) override {
+ return false;
+ };
+ bool unsubscribeFromWriteEvents(Connection* /*connection*/) override {
+ return false;
+ }
+ const std::string& getStaticPath() const override {
+ return staticPath;
+ }
+ std::shared_ptr<WebSocket::Handler> getWebSocketHandler(const char* endpoint) const override {
+ auto it = handlers.find(endpoint);
+ if (it == handlers.end())
+ return std::shared_ptr<WebSocket::Handler>();
+ return it->second;
+ }
+ bool isCrossOriginAllowed(const std::string& /*endpoint*/) const override {
+ return false;
+ }
+ std::shared_ptr<Response> handle(const Request& /*request*/) override {
+ return std::shared_ptr<Response>();
+ }
+ std::string getStatsDocument() const override {
+ return "";
+ }
+ void checkThread() const override {
+ }
+ Server& server() override {
+ throw std::runtime_error("not supported");
+ };
+ size_t clientBufferSize() const override {
+ return 512 * 1024;
+ }
};
}
diff --git a/third_party/seasocks/src/test/c/ResponseBuilderTests.cpp b/third_party/seasocks/src/test/c/ResponseBuilderTests.cpp
new file mode 100644
index 0000000..98e32ac
--- /dev/null
+++ b/third_party/seasocks/src/test/c/ResponseBuilderTests.cpp
@@ -0,0 +1,28 @@
+
+#include "seasocks/ResponseBuilder.h"
+#include <catch2/catch.hpp>
+
+using namespace seasocks;
+using namespace Catch::Matchers;
+
+TEST_CASE("appendIntValue", "[ResponseBuilderTests]") {
+ ResponseBuilder builder;
+ builder << int{3};
+ auto result = std::dynamic_pointer_cast<SynchronousResponse>(builder.build());
+ CHECK_THAT(result->payload(), Equals("3"));
+}
+
+TEST_CASE("appendCStringValue", "[ResponseBuilderTests]") {
+ ResponseBuilder builder;
+ const char* cStr = "abc";
+ builder << cStr;
+ auto result = std::dynamic_pointer_cast<SynchronousResponse>(builder.build());
+ CHECK_THAT(result->payload(), Equals("abc"));
+}
+
+TEST_CASE("appendStringValue", "[ResponseBuilderTests]") {
+ ResponseBuilder builder;
+ builder << std::string("xyz");
+ auto result = std::dynamic_pointer_cast<SynchronousResponse>(builder.build());
+ CHECK_THAT(result->payload(), Equals("xyz"));
+}
diff --git a/third_party/seasocks/src/test/c/ResponseTests.cpp b/third_party/seasocks/src/test/c/ResponseTests.cpp
new file mode 100644
index 0000000..31c509a
--- /dev/null
+++ b/third_party/seasocks/src/test/c/ResponseTests.cpp
@@ -0,0 +1,66 @@
+
+#include "seasocks/Response.h"
+#include "internal/ConcreteResponse.h"
+#include <catch2/catch.hpp>
+
+using namespace seasocks;
+using namespace Catch::Matchers;
+
+TEST_CASE("unhandled response returns nullptr", "[ResponseTests]") {
+ const auto resp = Response::unhandled();
+ CHECK(resp == nullptr);
+}
+
+TEST_CASE("not found response", "[ResponseTests]") {
+ const auto resp = std::dynamic_pointer_cast<ConcreteResponse>(Response::notFound());
+
+ CHECK(resp->responseCode() == ResponseCode::NotFound);
+ CHECK_THAT(resp->payload(), Equals("Not found"));
+ CHECK_THAT(resp->contentType(), Equals("text/plain"));
+ CHECK(resp->getAdditionalHeaders().empty() == true);
+ CHECK(resp->keepConnectionAlive() == false);
+}
+
+TEST_CASE("error response", "[ResponseTests]") {
+ const std::string msg("no reason");
+ const auto resp = std::dynamic_pointer_cast<ConcreteResponse>(Response::error(ResponseCode::Forbidden, msg));
+
+ CHECK(resp->responseCode() == ResponseCode::Forbidden);
+ CHECK_THAT(resp->payload(), Equals(msg));
+ CHECK_THAT(resp->contentType(), Equals("text/plain"));
+ CHECK(resp->getAdditionalHeaders().empty() == true);
+ CHECK(resp->keepConnectionAlive() == false);
+}
+
+TEST_CASE("text response", "[ResponseTests]") {
+ const std::string msg("abc");
+ const auto resp = std::dynamic_pointer_cast<ConcreteResponse>(Response::textResponse(msg));
+
+ CHECK(resp->responseCode() == ResponseCode::Ok);
+ CHECK_THAT(resp->payload(), Equals(msg));
+ CHECK_THAT(resp->contentType(), Equals("text/plain"));
+ CHECK(resp->getAdditionalHeaders().empty() == true);
+ CHECK(resp->keepConnectionAlive() == true);
+}
+
+TEST_CASE("json response", "[ResponseTests]") {
+ const std::string msg("abc");
+ const auto resp = std::dynamic_pointer_cast<ConcreteResponse>(Response::jsonResponse(msg));
+
+ CHECK(resp->responseCode() == ResponseCode::Ok);
+ CHECK_THAT(resp->payload(), Equals(msg));
+ CHECK_THAT(resp->contentType(), Equals("application/json"));
+ CHECK(resp->getAdditionalHeaders().empty() == true);
+ CHECK(resp->keepConnectionAlive() == true);
+}
+
+TEST_CASE("html response", "[ResponseTests]") {
+ const std::string msg("abc");
+ const auto resp = std::dynamic_pointer_cast<ConcreteResponse>(Response::htmlResponse(msg));
+
+ CHECK(resp->responseCode() == ResponseCode::Ok);
+ CHECK_THAT(resp->payload(), Equals(msg));
+ CHECK_THAT(resp->contentType(), Equals("text/html"));
+ CHECK(resp->getAdditionalHeaders().empty() == true);
+ CHECK(resp->keepConnectionAlive() == true);
+}
diff --git a/third_party/seasocks/src/test/c/ServerTests.cpp b/third_party/seasocks/src/test/c/ServerTests.cpp
new file mode 100644
index 0000000..4418f52
--- /dev/null
+++ b/third_party/seasocks/src/test/c/ServerTests.cpp
@@ -0,0 +1,79 @@
+// Copyright (c) 2013-2017, Matt Godbolt
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+#include "seasocks/Server.h"
+#include "seasocks/Connection.h"
+#include "seasocks/IgnoringLogger.h"
+
+#include <catch2/catch.hpp>
+
+#include <thread>
+#include <unistd.h>
+
+using namespace seasocks;
+
+
+TEST_CASE("Server tests", "[ServerTests]") {
+ auto logger = std::make_shared<IgnoringLogger>();
+ Server server(logger);
+ REQUIRE(server.startListening(0));
+ std::thread seasocksThread([&] {
+ REQUIRE(server.loop());
+ });
+
+ std::atomic<int> test(0);
+ SECTION("execute should work") {
+ server.execute([&] {
+ CHECK(test == 0);
+ test++;
+ });
+ for (int i = 0; i < 1000 * 1000 * 1000; ++i) {
+ if (test)
+ break;
+ }
+ CHECK(test == 1);
+ }
+
+ SECTION("many executes") {
+ std::atomic<bool> latch(false);
+ for (auto i = 0; i < 100; ++i) {
+ for (auto j = 0; j < 100; ++j) {
+ server.execute([&] { test++; });
+ }
+ usleep(10);
+ }
+ server.execute([&] { latch = true; });
+ for (int i = 0; i < 1000; ++i) {
+ usleep(1000);
+ if (latch)
+ break;
+ }
+ CHECK(latch == 1);
+ CHECK(test == 10000);
+ }
+
+ server.terminate();
+ seasocksThread.join();
+}
diff --git a/third_party/seasocks/src/test/c/StringUtilTests.cpp b/third_party/seasocks/src/test/c/StringUtilTests.cpp
new file mode 100644
index 0000000..aeb1ad5
--- /dev/null
+++ b/third_party/seasocks/src/test/c/StringUtilTests.cpp
@@ -0,0 +1,117 @@
+// Copyright (c) 2019, offa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+#include "seasocks/StringUtil.h"
+#include <catch2/catch.hpp>
+
+using namespace seasocks;
+
+TEST_CASE("case insensitive string comparison", "[ToStringTests]") {
+ CHECK(caseInsensitiveSame("abc def 123", "abc def 123") == true);
+ CHECK(caseInsensitiveSame("abc def 123", "abc ghi 123") == false);
+ CHECK(caseInsensitiveSame("abc", "aBc") == true);
+ CHECK(caseInsensitiveSame("", "") == true);
+ CHECK(caseInsensitiveSame("123", "123") == true);
+ CHECK(caseInsensitiveSame(" ", " ") == true);
+}
+
+TEST_CASE("replace replaces match if found", "[ToStringTests]") {
+ std::string str = "x-?-z";
+ replace(str, "-?-", "y");
+ CHECK(str == "xyz");
+}
+
+TEST_CASE("replace replaces all matches", "[ToStringTests]") {
+ std::string str = "1xx2 xx34xxxx";
+ replace(str, "xx", "---");
+ CHECK(str == "1---2 ---34------");
+}
+
+TEST_CASE("replace does nothing if no match", "[ToStringTests]") {
+ std::string str = "no match in here";
+ replace(str, "xx", "no!");
+ CHECK(str == "no match in here");
+}
+
+TEST_CASE("replace is safe to empty strings", "[ToStringTests]") {
+ std::string empty{};
+ replace(empty, "a", "b");
+ CHECK(empty == "");
+
+ std::string str = "input text";
+ replace(str, "", "aaa");
+ CHECK(str == "input text");
+
+ replace(str, " text", "");
+ CHECK(str == "input");
+}
+
+TEST_CASE("split splits input if delimiter found", "[ToStringTests]") {
+ using Catch::Matchers::Equals;
+
+ const auto result = split("123-456-789-0", '-');
+ CHECK_THAT(result, Equals<std::string>({"123", "456", "789", "0"}));
+}
+
+TEST_CASE("split returns input if delimiter not found", "[ToStringTests]") {
+ using Catch::Matchers::Equals;
+
+ const auto result = split("1-2 3-4", 'x');
+ CHECK_THAT(result, Equals<std::string>({"1-2 3-4"}));
+}
+
+TEST_CASE("split is safe to empty strings", "[ToStringTests]") {
+ using Catch::Matchers::Equals;
+
+ const auto result = split("", '-');
+ CHECK_THAT(result, Equals<std::string>({}));
+}
+
+TEST_CASE("split returns empty strings if input is delimiter", "[ToStringTests]") {
+ using Catch::Matchers::Equals;
+
+ const auto result = split("-", '-');
+ CHECK_THAT(result, Equals<std::string>({"", ""}));
+}
+
+TEST_CASE("trim whitespace removes whitespace on both ends", "[ToStringTests]") {
+ const auto result = trimWhitespace(" abc def ");
+ CHECK(result == "abc def");
+}
+
+TEST_CASE("trim whitespace removes whitespace escape sequences", "[ToStringTests]") {
+ const auto result = trimWhitespace("\t xyz\n");
+ CHECK(result == "xyz");
+}
+
+TEST_CASE("trim whitespace is safe to empty string", "[ToStringTests]") {
+ const auto result = trimWhitespace("");
+ CHECK(result == "");
+}
+
+TEST_CASE("trim whitespace returns empty string if only whitespace", "[ToStringTests]") {
+ const auto result = trimWhitespace(" \n \t ");
+ CHECK(result == "");
+}
diff --git a/third_party/seasocks/src/test/c/ToStringTests.cpp b/third_party/seasocks/src/test/c/ToStringTests.cpp
new file mode 100644
index 0000000..280c717
--- /dev/null
+++ b/third_party/seasocks/src/test/c/ToStringTests.cpp
@@ -0,0 +1,53 @@
+// Copyright (c) 2013-2017, Matt Godbolt
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+#include "seasocks/ToString.h"
+
+#include <catch2/catch.hpp>
+
+using namespace seasocks;
+
+TEST_CASE("withIntegralTypes", "[toStringTests]") {
+ CHECK(toString(static_cast<short>(1234)) == "1234");
+ CHECK(toString(static_cast<unsigned short>(1234)) == "1234");
+
+ CHECK(toString(static_cast<int>(1234)) == "1234");
+ CHECK(toString(static_cast<unsigned int>(1234)) == "1234");
+
+ CHECK(toString(static_cast<long>(1234)) == "1234");
+ CHECK(toString(static_cast<unsigned long>(1234)) == "1234");
+
+ CHECK(toString(static_cast<long long>(1234)) == "1234");
+ CHECK(toString(static_cast<unsigned long long>(1234)) == "1234");
+}
+
+TEST_CASE("withFloatTypes", "[toStringTests]") {
+ CHECK(toString(123.4) == "123.4");
+ CHECK(toString(123.4f) == "123.4");
+}
+
+TEST_CASE("withCharType", "[toStringTests]") {
+ CHECK(toString('c') == "c");
+}
diff --git a/third_party/seasocks/src/test/c/catch/LICENSE.txt b/third_party/seasocks/src/test/c/catch/LICENSE.txt
new file mode 100644
index 0000000..36b7cd9
--- /dev/null
+++ b/third_party/seasocks/src/test/c/catch/LICENSE.txt
@@ -0,0 +1,23 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/third_party/seasocks/src/test/c/catch/catch2/catch.hpp b/third_party/seasocks/src/test/c/catch/catch2/catch.hpp
new file mode 100644
index 0000000..cc3f97c
--- /dev/null
+++ b/third_party/seasocks/src/test/c/catch/catch2/catch.hpp
@@ -0,0 +1,14687 @@
+/*
+ * Catch v2.6.0
+ * Generated: 2019-01-31 22:25:55.560884
+ * ----------------------------------------------------------
+ * This file has been merged from multiple headers. Please don't edit it directly
+ * Copyright (c) 2019 Two Blue Cubes Ltd. All rights reserved.
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See accompanying
+ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+// start catch.hpp
+
+
+#define CATCH_VERSION_MAJOR 2
+#define CATCH_VERSION_MINOR 6
+#define CATCH_VERSION_PATCH 0
+
+#ifdef __clang__
+# pragma clang system_header
+#elif defined __GNUC__
+# pragma GCC system_header
+#endif
+
+// start catch_suppress_warnings.h
+
+#ifdef __clang__
+# ifdef __ICC // icpc defines the __clang__ macro
+# pragma warning(push)
+# pragma warning(disable: 161 1682)
+# else // __ICC
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wpadded"
+# pragma clang diagnostic ignored "-Wswitch-enum"
+# pragma clang diagnostic ignored "-Wcovered-switch-default"
+# endif
+#elif defined __GNUC__
+ // Because REQUIREs trigger GCC's -Wparentheses, and because still
+ // supported version of g++ have only buggy support for _Pragmas,
+ // Wparentheses have to be suppressed globally.
+# pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details
+
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wunused-variable"
+# pragma GCC diagnostic ignored "-Wpadded"
+#endif
+// end catch_suppress_warnings.h
+#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
+# define CATCH_IMPL
+# define CATCH_CONFIG_ALL_PARTS
+#endif
+
+// In the impl file, we want to have access to all parts of the headers
+// Can also be used to sanely support PCHs
+#if defined(CATCH_CONFIG_ALL_PARTS)
+# define CATCH_CONFIG_EXTERNAL_INTERFACES
+# if defined(CATCH_CONFIG_DISABLE_MATCHERS)
+# undef CATCH_CONFIG_DISABLE_MATCHERS
+# endif
+# if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+# define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+# endif
+#endif
+
+#if !defined(CATCH_CONFIG_IMPL_ONLY)
+// start catch_platform.h
+
+#ifdef __APPLE__
+# include <TargetConditionals.h>
+# if TARGET_OS_OSX == 1
+# define CATCH_PLATFORM_MAC
+# elif TARGET_OS_IPHONE == 1
+# define CATCH_PLATFORM_IPHONE
+# endif
+
+#elif defined(linux) || defined(__linux) || defined(__linux__)
+# define CATCH_PLATFORM_LINUX
+
+#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__)
+# define CATCH_PLATFORM_WINDOWS
+#endif
+
+// end catch_platform.h
+
+#ifdef CATCH_IMPL
+# ifndef CLARA_CONFIG_MAIN
+# define CLARA_CONFIG_MAIN_NOT_DEFINED
+# define CLARA_CONFIG_MAIN
+# endif
+#endif
+
+// start catch_user_interfaces.h
+
+namespace Catch {
+ unsigned int rngSeed();
+}
+
+// end catch_user_interfaces.h
+// start catch_tag_alias_autoregistrar.h
+
+// start catch_common.h
+
+// start catch_compiler_capabilities.h
+
+// Detect a number of compiler features - by compiler
+// The following features are defined:
+//
+// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported?
+// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported?
+// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported?
+// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled?
+// ****************
+// Note to maintainers: if new toggles are added please document them
+// in configuration.md, too
+// ****************
+
+// In general each macro has a _NO_<feature name> form
+// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature.
+// Many features, at point of detection, define an _INTERNAL_ macro, so they
+// can be combined, en-mass, with the _NO_ forms later.
+
+#ifdef __cplusplus
+
+# if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
+# define CATCH_CPP14_OR_GREATER
+# endif
+
+# if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
+# define CATCH_CPP17_OR_GREATER
+# endif
+
+#endif
+
+#if defined(CATCH_CPP17_OR_GREATER)
+# define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif
+
+#ifdef __clang__
+
+# define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+ _Pragma( "clang diagnostic push" ) \
+ _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \
+ _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"")
+# define CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS \
+ _Pragma( "clang diagnostic pop" )
+
+# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+ _Pragma( "clang diagnostic push" ) \
+ _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
+# define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \
+ _Pragma( "clang diagnostic pop" )
+
+# define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+ _Pragma( "clang diagnostic push" ) \
+ _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" )
+# define CATCH_INTERNAL_UNSUPPRESS_UNUSED_WARNINGS \
+ _Pragma( "clang diagnostic pop" )
+
+#endif // __clang__
+
+////////////////////////////////////////////////////////////////////////////////
+// Assume that non-Windows platforms support posix signals by default
+#if !defined(CATCH_PLATFORM_WINDOWS)
+ #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// We know some environments not to support full POSIX signals
+#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__)
+ #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
+#endif
+
+#ifdef __OS400__
+# define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
+# define CATCH_CONFIG_COLOUR_NONE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Android somehow still does not support std::to_string
+#if defined(__ANDROID__)
+# define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Not all Windows environments support SEH properly
+#if defined(__MINGW32__)
+# define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// PS4
+#if defined(__ORBIS__)
+# define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Cygwin
+#ifdef __CYGWIN__
+
+// Required for some versions of Cygwin to declare gettimeofday
+// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin
+# define _BSD_SOURCE
+// some versions of cygwin (most) do not support std::to_string. Use the libstd check.
+// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813
+# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \
+ && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
+
+# define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
+
+# endif
+#endif // __CYGWIN__
+
+////////////////////////////////////////////////////////////////////////////////
+// Visual C++
+#ifdef _MSC_VER
+
+# if _MSC_VER >= 1900 // Visual Studio 2015 or newer
+# define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+# endif
+
+// Universal Windows platform does not support SEH
+// Or console colours (or console at all...)
+# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
+# define CATCH_CONFIG_COLOUR_NONE
+# else
+# define CATCH_INTERNAL_CONFIG_WINDOWS_SEH
+# endif
+
+// MSVC traditional preprocessor needs some workaround for __VA_ARGS__
+// _MSVC_TRADITIONAL == 0 means new conformant preprocessor
+// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor
+# if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL)
+# define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+# endif
+
+#endif // _MSC_VER
+
+////////////////////////////////////////////////////////////////////////////////
+// Check if we are compiled with -fno-exceptions or equivalent
+#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND)
+# define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// DJGPP
+#ifdef __DJGPP__
+# define CATCH_INTERNAL_CONFIG_NO_WCHAR
+#endif // __DJGPP__
+
+////////////////////////////////////////////////////////////////////////////////
+// Embarcadero C++Build
+#if defined(__BORLANDC__)
+ #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Use of __COUNTER__ is suppressed during code analysis in
+// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly
+// handled by it.
+// Otherwise all supported compilers support COUNTER macro,
+// but user still might want to turn it off
+#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L )
+ #define CATCH_INTERNAL_CONFIG_COUNTER
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Check if string_view is available and usable
+// The check is split apart to work around v140 (VS2015) preprocessor issue...
+#if defined(__has_include)
+#if __has_include(<string_view>) && defined(CATCH_CPP17_OR_GREATER)
+# define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW
+#endif
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Check if optional is available and usable
+#if defined(__has_include)
+# if __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
+# define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL
+# endif // __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
+#endif // __has_include
+
+////////////////////////////////////////////////////////////////////////////////
+// Check if variant is available and usable
+#if defined(__has_include)
+# if __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
+# if defined(__clang__) && (__clang_major__ < 8)
+ // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852
+ // fix should be in clang 8, workaround in libstdc++ 8.2
+# include <ciso646>
+# if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
+# define CATCH_CONFIG_NO_CPP17_VARIANT
+# else
+# define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
+# endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
+# else
+# define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
+# endif // defined(__clang__) && (__clang_major__ < 8)
+# endif // __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
+#endif // __has_include
+
+#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER)
+# define CATCH_CONFIG_COUNTER
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH)
+# define CATCH_CONFIG_WINDOWS_SEH
+#endif
+// This is set by default, because we assume that unix compilers are posix-signal-compatible by default.
+#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS)
+# define CATCH_CONFIG_POSIX_SIGNALS
+#endif
+// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions.
+#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR)
+# define CATCH_CONFIG_WCHAR
+#endif
+
+#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING)
+# define CATCH_CONFIG_CPP11_TO_STRING
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL)
+# define CATCH_CONFIG_CPP17_OPTIONAL
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+# define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW)
+# define CATCH_CONFIG_CPP17_STRING_VIEW
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT)
+# define CATCH_CONFIG_CPP17_VARIANT
+#endif
+
+#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
+# define CATCH_INTERNAL_CONFIG_NEW_CAPTURE
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE)
+# define CATCH_CONFIG_NEW_CAPTURE
+#endif
+
+#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+# define CATCH_CONFIG_DISABLE_EXCEPTIONS
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN)
+# define CATCH_CONFIG_POLYFILL_ISNAN
+#endif
+
+#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
+# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
+# define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS)
+# define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+# define CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS)
+# define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS
+# define CATCH_INTERNAL_UNSUPPRESS_UNUSED_WARNINGS
+#endif
+
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+#define CATCH_TRY if ((true))
+#define CATCH_CATCH_ALL if ((false))
+#define CATCH_CATCH_ANON(type) if ((false))
+#else
+#define CATCH_TRY try
+#define CATCH_CATCH_ALL catch (...)
+#define CATCH_CATCH_ANON(type) catch (type)
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR)
+#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#endif
+
+// end catch_compiler_capabilities.h
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
+#ifdef CATCH_CONFIG_COUNTER
+# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
+#else
+# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
+#endif
+
+#include <iosfwd>
+#include <string>
+#include <cstdint>
+
+// We need a dummy global operator<< so we can bring it into Catch namespace later
+struct Catch_global_namespace_dummy {};
+std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy);
+
+namespace Catch {
+
+ struct CaseSensitive { enum Choice {
+ Yes,
+ No
+ }; };
+
+ class NonCopyable {
+ NonCopyable( NonCopyable const& ) = delete;
+ NonCopyable( NonCopyable && ) = delete;
+ NonCopyable& operator = ( NonCopyable const& ) = delete;
+ NonCopyable& operator = ( NonCopyable && ) = delete;
+
+ protected:
+ NonCopyable();
+ virtual ~NonCopyable();
+ };
+
+ struct SourceLineInfo {
+
+ SourceLineInfo() = delete;
+ SourceLineInfo( char const* _file, std::size_t _line ) noexcept
+ : file( _file ),
+ line( _line )
+ {}
+
+ SourceLineInfo( SourceLineInfo const& other ) = default;
+ SourceLineInfo& operator = ( SourceLineInfo const& ) = default;
+ SourceLineInfo( SourceLineInfo&& ) noexcept = default;
+ SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default;
+
+ bool empty() const noexcept;
+ bool operator == ( SourceLineInfo const& other ) const noexcept;
+ bool operator < ( SourceLineInfo const& other ) const noexcept;
+
+ char const* file;
+ std::size_t line;
+ };
+
+ std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info );
+
+ // Bring in operator<< from global namespace into Catch namespace
+ // This is necessary because the overload of operator<< above makes
+ // lookup stop at namespace Catch
+ using ::operator<<;
+
+ // Use this in variadic streaming macros to allow
+ // >> +StreamEndStop
+ // as well as
+ // >> stuff +StreamEndStop
+ struct StreamEndStop {
+ std::string operator+() const;
+ };
+ template<typename T>
+ T const& operator + ( T const& value, StreamEndStop ) {
+ return value;
+ }
+}
+
+#define CATCH_INTERNAL_LINEINFO \
+ ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
+
+// end catch_common.h
+namespace Catch {
+
+ struct RegistrarForTagAliases {
+ RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
+ };
+
+} // end namespace Catch
+
+#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \
+ CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+ namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \
+ CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS
+
+// end catch_tag_alias_autoregistrar.h
+// start catch_test_registry.h
+
+// start catch_interfaces_testcase.h
+
+#include <vector>
+
+namespace Catch {
+
+ class TestSpec;
+
+ struct ITestInvoker {
+ virtual void invoke () const = 0;
+ virtual ~ITestInvoker();
+ };
+
+ class TestCase;
+ struct IConfig;
+
+ struct ITestCaseRegistry {
+ virtual ~ITestCaseRegistry();
+ virtual std::vector<TestCase> const& getAllTests() const = 0;
+ virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
+ };
+
+ bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
+ std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
+ std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
+
+}
+
+// end catch_interfaces_testcase.h
+// start catch_stringref.h
+
+#include <cstddef>
+#include <string>
+#include <iosfwd>
+
+namespace Catch {
+
+ /// A non-owning string class (similar to the forthcoming std::string_view)
+ /// Note that, because a StringRef may be a substring of another string,
+ /// it may not be null terminated. c_str() must return a null terminated
+ /// string, however, and so the StringRef will internally take ownership
+ /// (taking a copy), if necessary. In theory this ownership is not externally
+ /// visible - but it does mean (substring) StringRefs should not be shared between
+ /// threads.
+ class StringRef {
+ public:
+ using size_type = std::size_t;
+
+ private:
+ friend struct StringRefTestAccess;
+
+ char const* m_start;
+ size_type m_size;
+
+ char* m_data = nullptr;
+
+ void takeOwnership();
+
+ static constexpr char const* const s_empty = "";
+
+ public: // construction/ assignment
+ StringRef() noexcept
+ : StringRef( s_empty, 0 )
+ {}
+
+ StringRef( StringRef const& other ) noexcept
+ : m_start( other.m_start ),
+ m_size( other.m_size )
+ {}
+
+ StringRef( StringRef&& other ) noexcept
+ : m_start( other.m_start ),
+ m_size( other.m_size ),
+ m_data( other.m_data )
+ {
+ other.m_data = nullptr;
+ }
+
+ StringRef( char const* rawChars ) noexcept;
+
+ StringRef( char const* rawChars, size_type size ) noexcept
+ : m_start( rawChars ),
+ m_size( size )
+ {}
+
+ StringRef( std::string const& stdString ) noexcept
+ : m_start( stdString.c_str() ),
+ m_size( stdString.size() )
+ {}
+
+ ~StringRef() noexcept {
+ delete[] m_data;
+ }
+
+ auto operator = ( StringRef const &other ) noexcept -> StringRef& {
+ delete[] m_data;
+ m_data = nullptr;
+ m_start = other.m_start;
+ m_size = other.m_size;
+ return *this;
+ }
+
+ operator std::string() const;
+
+ void swap( StringRef& other ) noexcept;
+
+ public: // operators
+ auto operator == ( StringRef const& other ) const noexcept -> bool;
+ auto operator != ( StringRef const& other ) const noexcept -> bool;
+
+ auto operator[] ( size_type index ) const noexcept -> char;
+
+ public: // named queries
+ auto empty() const noexcept -> bool {
+ return m_size == 0;
+ }
+ auto size() const noexcept -> size_type {
+ return m_size;
+ }
+
+ auto numberOfCharacters() const noexcept -> size_type;
+ auto c_str() const -> char const*;
+
+ public: // substrings and searches
+ auto substr( size_type start, size_type size ) const noexcept -> StringRef;
+
+ // Returns the current start pointer.
+ // Note that the pointer can change when if the StringRef is a substring
+ auto currentData() const noexcept -> char const*;
+
+ private: // ownership queries - may not be consistent between calls
+ auto isOwned() const noexcept -> bool;
+ auto isSubstring() const noexcept -> bool;
+ };
+
+ auto operator + ( StringRef const& lhs, StringRef const& rhs ) -> std::string;
+ auto operator + ( StringRef const& lhs, char const* rhs ) -> std::string;
+ auto operator + ( char const* lhs, StringRef const& rhs ) -> std::string;
+
+ auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&;
+ auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&;
+
+ inline auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
+ return StringRef( rawChars, size );
+ }
+
+} // namespace Catch
+
+inline auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {
+ return Catch::StringRef( rawChars, size );
+}
+
+// end catch_stringref.h
+// start catch_type_traits.hpp
+
+
+#include <type_traits>
+
+namespace Catch{
+
+#ifdef CATCH_CPP17_OR_GREATER
+ template <typename...>
+ inline constexpr auto is_unique = std::true_type{};
+
+ template <typename T, typename... Rest>
+ inline constexpr auto is_unique<T, Rest...> = std::bool_constant<
+ (!std::is_same_v<T, Rest> && ...) && is_unique<Rest...>
+ >{};
+#else
+
+template <typename...>
+struct is_unique : std::true_type{};
+
+template <typename T0, typename T1, typename... Rest>
+struct is_unique<T0, T1, Rest...> : std::integral_constant
+<bool,
+ !std::is_same<T0, T1>::value
+ && is_unique<T0, Rest...>::value
+ && is_unique<T1, Rest...>::value
+>{};
+
+#endif
+}
+
+// end catch_type_traits.hpp
+// start catch_preprocessor.hpp
+
+
+#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__
+#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__)))
+
+#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__
+// MSVC needs more evaluations
+#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__)))
+#define CATCH_RECURSE(...) CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__))
+#else
+#define CATCH_RECURSE(...) CATCH_RECURSION_LEVEL5(__VA_ARGS__)
+#endif
+
+#define CATCH_REC_END(...)
+#define CATCH_REC_OUT
+
+#define CATCH_EMPTY()
+#define CATCH_DEFER(id) id CATCH_EMPTY()
+
+#define CATCH_REC_GET_END2() 0, CATCH_REC_END
+#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2
+#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1
+#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT
+#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0)
+#define CATCH_REC_NEXT(test, next) CATCH_REC_NEXT1(CATCH_REC_GET_END test, next)
+
+#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST2(f, x, peek, ...) f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
+
+#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...) f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+
+// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results,
+// and passes userdata as the first parameter to each invocation,
+// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c)
+#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param)
+#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__
+#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__
+#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
+
+#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__)
+
+#define INTERNAL_CATCH_TEMPLATE_UNIQUE_NAME2(Name, ...) INTERNAL_CATCH_TEMPLATE_UNIQUE_NAME3(Name, __VA_ARGS__)
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_TEMPLATE_UNIQUE_NAME3(Name,...) Name " - " #__VA_ARGS__
+#define INTERNAL_CATCH_TEMPLATE_UNIQUE_NAME(Name,...) INTERNAL_CATCH_TEMPLATE_UNIQUE_NAME2(Name, INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))
+#else
+// MSVC is adding extra space and needs more calls to properly remove ()
+#define INTERNAL_CATCH_TEMPLATE_UNIQUE_NAME3(Name,...) Name " -" #__VA_ARGS__
+#define INTERNAL_CATCH_TEMPLATE_UNIQUE_NAME1(Name, ...) INTERNAL_CATCH_TEMPLATE_UNIQUE_NAME2(Name, __VA_ARGS__)
+#define INTERNAL_CATCH_TEMPLATE_UNIQUE_NAME(Name, ...) INTERNAL_CATCH_TEMPLATE_UNIQUE_NAME1(Name, INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)))
+#endif
+
+#define INTERNAL_CATCH_MAKE_TYPE_LIST(types) TypeList<INTERNAL_CATCH_REMOVE_PARENS(types)>
+
+#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(types)\
+ CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,INTERNAL_CATCH_REMOVE_PARENS(types))
+
+// end catch_preprocessor.hpp
+// start catch_meta.hpp
+
+
+#include <type_traits>
+
+template< typename... >
+struct TypeList{};
+
+template< typename... >
+struct append;
+
+template< template<typename...> class L1
+ , typename...E1
+ , template<typename...> class L2
+ , typename...E2
+ >
+struct append< L1<E1...>, L2<E2...> >
+{
+ using type = L1<E1..., E2...>;
+};
+
+template< template<typename...> class L1
+ , typename...E1
+ , template<typename...> class L2
+ , typename...E2
+ , typename...Rest
+ >
+struct append< L1<E1...>, L2<E2...>, Rest...>
+{
+ using type = typename append< L1<E1..., E2...>, Rest... >::type;
+};
+
+template< template<typename...> class
+ , typename...
+ >
+struct rewrap;
+
+template< template<typename...> class Container
+ , template<typename...> class List
+ , typename...elems
+ >
+struct rewrap<Container, List<elems...>>
+{
+ using type = TypeList< Container< elems... > >;
+};
+
+template< template<typename...> class Container
+ , template<typename...> class List
+ , class...Elems
+ , typename...Elements>
+struct rewrap<Container, List<Elems...>, Elements...>
+{
+ using type = typename append<TypeList<Container<Elems...>>, typename rewrap<Container, Elements...>::type>::type;
+};
+
+template< template<typename...> class...Containers >
+struct combine
+{
+ template< typename...Types >
+ struct with_types
+ {
+ template< template <typename...> class Final >
+ struct into
+ {
+ using type = typename append<Final<>, typename rewrap<Containers, Types...>::type...>::type;
+ };
+ };
+};
+
+template<typename T>
+struct always_false : std::false_type {};
+
+// end catch_meta.hpp
+namespace Catch {
+
+template<typename C>
+class TestInvokerAsMethod : public ITestInvoker {
+ void (C::*m_testAsMethod)();
+public:
+ TestInvokerAsMethod( void (C::*testAsMethod)() ) noexcept : m_testAsMethod( testAsMethod ) {}
+
+ void invoke() const override {
+ C obj;
+ (obj.*m_testAsMethod)();
+ }
+};
+
+auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker*;
+
+template<typename C>
+auto makeTestInvoker( void (C::*testAsMethod)() ) noexcept -> ITestInvoker* {
+ return new(std::nothrow) TestInvokerAsMethod<C>( testAsMethod );
+}
+
+struct NameAndTags {
+ NameAndTags( StringRef const& name_ = StringRef(), StringRef const& tags_ = StringRef() ) noexcept;
+ StringRef name;
+ StringRef tags;
+};
+
+struct AutoReg : NonCopyable {
+ AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept;
+ ~AutoReg();
+};
+
+} // end namespace Catch
+
+#if defined(CATCH_CONFIG_DISABLE)
+ #define INTERNAL_CATCH_TESTCASE_NO_REGISTRATION( TestName, ... ) \
+ static void TestName()
+ #define INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION( TestName, ClassName, ... ) \
+ namespace{ \
+ struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
+ void test(); \
+ }; \
+ } \
+ void TestName::test()
+ #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION( TestName, ... ) \
+ template<typename TestType> \
+ static void TestName()
+ #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( TestName, ClassName, ... ) \
+ namespace{ \
+ template<typename TestType> \
+ struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
+ void test(); \
+ }; \
+ } \
+ template<typename TestType> \
+ void TestName::test()
+#endif
+
+ ///////////////////////////////////////////////////////////////////////////////
+ #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
+ static void TestName(); \
+ CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+ namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &TestName ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
+ CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS \
+ static void TestName()
+ #define INTERNAL_CATCH_TESTCASE( ... ) \
+ INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ )
+
+ ///////////////////////////////////////////////////////////////////////////////
+ #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
+ CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+ namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &QualifiedMethod ), CATCH_INTERNAL_LINEINFO, "&" #QualifiedMethod, Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
+ CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS
+
+ ///////////////////////////////////////////////////////////////////////////////
+ #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
+ CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+ namespace{ \
+ struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
+ void test(); \
+ }; \
+ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( Catch::makeTestInvoker( &TestName::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
+ } \
+ CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS \
+ void TestName::test()
+ #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
+ INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ )
+
+ ///////////////////////////////////////////////////////////////////////////////
+ #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
+ CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( Function ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
+ CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS
+
+ ///////////////////////////////////////////////////////////////////////////////
+ #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_2(TestName, TestFunc, Name, Tags, ... )\
+ CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+ template<typename TestType> \
+ static void TestFunc();\
+ namespace {\
+ template<typename...Types> \
+ struct TestName{\
+ template<typename...Ts> \
+ TestName(Ts...names){\
+ CATCH_INTERNAL_CHECK_UNIQUE_TYPES(CATCH_REC_LIST(INTERNAL_CATCH_REMOVE_PARENS, __VA_ARGS__)) \
+ using expander = int[];\
+ (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ names, Tags } ), 0)... };/* NOLINT */ \
+ }\
+ };\
+ INTERNAL_CATCH_TEMPLATE_REGISTRY_INITIATE(TestName, Name, __VA_ARGS__) \
+ }\
+ CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS \
+ template<typename TestType> \
+ static void TestFunc()
+
+#if defined(CATCH_CPP17_OR_GREATER)
+#define CATCH_INTERNAL_CHECK_UNIQUE_TYPES(...) static_assert(Catch::is_unique<__VA_ARGS__>,"Duplicate type detected in declaration of template test case");
+#else
+#define CATCH_INTERNAL_CHECK_UNIQUE_TYPES(...) static_assert(Catch::is_unique<__VA_ARGS__>::value,"Duplicate type detected in declaration of template test case");
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+ #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
+ INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, __VA_ARGS__ )
+#else
+ #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
+ INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, __VA_ARGS__ ) )
+#endif
+
+ #define INTERNAL_CATCH_TEMPLATE_REGISTRY_INITIATE(TestName, Name, ...)\
+ static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+ TestName<CATCH_REC_LIST(INTERNAL_CATCH_REMOVE_PARENS, __VA_ARGS__)>(CATCH_REC_LIST_UD(INTERNAL_CATCH_TEMPLATE_UNIQUE_NAME,Name, __VA_ARGS__));\
+ return 0;\
+ }();
+
+ #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(TestName, TestFuncName, Name, Tags, TmplTypes, TypesList) \
+ CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+ template<typename TestType> static void TestFuncName(); \
+ namespace { \
+ template<typename... Types> \
+ struct TestName { \
+ TestName() { \
+ CATCH_INTERNAL_CHECK_UNIQUE_TYPES(Types...) \
+ int index = 0; \
+ using expander = int[]; \
+ (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + Catch::StringMaker<int>::convert(index++), Tags } ), 0)... };/* NOLINT */ \
+ } \
+ }; \
+ static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
+ using TestInit = combine<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)> \
+ ::with_types<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(TypesList)>::into<TestName>::type; \
+ TestInit(); \
+ return 0; \
+ }(); \
+ } \
+ CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS \
+ template<typename TestType> \
+ static void TestFuncName()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+ #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
+ INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ),Name,Tags,__VA_ARGS__)
+#else
+ #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
+ INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, __VA_ARGS__ ) )
+#endif
+
+ #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, ... ) \
+ CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+ namespace{ \
+ template<typename TestType> \
+ struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
+ void test();\
+ };\
+ template<typename...Types> \
+ struct TestNameClass{\
+ template<typename...Ts> \
+ TestNameClass(Ts...names){\
+ CATCH_INTERNAL_CHECK_UNIQUE_TYPES(CATCH_REC_LIST(INTERNAL_CATCH_REMOVE_PARENS, __VA_ARGS__)) \
+ using expander = int[];\
+ (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ names, Tags } ), 0)... };/* NOLINT */ \
+ }\
+ };\
+ INTERNAL_CATCH_TEMPLATE_REGISTRY_INITIATE(TestNameClass, Name, __VA_ARGS__)\
+ }\
+ CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS\
+ template<typename TestType> \
+ void TestName<TestType>::test()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+ #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
+ INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, __VA_ARGS__ )
+#else
+ #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
+ INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, __VA_ARGS__ ) )
+#endif
+
+ #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2(TestNameClass, TestName, ClassName, Name, Tags, TmplTypes, TypesList)\
+ CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+ template<typename TestType> \
+ struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
+ void test();\
+ };\
+ namespace {\
+ template<typename...Types>\
+ struct TestNameClass{\
+ TestNameClass(){\
+ CATCH_INTERNAL_CHECK_UNIQUE_TYPES(Types...)\
+ int index = 0;\
+ using expander = int[];\
+ (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + Catch::StringMaker<int>::convert(index++), Tags } ), 0)... };/* NOLINT */ \
+ }\
+ };\
+ static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+ using TestInit = combine<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>\
+ ::with_types<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(TypesList)>::into<TestNameClass>::type;\
+ TestInit();\
+ return 0;\
+ }(); \
+ }\
+ CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS \
+ template<typename TestType> \
+ void TestName<TestType>::test()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+ #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
+ INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, __VA_ARGS__ )
+#else
+ #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
+ INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, __VA_ARGS__ ) )
+#endif
+
+// end catch_test_registry.h
+// start catch_capture.hpp
+
+// start catch_assertionhandler.h
+
+// start catch_assertioninfo.h
+
+// start catch_result_type.h
+
+namespace Catch {
+
+ // ResultWas::OfType enum
+ struct ResultWas { enum OfType {
+ Unknown = -1,
+ Ok = 0,
+ Info = 1,
+ Warning = 2,
+
+ FailureBit = 0x10,
+
+ ExpressionFailed = FailureBit | 1,
+ ExplicitFailure = FailureBit | 2,
+
+ Exception = 0x100 | FailureBit,
+
+ ThrewException = Exception | 1,
+ DidntThrowException = Exception | 2,
+
+ FatalErrorCondition = 0x200 | FailureBit
+
+ }; };
+
+ bool isOk( ResultWas::OfType resultType );
+ bool isJustInfo( int flags );
+
+ // ResultDisposition::Flags enum
+ struct ResultDisposition { enum Flags {
+ Normal = 0x01,
+
+ ContinueOnFailure = 0x02, // Failures fail test, but execution continues
+ FalseTest = 0x04, // Prefix expression with !
+ SuppressFail = 0x08 // Failures are reported but do not fail the test
+ }; };
+
+ ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs );
+
+ bool shouldContinueOnFailure( int flags );
+ inline bool isFalseTest( int flags ) { return ( flags & ResultDisposition::FalseTest ) != 0; }
+ bool shouldSuppressFailure( int flags );
+
+} // end namespace Catch
+
+// end catch_result_type.h
+namespace Catch {
+
+ struct AssertionInfo
+ {
+ StringRef macroName;
+ SourceLineInfo lineInfo;
+ StringRef capturedExpression;
+ ResultDisposition::Flags resultDisposition;
+
+ // We want to delete this constructor but a compiler bug in 4.8 means
+ // the struct is then treated as non-aggregate
+ //AssertionInfo() = delete;
+ };
+
+} // end namespace Catch
+
+// end catch_assertioninfo.h
+// start catch_decomposer.h
+
+// start catch_tostring.h
+
+#include <vector>
+#include <cstddef>
+#include <type_traits>
+#include <string>
+// start catch_stream.h
+
+#include <iosfwd>
+#include <cstddef>
+#include <ostream>
+
+namespace Catch {
+
+ std::ostream& cout();
+ std::ostream& cerr();
+ std::ostream& clog();
+
+ class StringRef;
+
+ struct IStream {
+ virtual ~IStream();
+ virtual std::ostream& stream() const = 0;
+ };
+
+ auto makeStream( StringRef const &filename ) -> IStream const*;
+
+ class ReusableStringStream {
+ std::size_t m_index;
+ std::ostream* m_oss;
+ public:
+ ReusableStringStream();
+ ~ReusableStringStream();
+
+ auto str() const -> std::string;
+
+ template<typename T>
+ auto operator << ( T const& value ) -> ReusableStringStream& {
+ *m_oss << value;
+ return *this;
+ }
+ auto get() -> std::ostream& { return *m_oss; }
+ };
+}
+
+// end catch_stream.h
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+#include <string_view>
+#endif
+
+#ifdef __OBJC__
+// start catch_objc_arc.hpp
+
+#import <Foundation/Foundation.h>
+
+#ifdef __has_feature
+#define CATCH_ARC_ENABLED __has_feature(objc_arc)
+#else
+#define CATCH_ARC_ENABLED 0
+#endif
+
+void arcSafeRelease( NSObject* obj );
+id performOptionalSelector( id obj, SEL sel );
+
+#if !CATCH_ARC_ENABLED
+inline void arcSafeRelease( NSObject* obj ) {
+ [obj release];
+}
+inline id performOptionalSelector( id obj, SEL sel ) {
+ if( [obj respondsToSelector: sel] )
+ return [obj performSelector: sel];
+ return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED
+#define CATCH_ARC_STRONG
+#else
+inline void arcSafeRelease( NSObject* ){}
+inline id performOptionalSelector( id obj, SEL sel ) {
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+#endif
+ if( [obj respondsToSelector: sel] )
+ return [obj performSelector: sel];
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+ return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
+#define CATCH_ARC_STRONG __strong
+#endif
+
+// end catch_objc_arc.hpp
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4180) // We attempt to stream a function (address) by const&, which MSVC complains about but is harmless
+#endif
+
+namespace Catch {
+ namespace Detail {
+
+ extern const std::string unprintableString;
+
+ std::string rawMemoryToString( const void *object, std::size_t size );
+
+ template<typename T>
+ std::string rawMemoryToString( const T& object ) {
+ return rawMemoryToString( &object, sizeof(object) );
+ }
+
+ template<typename T>
+ class IsStreamInsertable {
+ template<typename SS, typename TT>
+ static auto test(int)
+ -> decltype(std::declval<SS&>() << std::declval<TT>(), std::true_type());
+
+ template<typename, typename>
+ static auto test(...)->std::false_type;
+
+ public:
+ static const bool value = decltype(test<std::ostream, const T&>(0))::value;
+ };
+
+ template<typename E>
+ std::string convertUnknownEnumToString( E e );
+
+ template<typename T>
+ typename std::enable_if<
+ !std::is_enum<T>::value && !std::is_base_of<std::exception, T>::value,
+ std::string>::type convertUnstreamable( T const& ) {
+ return Detail::unprintableString;
+ }
+ template<typename T>
+ typename std::enable_if<
+ !std::is_enum<T>::value && std::is_base_of<std::exception, T>::value,
+ std::string>::type convertUnstreamable(T const& ex) {
+ return ex.what();
+ }
+
+ template<typename T>
+ typename std::enable_if<
+ std::is_enum<T>::value
+ , std::string>::type convertUnstreamable( T const& value ) {
+ return convertUnknownEnumToString( value );
+ }
+
+#if defined(_MANAGED)
+ //! Convert a CLR string to a utf8 std::string
+ template<typename T>
+ std::string clrReferenceToString( T^ ref ) {
+ if (ref == nullptr)
+ return std::string("null");
+ auto bytes = System::Text::Encoding::UTF8->GetBytes(ref->ToString());
+ cli::pin_ptr<System::Byte> p = &bytes[0];
+ return std::string(reinterpret_cast<char const *>(p), bytes->Length);
+ }
+#endif
+
+ } // namespace Detail
+
+ // If we decide for C++14, change these to enable_if_ts
+ template <typename T, typename = void>
+ struct StringMaker {
+ template <typename Fake = T>
+ static
+ typename std::enable_if<::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
+ convert(const Fake& value) {
+ ReusableStringStream rss;
+ // NB: call using the function-like syntax to avoid ambiguity with
+ // user-defined templated operator<< under clang.
+ rss.operator<<(value);
+ return rss.str();
+ }
+
+ template <typename Fake = T>
+ static
+ typename std::enable_if<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
+ convert( const Fake& value ) {
+#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER)
+ return Detail::convertUnstreamable(value);
+#else
+ return CATCH_CONFIG_FALLBACK_STRINGIFIER(value);
+#endif
+ }
+ };
+
+ namespace Detail {
+
+ // This function dispatches all stringification requests inside of Catch.
+ // Should be preferably called fully qualified, like ::Catch::Detail::stringify
+ template <typename T>
+ std::string stringify(const T& e) {
+ return ::Catch::StringMaker<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::convert(e);
+ }
+
+ template<typename E>
+ std::string convertUnknownEnumToString( E e ) {
+ return ::Catch::Detail::stringify(static_cast<typename std::underlying_type<E>::type>(e));
+ }
+
+#if defined(_MANAGED)
+ template <typename T>
+ std::string stringify( T^ e ) {
+ return ::Catch::StringMaker<T^>::convert(e);
+ }
+#endif
+
+ } // namespace Detail
+
+ // Some predefined specializations
+
+ template<>
+ struct StringMaker<std::string> {
+ static std::string convert(const std::string& str);
+ };
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+ template<>
+ struct StringMaker<std::string_view> {
+ static std::string convert(std::string_view str);
+ };
+#endif
+
+ template<>
+ struct StringMaker<char const *> {
+ static std::string convert(char const * str);
+ };
+ template<>
+ struct StringMaker<char *> {
+ static std::string convert(char * str);
+ };
+
+#ifdef CATCH_CONFIG_WCHAR
+ template<>
+ struct StringMaker<std::wstring> {
+ static std::string convert(const std::wstring& wstr);
+ };
+
+# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+ template<>
+ struct StringMaker<std::wstring_view> {
+ static std::string convert(std::wstring_view str);
+ };
+# endif
+
+ template<>
+ struct StringMaker<wchar_t const *> {
+ static std::string convert(wchar_t const * str);
+ };
+ template<>
+ struct StringMaker<wchar_t *> {
+ static std::string convert(wchar_t * str);
+ };
+#endif
+
+ // TBD: Should we use `strnlen` to ensure that we don't go out of the buffer,
+ // while keeping string semantics?
+ template<int SZ>
+ struct StringMaker<char[SZ]> {
+ static std::string convert(char const* str) {
+ return ::Catch::Detail::stringify(std::string{ str });
+ }
+ };
+ template<int SZ>
+ struct StringMaker<signed char[SZ]> {
+ static std::string convert(signed char const* str) {
+ return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
+ }
+ };
+ template<int SZ>
+ struct StringMaker<unsigned char[SZ]> {
+ static std::string convert(unsigned char const* str) {
+ return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
+ }
+ };
+
+ template<>
+ struct StringMaker<int> {
+ static std::string convert(int value);
+ };
+ template<>
+ struct StringMaker<long> {
+ static std::string convert(long value);
+ };
+ template<>
+ struct StringMaker<long long> {
+ static std::string convert(long long value);
+ };
+ template<>
+ struct StringMaker<unsigned int> {
+ static std::string convert(unsigned int value);
+ };
+ template<>
+ struct StringMaker<unsigned long> {
+ static std::string convert(unsigned long value);
+ };
+ template<>
+ struct StringMaker<unsigned long long> {
+ static std::string convert(unsigned long long value);
+ };
+
+ template<>
+ struct StringMaker<bool> {
+ static std::string convert(bool b);
+ };
+
+ template<>
+ struct StringMaker<char> {
+ static std::string convert(char c);
+ };
+ template<>
+ struct StringMaker<signed char> {
+ static std::string convert(signed char c);
+ };
+ template<>
+ struct StringMaker<unsigned char> {
+ static std::string convert(unsigned char c);
+ };
+
+ template<>
+ struct StringMaker<std::nullptr_t> {
+ static std::string convert(std::nullptr_t);
+ };
+
+ template<>
+ struct StringMaker<float> {
+ static std::string convert(float value);
+ };
+ template<>
+ struct StringMaker<double> {
+ static std::string convert(double value);
+ };
+
+ template <typename T>
+ struct StringMaker<T*> {
+ template <typename U>
+ static std::string convert(U* p) {
+ if (p) {
+ return ::Catch::Detail::rawMemoryToString(p);
+ } else {
+ return "nullptr";
+ }
+ }
+ };
+
+ template <typename R, typename C>
+ struct StringMaker<R C::*> {
+ static std::string convert(R C::* p) {
+ if (p) {
+ return ::Catch::Detail::rawMemoryToString(p);
+ } else {
+ return "nullptr";
+ }
+ }
+ };
+
+#if defined(_MANAGED)
+ template <typename T>
+ struct StringMaker<T^> {
+ static std::string convert( T^ ref ) {
+ return ::Catch::Detail::clrReferenceToString(ref);
+ }
+ };
+#endif
+
+ namespace Detail {
+ template<typename InputIterator>
+ std::string rangeToString(InputIterator first, InputIterator last) {
+ ReusableStringStream rss;
+ rss << "{ ";
+ if (first != last) {
+ rss << ::Catch::Detail::stringify(*first);
+ for (++first; first != last; ++first)
+ rss << ", " << ::Catch::Detail::stringify(*first);
+ }
+ rss << " }";
+ return rss.str();
+ }
+ }
+
+#ifdef __OBJC__
+ template<>
+ struct StringMaker<NSString*> {
+ static std::string convert(NSString * nsstring) {
+ if (!nsstring)
+ return "nil";
+ return std::string("@") + [nsstring UTF8String];
+ }
+ };
+ template<>
+ struct StringMaker<NSObject*> {
+ static std::string convert(NSObject* nsObject) {
+ return ::Catch::Detail::stringify([nsObject description]);
+ }
+
+ };
+ namespace Detail {
+ inline std::string stringify( NSString* nsstring ) {
+ return StringMaker<NSString*>::convert( nsstring );
+ }
+
+ } // namespace Detail
+#endif // __OBJC__
+
+} // namespace Catch
+
+//////////////////////////////////////////////////////
+// Separate std-lib types stringification, so it can be selectively enabled
+// This means that we do not bring in
+
+#if defined(CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS)
+# define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
+# define CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
+# define CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
+# define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+# define CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
+#endif
+
+// Separate std::pair specialization
+#if defined(CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER)
+#include <utility>
+namespace Catch {
+ template<typename T1, typename T2>
+ struct StringMaker<std::pair<T1, T2> > {
+ static std::string convert(const std::pair<T1, T2>& pair) {
+ ReusableStringStream rss;
+ rss << "{ "
+ << ::Catch::Detail::stringify(pair.first)
+ << ", "
+ << ::Catch::Detail::stringify(pair.second)
+ << " }";
+ return rss.str();
+ }
+ };
+}
+#endif // CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
+
+#if defined(CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_OPTIONAL)
+#include <optional>
+namespace Catch {
+ template<typename T>
+ struct StringMaker<std::optional<T> > {
+ static std::string convert(const std::optional<T>& optional) {
+ ReusableStringStream rss;
+ if (optional.has_value()) {
+ rss << ::Catch::Detail::stringify(*optional);
+ } else {
+ rss << "{ }";
+ }
+ return rss.str();
+ }
+ };
+}
+#endif // CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
+
+// Separate std::tuple specialization
+#if defined(CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER)
+#include <tuple>
+namespace Catch {
+ namespace Detail {
+ template<
+ typename Tuple,
+ std::size_t N = 0,
+ bool = (N < std::tuple_size<Tuple>::value)
+ >
+ struct TupleElementPrinter {
+ static void print(const Tuple& tuple, std::ostream& os) {
+ os << (N ? ", " : " ")
+ << ::Catch::Detail::stringify(std::get<N>(tuple));
+ TupleElementPrinter<Tuple, N + 1>::print(tuple, os);
+ }
+ };
+
+ template<
+ typename Tuple,
+ std::size_t N
+ >
+ struct TupleElementPrinter<Tuple, N, false> {
+ static void print(const Tuple&, std::ostream&) {}
+ };
+
+ }
+
+ template<typename ...Types>
+ struct StringMaker<std::tuple<Types...>> {
+ static std::string convert(const std::tuple<Types...>& tuple) {
+ ReusableStringStream rss;
+ rss << '{';
+ Detail::TupleElementPrinter<std::tuple<Types...>>::print(tuple, rss.get());
+ rss << " }";
+ return rss.str();
+ }
+ };
+}
+#endif // CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
+
+#if defined(CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_VARIANT)
+#include <variant>
+namespace Catch {
+ template<>
+ struct StringMaker<std::monostate> {
+ static std::string convert(const std::monostate&) {
+ return "{ }";
+ }
+ };
+
+ template<typename... Elements>
+ struct StringMaker<std::variant<Elements...>> {
+ static std::string convert(const std::variant<Elements...>& variant) {
+ if (variant.valueless_by_exception()) {
+ return "{valueless variant}";
+ } else {
+ return std::visit(
+ [](const auto& value) {
+ return ::Catch::Detail::stringify(value);
+ },
+ variant
+ );
+ }
+ }
+ };
+}
+#endif // CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
+
+namespace Catch {
+ struct not_this_one {}; // Tag type for detecting which begin/ end are being selected
+
+ // Import begin/ end from std here so they are considered alongside the fallback (...) overloads in this namespace
+ using std::begin;
+ using std::end;
+
+ not_this_one begin( ... );
+ not_this_one end( ... );
+
+ template <typename T>
+ struct is_range {
+ static const bool value =
+ !std::is_same<decltype(begin(std::declval<T>())), not_this_one>::value &&
+ !std::is_same<decltype(end(std::declval<T>())), not_this_one>::value;
+ };
+
+#if defined(_MANAGED) // Managed types are never ranges
+ template <typename T>
+ struct is_range<T^> {
+ static const bool value = false;
+ };
+#endif
+
+ template<typename Range>
+ std::string rangeToString( Range const& range ) {
+ return ::Catch::Detail::rangeToString( begin( range ), end( range ) );
+ }
+
+ // Handle vector<bool> specially
+ template<typename Allocator>
+ std::string rangeToString( std::vector<bool, Allocator> const& v ) {
+ ReusableStringStream rss;
+ rss << "{ ";
+ bool first = true;
+ for( bool b : v ) {
+ if( first )
+ first = false;
+ else
+ rss << ", ";
+ rss << ::Catch::Detail::stringify( b );
+ }
+ rss << " }";
+ return rss.str();
+ }
+
+ template<typename R>
+ struct StringMaker<R, typename std::enable_if<is_range<R>::value && !::Catch::Detail::IsStreamInsertable<R>::value>::type> {
+ static std::string convert( R const& range ) {
+ return rangeToString( range );
+ }
+ };
+
+ template <typename T, int SZ>
+ struct StringMaker<T[SZ]> {
+ static std::string convert(T const(&arr)[SZ]) {
+ return rangeToString(arr);
+ }
+ };
+
+} // namespace Catch
+
+// Separate std::chrono::duration specialization
+#if defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#include <ctime>
+#include <ratio>
+#include <chrono>
+
+namespace Catch {
+
+template <class Ratio>
+struct ratio_string {
+ static std::string symbol();
+};
+
+template <class Ratio>
+std::string ratio_string<Ratio>::symbol() {
+ Catch::ReusableStringStream rss;
+ rss << '[' << Ratio::num << '/'
+ << Ratio::den << ']';
+ return rss.str();
+}
+template <>
+struct ratio_string<std::atto> {
+ static std::string symbol();
+};
+template <>
+struct ratio_string<std::femto> {
+ static std::string symbol();
+};
+template <>
+struct ratio_string<std::pico> {
+ static std::string symbol();
+};
+template <>
+struct ratio_string<std::nano> {
+ static std::string symbol();
+};
+template <>
+struct ratio_string<std::micro> {
+ static std::string symbol();
+};
+template <>
+struct ratio_string<std::milli> {
+ static std::string symbol();
+};
+
+ ////////////
+ // std::chrono::duration specializations
+ template<typename Value, typename Ratio>
+ struct StringMaker<std::chrono::duration<Value, Ratio>> {
+ static std::string convert(std::chrono::duration<Value, Ratio> const& duration) {
+ ReusableStringStream rss;
+ rss << duration.count() << ' ' << ratio_string<Ratio>::symbol() << 's';
+ return rss.str();
+ }
+ };
+ template<typename Value>
+ struct StringMaker<std::chrono::duration<Value, std::ratio<1>>> {
+ static std::string convert(std::chrono::duration<Value, std::ratio<1>> const& duration) {
+ ReusableStringStream rss;
+ rss << duration.count() << " s";
+ return rss.str();
+ }
+ };
+ template<typename Value>
+ struct StringMaker<std::chrono::duration<Value, std::ratio<60>>> {
+ static std::string convert(std::chrono::duration<Value, std::ratio<60>> const& duration) {
+ ReusableStringStream rss;
+ rss << duration.count() << " m";
+ return rss.str();
+ }
+ };
+ template<typename Value>
+ struct StringMaker<std::chrono::duration<Value, std::ratio<3600>>> {
+ static std::string convert(std::chrono::duration<Value, std::ratio<3600>> const& duration) {
+ ReusableStringStream rss;
+ rss << duration.count() << " h";
+ return rss.str();
+ }
+ };
+
+ ////////////
+ // std::chrono::time_point specialization
+ // Generic time_point cannot be specialized, only std::chrono::time_point<system_clock>
+ template<typename Clock, typename Duration>
+ struct StringMaker<std::chrono::time_point<Clock, Duration>> {
+ static std::string convert(std::chrono::time_point<Clock, Duration> const& time_point) {
+ return ::Catch::Detail::stringify(time_point.time_since_epoch()) + " since epoch";
+ }
+ };
+ // std::chrono::time_point<system_clock> specialization
+ template<typename Duration>
+ struct StringMaker<std::chrono::time_point<std::chrono::system_clock, Duration>> {
+ static std::string convert(std::chrono::time_point<std::chrono::system_clock, Duration> const& time_point) {
+ auto converted = std::chrono::system_clock::to_time_t(time_point);
+
+#ifdef _MSC_VER
+ std::tm timeInfo = {};
+ gmtime_s(&timeInfo, &converted);
+#else
+ std::tm* timeInfo = std::gmtime(&converted);
+#endif
+
+ auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
+ char timeStamp[timeStampSize];
+ const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+#ifdef _MSC_VER
+ std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+#else
+ std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
+#endif
+ return std::string(timeStamp);
+ }
+ };
+}
+#endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// end catch_tostring.h
+#include <iosfwd>
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
+#pragma warning(disable:4018) // more "signed/unsigned mismatch"
+#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform)
+#pragma warning(disable:4180) // qualifier applied to function type has no meaning
+#pragma warning(disable:4800) // Forcing result to true or false
+#endif
+
+namespace Catch {
+
+ struct ITransientExpression {
+ auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
+ auto getResult() const -> bool { return m_result; }
+ virtual void streamReconstructedExpression( std::ostream &os ) const = 0;
+
+ ITransientExpression( bool isBinaryExpression, bool result )
+ : m_isBinaryExpression( isBinaryExpression ),
+ m_result( result )
+ {}
+
+ // We don't actually need a virtual destructor, but many static analysers
+ // complain if it's not here :-(
+ virtual ~ITransientExpression();
+
+ bool m_isBinaryExpression;
+ bool m_result;
+
+ };
+
+ void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs );
+
+ template<typename LhsT, typename RhsT>
+ class BinaryExpr : public ITransientExpression {
+ LhsT m_lhs;
+ StringRef m_op;
+ RhsT m_rhs;
+
+ void streamReconstructedExpression( std::ostream &os ) const override {
+ formatReconstructedExpression
+ ( os, Catch::Detail::stringify( m_lhs ), m_op, Catch::Detail::stringify( m_rhs ) );
+ }
+
+ public:
+ BinaryExpr( bool comparisonResult, LhsT lhs, StringRef op, RhsT rhs )
+ : ITransientExpression{ true, comparisonResult },
+ m_lhs( lhs ),
+ m_op( op ),
+ m_rhs( rhs )
+ {}
+
+ template<typename T>
+ auto operator && ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+ static_assert(always_false<T>::value,
+ "chained comparisons are not supported inside assertions, "
+ "wrap the expression inside parentheses, or decompose it");
+ }
+
+ template<typename T>
+ auto operator || ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+ static_assert(always_false<T>::value,
+ "chained comparisons are not supported inside assertions, "
+ "wrap the expression inside parentheses, or decompose it");
+ }
+
+ template<typename T>
+ auto operator == ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+ static_assert(always_false<T>::value,
+ "chained comparisons are not supported inside assertions, "
+ "wrap the expression inside parentheses, or decompose it");
+ }
+
+ template<typename T>
+ auto operator != ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+ static_assert(always_false<T>::value,
+ "chained comparisons are not supported inside assertions, "
+ "wrap the expression inside parentheses, or decompose it");
+ }
+
+ template<typename T>
+ auto operator > ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+ static_assert(always_false<T>::value,
+ "chained comparisons are not supported inside assertions, "
+ "wrap the expression inside parentheses, or decompose it");
+ }
+
+ template<typename T>
+ auto operator < ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+ static_assert(always_false<T>::value,
+ "chained comparisons are not supported inside assertions, "
+ "wrap the expression inside parentheses, or decompose it");
+ }
+
+ template<typename T>
+ auto operator >= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+ static_assert(always_false<T>::value,
+ "chained comparisons are not supported inside assertions, "
+ "wrap the expression inside parentheses, or decompose it");
+ }
+
+ template<typename T>
+ auto operator <= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+ static_assert(always_false<T>::value,
+ "chained comparisons are not supported inside assertions, "
+ "wrap the expression inside parentheses, or decompose it");
+ }
+ };
+
+ template<typename LhsT>
+ class UnaryExpr : public ITransientExpression {
+ LhsT m_lhs;
+
+ void streamReconstructedExpression( std::ostream &os ) const override {
+ os << Catch::Detail::stringify( m_lhs );
+ }
+
+ public:
+ explicit UnaryExpr( LhsT lhs )
+ : ITransientExpression{ false, static_cast<bool>(lhs) },
+ m_lhs( lhs )
+ {}
+ };
+
+ // Specialised comparison functions to handle equality comparisons between ints and pointers (NULL deduces as an int)
+ template<typename LhsT, typename RhsT>
+ auto compareEqual( LhsT const& lhs, RhsT const& rhs ) -> bool { return static_cast<bool>(lhs == rhs); }
+ template<typename T>
+ auto compareEqual( T* const& lhs, int rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
+ template<typename T>
+ auto compareEqual( T* const& lhs, long rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
+ template<typename T>
+ auto compareEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
+ template<typename T>
+ auto compareEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
+
+ template<typename LhsT, typename RhsT>
+ auto compareNotEqual( LhsT const& lhs, RhsT&& rhs ) -> bool { return static_cast<bool>(lhs != rhs); }
+ template<typename T>
+ auto compareNotEqual( T* const& lhs, int rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
+ template<typename T>
+ auto compareNotEqual( T* const& lhs, long rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
+ template<typename T>
+ auto compareNotEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
+ template<typename T>
+ auto compareNotEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
+
+ template<typename LhsT>
+ class ExprLhs {
+ LhsT m_lhs;
+ public:
+ explicit ExprLhs( LhsT lhs ) : m_lhs( lhs ) {}
+
+ template<typename RhsT>
+ auto operator == ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+ return { compareEqual( m_lhs, rhs ), m_lhs, "==", rhs };
+ }
+ auto operator == ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
+ return { m_lhs == rhs, m_lhs, "==", rhs };
+ }
+
+ template<typename RhsT>
+ auto operator != ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+ return { compareNotEqual( m_lhs, rhs ), m_lhs, "!=", rhs };
+ }
+ auto operator != ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
+ return { m_lhs != rhs, m_lhs, "!=", rhs };
+ }
+
+ template<typename RhsT>
+ auto operator > ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+ return { static_cast<bool>(m_lhs > rhs), m_lhs, ">", rhs };
+ }
+ template<typename RhsT>
+ auto operator < ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+ return { static_cast<bool>(m_lhs < rhs), m_lhs, "<", rhs };
+ }
+ template<typename RhsT>
+ auto operator >= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+ return { static_cast<bool>(m_lhs >= rhs), m_lhs, ">=", rhs };
+ }
+ template<typename RhsT>
+ auto operator <= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+ return { static_cast<bool>(m_lhs <= rhs), m_lhs, "<=", rhs };
+ }
+
+ template<typename RhsT>
+ auto operator && ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
+ static_assert(always_false<RhsT>::value,
+ "operator&& is not supported inside assertions, "
+ "wrap the expression inside parentheses, or decompose it");
+ }
+
+ template<typename RhsT>
+ auto operator || ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
+ static_assert(always_false<RhsT>::value,
+ "operator|| is not supported inside assertions, "
+ "wrap the expression inside parentheses, or decompose it");
+ }
+
+ auto makeUnaryExpr() const -> UnaryExpr<LhsT> {
+ return UnaryExpr<LhsT>{ m_lhs };
+ }
+ };
+
+ void handleExpression( ITransientExpression const& expr );
+
+ template<typename T>
+ void handleExpression( ExprLhs<T> const& expr ) {
+ handleExpression( expr.makeUnaryExpr() );
+ }
+
+ struct Decomposer {
+ template<typename T>
+ auto operator <= ( T const& lhs ) -> ExprLhs<T const&> {
+ return ExprLhs<T const&>{ lhs };
+ }
+
+ auto operator <=( bool value ) -> ExprLhs<bool> {
+ return ExprLhs<bool>{ value };
+ }
+ };
+
+} // end namespace Catch
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// end catch_decomposer.h
+// start catch_interfaces_capture.h
+
+#include <string>
+
+namespace Catch {
+
+ class AssertionResult;
+ struct AssertionInfo;
+ struct SectionInfo;
+ struct SectionEndInfo;
+ struct MessageInfo;
+ struct Counts;
+ struct BenchmarkInfo;
+ struct BenchmarkStats;
+ struct AssertionReaction;
+ struct SourceLineInfo;
+
+ struct ITransientExpression;
+ struct IGeneratorTracker;
+
+ struct IResultCapture {
+
+ virtual ~IResultCapture();
+
+ virtual bool sectionStarted( SectionInfo const& sectionInfo,
+ Counts& assertions ) = 0;
+ virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
+ virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
+
+ virtual auto acquireGeneratorTracker( SourceLineInfo const& lineInfo ) -> IGeneratorTracker& = 0;
+
+ virtual void benchmarkStarting( BenchmarkInfo const& info ) = 0;
+ virtual void benchmarkEnded( BenchmarkStats const& stats ) = 0;
+
+ virtual void pushScopedMessage( MessageInfo const& message ) = 0;
+ virtual void popScopedMessage( MessageInfo const& message ) = 0;
+
+ virtual void handleFatalErrorCondition( StringRef message ) = 0;
+
+ virtual void handleExpr
+ ( AssertionInfo const& info,
+ ITransientExpression const& expr,
+ AssertionReaction& reaction ) = 0;
+ virtual void handleMessage
+ ( AssertionInfo const& info,
+ ResultWas::OfType resultType,
+ StringRef const& message,
+ AssertionReaction& reaction ) = 0;
+ virtual void handleUnexpectedExceptionNotThrown
+ ( AssertionInfo const& info,
+ AssertionReaction& reaction ) = 0;
+ virtual void handleUnexpectedInflightException
+ ( AssertionInfo const& info,
+ std::string const& message,
+ AssertionReaction& reaction ) = 0;
+ virtual void handleIncomplete
+ ( AssertionInfo const& info ) = 0;
+ virtual void handleNonExpr
+ ( AssertionInfo const &info,
+ ResultWas::OfType resultType,
+ AssertionReaction &reaction ) = 0;
+
+ virtual bool lastAssertionPassed() = 0;
+ virtual void assertionPassed() = 0;
+
+ // Deprecated, do not use:
+ virtual std::string getCurrentTestName() const = 0;
+ virtual const AssertionResult* getLastResult() const = 0;
+ virtual void exceptionEarlyReported() = 0;
+ };
+
+ IResultCapture& getResultCapture();
+}
+
+// end catch_interfaces_capture.h
+namespace Catch {
+
+ struct TestFailureException{};
+ struct AssertionResultData;
+ struct IResultCapture;
+ class RunContext;
+
+ class LazyExpression {
+ friend class AssertionHandler;
+ friend struct AssertionStats;
+ friend class RunContext;
+
+ ITransientExpression const* m_transientExpression = nullptr;
+ bool m_isNegated;
+ public:
+ LazyExpression( bool isNegated );
+ LazyExpression( LazyExpression const& other );
+ LazyExpression& operator = ( LazyExpression const& ) = delete;
+
+ explicit operator bool() const;
+
+ friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
+ };
+
+ struct AssertionReaction {
+ bool shouldDebugBreak = false;
+ bool shouldThrow = false;
+ };
+
+ class AssertionHandler {
+ AssertionInfo m_assertionInfo;
+ AssertionReaction m_reaction;
+ bool m_completed = false;
+ IResultCapture& m_resultCapture;
+
+ public:
+ AssertionHandler
+ ( StringRef const& macroName,
+ SourceLineInfo const& lineInfo,
+ StringRef capturedExpression,
+ ResultDisposition::Flags resultDisposition );
+ ~AssertionHandler() {
+ if ( !m_completed ) {
+ m_resultCapture.handleIncomplete( m_assertionInfo );
+ }
+ }
+
+ template<typename T>
+ void handleExpr( ExprLhs<T> const& expr ) {
+ handleExpr( expr.makeUnaryExpr() );
+ }
+ void handleExpr( ITransientExpression const& expr );
+
+ void handleMessage(ResultWas::OfType resultType, StringRef const& message);
+
+ void handleExceptionThrownAsExpected();
+ void handleUnexpectedExceptionNotThrown();
+ void handleExceptionNotThrownAsExpected();
+ void handleThrowingCallSkipped();
+ void handleUnexpectedInflightException();
+
+ void complete();
+ void setCompleted();
+
+ // query
+ auto allowThrows() const -> bool;
+ };
+
+ void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString );
+
+} // namespace Catch
+
+// end catch_assertionhandler.h
+// start catch_message.h
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+
+ struct MessageInfo {
+ MessageInfo( StringRef const& _macroName,
+ SourceLineInfo const& _lineInfo,
+ ResultWas::OfType _type );
+
+ StringRef macroName;
+ std::string message;
+ SourceLineInfo lineInfo;
+ ResultWas::OfType type;
+ unsigned int sequence;
+
+ bool operator == ( MessageInfo const& other ) const;
+ bool operator < ( MessageInfo const& other ) const;
+ private:
+ static unsigned int globalCount;
+ };
+
+ struct MessageStream {
+
+ template<typename T>
+ MessageStream& operator << ( T const& value ) {
+ m_stream << value;
+ return *this;
+ }
+
+ ReusableStringStream m_stream;
+ };
+
+ struct MessageBuilder : MessageStream {
+ MessageBuilder( StringRef const& macroName,
+ SourceLineInfo const& lineInfo,
+ ResultWas::OfType type );
+
+ template<typename T>
+ MessageBuilder& operator << ( T const& value ) {
+ m_stream << value;
+ return *this;
+ }
+
+ MessageInfo m_info;
+ };
+
+ class ScopedMessage {
+ public:
+ explicit ScopedMessage( MessageBuilder const& builder );
+ ~ScopedMessage();
+
+ MessageInfo m_info;
+ };
+
+ class Capturer {
+ std::vector<MessageInfo> m_messages;
+ IResultCapture& m_resultCapture = getResultCapture();
+ size_t m_captured = 0;
+ public:
+ Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
+ ~Capturer();
+
+ void captureValue( size_t index, std::string const& value );
+
+ template<typename T>
+ void captureValues( size_t index, T const& value ) {
+ captureValue( index, Catch::Detail::stringify( value ) );
+ }
+
+ template<typename T, typename... Ts>
+ void captureValues( size_t index, T const& value, Ts const&... values ) {
+ captureValue( index, Catch::Detail::stringify(value) );
+ captureValues( index+1, values... );
+ }
+ };
+
+} // end namespace Catch
+
+// end catch_message.h
+#if !defined(CATCH_CONFIG_DISABLE)
+
+#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
+ #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__
+#else
+ #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"
+#endif
+
+#if defined(CATCH_CONFIG_FAST_COMPILE) || defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+
+///////////////////////////////////////////////////////////////////////////////
+// Another way to speed-up compilation is to omit local try-catch for REQUIRE*
+// macros.
+#define INTERNAL_CATCH_TRY
+#define INTERNAL_CATCH_CATCH( capturer )
+
+#else // CATCH_CONFIG_FAST_COMPILE
+
+#define INTERNAL_CATCH_TRY try
+#define INTERNAL_CATCH_CATCH( handler ) catch(...) { handler.handleUnexpectedInflightException(); }
+
+#endif
+
+#define INTERNAL_CATCH_REACT( handler ) handler.complete();
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TEST( macroName, resultDisposition, ... ) \
+ do { \
+ Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+ INTERNAL_CATCH_TRY { \
+ CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+ catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); \
+ CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \
+ } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
+ INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+ } while( (void)0, false && static_cast<bool>( !!(__VA_ARGS__) ) ) // the expression here is never evaluated at runtime but it forces the compiler to give it a look
+ // The double negation silences MSVC's C4800 warning, the static_cast forces short-circuit evaluation if the type has overloaded &&.
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_IF( macroName, resultDisposition, ... ) \
+ INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
+ if( Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, ... ) \
+ INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
+ if( !Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, ... ) \
+ do { \
+ Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+ try { \
+ static_cast<void>(__VA_ARGS__); \
+ catchAssertionHandler.handleExceptionNotThrownAsExpected(); \
+ } \
+ catch( ... ) { \
+ catchAssertionHandler.handleUnexpectedInflightException(); \
+ } \
+ INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+ } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, ... ) \
+ do { \
+ Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition); \
+ if( catchAssertionHandler.allowThrows() ) \
+ try { \
+ static_cast<void>(__VA_ARGS__); \
+ catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+ } \
+ catch( ... ) { \
+ catchAssertionHandler.handleExceptionThrownAsExpected(); \
+ } \
+ else \
+ catchAssertionHandler.handleThrowingCallSkipped(); \
+ INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+ } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \
+ do { \
+ Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \
+ if( catchAssertionHandler.allowThrows() ) \
+ try { \
+ static_cast<void>(expr); \
+ catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+ } \
+ catch( exceptionType const& ) { \
+ catchAssertionHandler.handleExceptionThrownAsExpected(); \
+ } \
+ catch( ... ) { \
+ catchAssertionHandler.handleUnexpectedInflightException(); \
+ } \
+ else \
+ catchAssertionHandler.handleThrowingCallSkipped(); \
+ INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+ } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \
+ do { \
+ Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::StringRef(), resultDisposition ); \
+ catchAssertionHandler.handleMessage( messageType, ( Catch::MessageStream() << __VA_ARGS__ + ::Catch::StreamEndStop() ).m_stream.str() ); \
+ INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+ } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_CAPTURE( varName, macroName, ... ) \
+ auto varName = Catch::Capturer( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info, #__VA_ARGS__ ); \
+ varName.captureValues( 0, __VA_ARGS__ )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_INFO( macroName, log ) \
+ Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log );
+
+///////////////////////////////////////////////////////////////////////////////
+// Although this is matcher-based, it can be used with just a string
+#define INTERNAL_CATCH_THROWS_STR_MATCHES( macroName, resultDisposition, matcher, ... ) \
+ do { \
+ Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+ if( catchAssertionHandler.allowThrows() ) \
+ try { \
+ static_cast<void>(__VA_ARGS__); \
+ catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+ } \
+ catch( ... ) { \
+ Catch::handleExceptionMatchExpr( catchAssertionHandler, matcher, #matcher##_catch_sr ); \
+ } \
+ else \
+ catchAssertionHandler.handleThrowingCallSkipped(); \
+ INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+ } while( false )
+
+#endif // CATCH_CONFIG_DISABLE
+
+// end catch_capture.hpp
+// start catch_section.h
+
+// start catch_section_info.h
+
+// start catch_totals.h
+
+#include <cstddef>
+
+namespace Catch {
+
+ struct Counts {
+ Counts operator - ( Counts const& other ) const;
+ Counts& operator += ( Counts const& other );
+
+ std::size_t total() const;
+ bool allPassed() const;
+ bool allOk() const;
+
+ std::size_t passed = 0;
+ std::size_t failed = 0;
+ std::size_t failedButOk = 0;
+ };
+
+ struct Totals {
+
+ Totals operator - ( Totals const& other ) const;
+ Totals& operator += ( Totals const& other );
+
+ Totals delta( Totals const& prevTotals ) const;
+
+ int error = 0;
+ Counts assertions;
+ Counts testCases;
+ };
+}
+
+// end catch_totals.h
+#include <string>
+
+namespace Catch {
+
+ struct SectionInfo {
+ SectionInfo
+ ( SourceLineInfo const& _lineInfo,
+ std::string const& _name );
+
+ // Deprecated
+ SectionInfo
+ ( SourceLineInfo const& _lineInfo,
+ std::string const& _name,
+ std::string const& ) : SectionInfo( _lineInfo, _name ) {}
+
+ std::string name;
+ std::string description; // !Deprecated: this will always be empty
+ SourceLineInfo lineInfo;
+ };
+
+ struct SectionEndInfo {
+ SectionInfo sectionInfo;
+ Counts prevAssertions;
+ double durationInSeconds;
+ };
+
+} // end namespace Catch
+
+// end catch_section_info.h
+// start catch_timer.h
+
+#include <cstdint>
+
+namespace Catch {
+
+ auto getCurrentNanosecondsSinceEpoch() -> uint64_t;
+ auto getEstimatedClockResolution() -> uint64_t;
+
+ class Timer {
+ uint64_t m_nanoseconds = 0;
+ public:
+ void start();
+ auto getElapsedNanoseconds() const -> uint64_t;
+ auto getElapsedMicroseconds() const -> uint64_t;
+ auto getElapsedMilliseconds() const -> unsigned int;
+ auto getElapsedSeconds() const -> double;
+ };
+
+} // namespace Catch
+
+// end catch_timer.h
+#include <string>
+
+namespace Catch {
+
+ class Section : NonCopyable {
+ public:
+ Section( SectionInfo const& info );
+ ~Section();
+
+ // This indicates whether the section should be executed or not
+ explicit operator bool() const;
+
+ private:
+ SectionInfo m_info;
+
+ std::string m_name;
+ Counts m_assertions;
+ bool m_sectionIncluded;
+ Timer m_timer;
+ };
+
+} // end namespace Catch
+
+#define INTERNAL_CATCH_SECTION( ... ) \
+ CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+ if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
+ CATCH_INTERNAL_UNSUPPRESS_UNUSED_WARNINGS
+
+#define INTERNAL_CATCH_DYNAMIC_SECTION( ... ) \
+ CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+ if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, (Catch::ReusableStringStream() << __VA_ARGS__).str() ) ) \
+ CATCH_INTERNAL_UNSUPPRESS_UNUSED_WARNINGS
+
+// end catch_section.h
+// start catch_benchmark.h
+
+#include <cstdint>
+#include <string>
+
+namespace Catch {
+
+ class BenchmarkLooper {
+
+ std::string m_name;
+ std::size_t m_count = 0;
+ std::size_t m_iterationsToRun = 1;
+ uint64_t m_resolution;
+ Timer m_timer;
+
+ static auto getResolution() -> uint64_t;
+ public:
+ // Keep most of this inline as it's on the code path that is being timed
+ BenchmarkLooper( StringRef name )
+ : m_name( name ),
+ m_resolution( getResolution() )
+ {
+ reportStart();
+ m_timer.start();
+ }
+
+ explicit operator bool() {
+ if( m_count < m_iterationsToRun )
+ return true;
+ return needsMoreIterations();
+ }
+
+ void increment() {
+ ++m_count;
+ }
+
+ void reportStart();
+ auto needsMoreIterations() -> bool;
+ };
+
+} // end namespace Catch
+
+#define BENCHMARK( name ) \
+ for( Catch::BenchmarkLooper looper( name ); looper; looper.increment() )
+
+// end catch_benchmark.h
+// start catch_interfaces_exception.h
+
+// start catch_interfaces_registry_hub.h
+
+#include <string>
+#include <memory>
+
+namespace Catch {
+
+ class TestCase;
+ struct ITestCaseRegistry;
+ struct IExceptionTranslatorRegistry;
+ struct IExceptionTranslator;
+ struct IReporterRegistry;
+ struct IReporterFactory;
+ struct ITagAliasRegistry;
+ class StartupExceptionRegistry;
+
+ using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
+
+ struct IRegistryHub {
+ virtual ~IRegistryHub();
+
+ virtual IReporterRegistry const& getReporterRegistry() const = 0;
+ virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
+ virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
+
+ virtual IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const = 0;
+
+ virtual StartupExceptionRegistry const& getStartupExceptionRegistry() const = 0;
+ };
+
+ struct IMutableRegistryHub {
+ virtual ~IMutableRegistryHub();
+ virtual void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) = 0;
+ virtual void registerListener( IReporterFactoryPtr const& factory ) = 0;
+ virtual void registerTest( TestCase const& testInfo ) = 0;
+ virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
+ virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
+ virtual void registerStartupException() noexcept = 0;
+ };
+
+ IRegistryHub const& getRegistryHub();
+ IMutableRegistryHub& getMutableRegistryHub();
+ void cleanUp();
+ std::string translateActiveException();
+
+}
+
+// end catch_interfaces_registry_hub.h
+#if defined(CATCH_CONFIG_DISABLE)
+ #define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \
+ static std::string translatorName( signature )
+#endif
+
+#include <exception>
+#include <string>
+#include <vector>
+
+namespace Catch {
+ using exceptionTranslateFunction = std::string(*)();
+
+ struct IExceptionTranslator;
+ using ExceptionTranslators = std::vector<std::unique_ptr<IExceptionTranslator const>>;
+
+ struct IExceptionTranslator {
+ virtual ~IExceptionTranslator();
+ virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
+ };
+
+ struct IExceptionTranslatorRegistry {
+ virtual ~IExceptionTranslatorRegistry();
+
+ virtual std::string translateActiveException() const = 0;
+ };
+
+ class ExceptionTranslatorRegistrar {
+ template<typename T>
+ class ExceptionTranslator : public IExceptionTranslator {
+ public:
+
+ ExceptionTranslator( std::string(*translateFunction)( T& ) )
+ : m_translateFunction( translateFunction )
+ {}
+
+ std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override {
+ try {
+ if( it == itEnd )
+ std::rethrow_exception(std::current_exception());
+ else
+ return (*it)->translate( it+1, itEnd );
+ }
+ catch( T& ex ) {
+ return m_translateFunction( ex );
+ }
+ }
+
+ protected:
+ std::string(*m_translateFunction)( T& );
+ };
+
+ public:
+ template<typename T>
+ ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) {
+ getMutableRegistryHub().registerTranslator
+ ( new ExceptionTranslator<T>( translateFunction ) );
+ }
+ };
+}
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
+ static std::string translatorName( signature ); \
+ CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+ namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); } \
+ CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS \
+ static std::string translatorName( signature )
+
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+
+// end catch_interfaces_exception.h
+// start catch_approx.h
+
+#include <type_traits>
+
+namespace Catch {
+namespace Detail {
+
+ class Approx {
+ private:
+ bool equalityComparisonImpl(double other) const;
+ // Validates the new margin (margin >= 0)
+ // out-of-line to avoid including stdexcept in the header
+ void setMargin(double margin);
+ // Validates the new epsilon (0 < epsilon < 1)
+ // out-of-line to avoid including stdexcept in the header
+ void setEpsilon(double epsilon);
+
+ public:
+ explicit Approx ( double value );
+
+ static Approx custom();
+
+ Approx operator-() const;
+
+ template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+ Approx operator()( T const& value ) {
+ Approx approx( static_cast<double>(value) );
+ approx.m_epsilon = m_epsilon;
+ approx.m_margin = m_margin;
+ approx.m_scale = m_scale;
+ return approx;
+ }
+
+ template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+ explicit Approx( T const& value ): Approx(static_cast<double>(value))
+ {}
+
+ template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+ friend bool operator == ( const T& lhs, Approx const& rhs ) {
+ auto lhs_v = static_cast<double>(lhs);
+ return rhs.equalityComparisonImpl(lhs_v);
+ }
+
+ template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+ friend bool operator == ( Approx const& lhs, const T& rhs ) {
+ return operator==( rhs, lhs );
+ }
+
+ template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+ friend bool operator != ( T const& lhs, Approx const& rhs ) {
+ return !operator==( lhs, rhs );
+ }
+
+ template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+ friend bool operator != ( Approx const& lhs, T const& rhs ) {
+ return !operator==( rhs, lhs );
+ }
+
+ template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+ friend bool operator <= ( T const& lhs, Approx const& rhs ) {
+ return static_cast<double>(lhs) < rhs.m_value || lhs == rhs;
+ }
+
+ template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+ friend bool operator <= ( Approx const& lhs, T const& rhs ) {
+ return lhs.m_value < static_cast<double>(rhs) || lhs == rhs;
+ }
+
+ template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+ friend bool operator >= ( T const& lhs, Approx const& rhs ) {
+ return static_cast<double>(lhs) > rhs.m_value || lhs == rhs;
+ }
+
+ template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+ friend bool operator >= ( Approx const& lhs, T const& rhs ) {
+ return lhs.m_value > static_cast<double>(rhs) || lhs == rhs;
+ }
+
+ template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+ Approx& epsilon( T const& newEpsilon ) {
+ double epsilonAsDouble = static_cast<double>(newEpsilon);
+ setEpsilon(epsilonAsDouble);
+ return *this;
+ }
+
+ template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+ Approx& margin( T const& newMargin ) {
+ double marginAsDouble = static_cast<double>(newMargin);
+ setMargin(marginAsDouble);
+ return *this;
+ }
+
+ template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+ Approx& scale( T const& newScale ) {
+ m_scale = static_cast<double>(newScale);
+ return *this;
+ }
+
+ std::string toString() const;
+
+ private:
+ double m_epsilon;
+ double m_margin;
+ double m_scale;
+ double m_value;
+ };
+} // end namespace Detail
+
+namespace literals {
+ Detail::Approx operator "" _a(long double val);
+ Detail::Approx operator "" _a(unsigned long long val);
+} // end namespace literals
+
+template<>
+struct StringMaker<Catch::Detail::Approx> {
+ static std::string convert(Catch::Detail::Approx const& value);
+};
+
+} // end namespace Catch
+
+// end catch_approx.h
+// start catch_string_manip.h
+
+#include <string>
+#include <iosfwd>
+
+namespace Catch {
+
+ bool startsWith( std::string const& s, std::string const& prefix );
+ bool startsWith( std::string const& s, char prefix );
+ bool endsWith( std::string const& s, std::string const& suffix );
+ bool endsWith( std::string const& s, char suffix );
+ bool contains( std::string const& s, std::string const& infix );
+ void toLowerInPlace( std::string& s );
+ std::string toLower( std::string const& s );
+ std::string trim( std::string const& str );
+ bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
+
+ struct pluralise {
+ pluralise( std::size_t count, std::string const& label );
+
+ friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
+
+ std::size_t m_count;
+ std::string m_label;
+ };
+}
+
+// end catch_string_manip.h
+#ifndef CATCH_CONFIG_DISABLE_MATCHERS
+// start catch_capture_matchers.h
+
+// start catch_matchers.h
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+namespace Matchers {
+ namespace Impl {
+
+ template<typename ArgT> struct MatchAllOf;
+ template<typename ArgT> struct MatchAnyOf;
+ template<typename ArgT> struct MatchNotOf;
+
+ class MatcherUntypedBase {
+ public:
+ MatcherUntypedBase() = default;
+ MatcherUntypedBase ( MatcherUntypedBase const& ) = default;
+ MatcherUntypedBase& operator = ( MatcherUntypedBase const& ) = delete;
+ std::string toString() const;
+
+ protected:
+ virtual ~MatcherUntypedBase();
+ virtual std::string describe() const = 0;
+ mutable std::string m_cachedToString;
+ };
+
+#ifdef __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#endif
+
+ template<typename ObjectT>
+ struct MatcherMethod {
+ virtual bool match( ObjectT const& arg ) const = 0;
+ };
+
+#ifdef __clang__
+# pragma clang diagnostic pop
+#endif
+
+ template<typename T>
+ struct MatcherBase : MatcherUntypedBase, MatcherMethod<T> {
+
+ MatchAllOf<T> operator && ( MatcherBase const& other ) const;
+ MatchAnyOf<T> operator || ( MatcherBase const& other ) const;
+ MatchNotOf<T> operator ! () const;
+ };
+
+ template<typename ArgT>
+ struct MatchAllOf : MatcherBase<ArgT> {
+ bool match( ArgT const& arg ) const override {
+ for( auto matcher : m_matchers ) {
+ if (!matcher->match(arg))
+ return false;
+ }
+ return true;
+ }
+ std::string describe() const override {
+ std::string description;
+ description.reserve( 4 + m_matchers.size()*32 );
+ description += "( ";
+ bool first = true;
+ for( auto matcher : m_matchers ) {
+ if( first )
+ first = false;
+ else
+ description += " and ";
+ description += matcher->toString();
+ }
+ description += " )";
+ return description;
+ }
+
+ MatchAllOf<ArgT>& operator && ( MatcherBase<ArgT> const& other ) {
+ m_matchers.push_back( &other );
+ return *this;
+ }
+
+ std::vector<MatcherBase<ArgT> const*> m_matchers;
+ };
+ template<typename ArgT>
+ struct MatchAnyOf : MatcherBase<ArgT> {
+
+ bool match( ArgT const& arg ) const override {
+ for( auto matcher : m_matchers ) {
+ if (matcher->match(arg))
+ return true;
+ }
+ return false;
+ }
+ std::string describe() const override {
+ std::string description;
+ description.reserve( 4 + m_matchers.size()*32 );
+ description += "( ";
+ bool first = true;
+ for( auto matcher : m_matchers ) {
+ if( first )
+ first = false;
+ else
+ description += " or ";
+ description += matcher->toString();
+ }
+ description += " )";
+ return description;
+ }
+
+ MatchAnyOf<ArgT>& operator || ( MatcherBase<ArgT> const& other ) {
+ m_matchers.push_back( &other );
+ return *this;
+ }
+
+ std::vector<MatcherBase<ArgT> const*> m_matchers;
+ };
+
+ template<typename ArgT>
+ struct MatchNotOf : MatcherBase<ArgT> {
+
+ MatchNotOf( MatcherBase<ArgT> const& underlyingMatcher ) : m_underlyingMatcher( underlyingMatcher ) {}
+
+ bool match( ArgT const& arg ) const override {
+ return !m_underlyingMatcher.match( arg );
+ }
+
+ std::string describe() const override {
+ return "not " + m_underlyingMatcher.toString();
+ }
+ MatcherBase<ArgT> const& m_underlyingMatcher;
+ };
+
+ template<typename T>
+ MatchAllOf<T> MatcherBase<T>::operator && ( MatcherBase const& other ) const {
+ return MatchAllOf<T>() && *this && other;
+ }
+ template<typename T>
+ MatchAnyOf<T> MatcherBase<T>::operator || ( MatcherBase const& other ) const {
+ return MatchAnyOf<T>() || *this || other;
+ }
+ template<typename T>
+ MatchNotOf<T> MatcherBase<T>::operator ! () const {
+ return MatchNotOf<T>( *this );
+ }
+
+ } // namespace Impl
+
+} // namespace Matchers
+
+using namespace Matchers;
+using Matchers::Impl::MatcherBase;
+
+} // namespace Catch
+
+// end catch_matchers.h
+// start catch_matchers_floating.h
+
+#include <type_traits>
+#include <cmath>
+
+namespace Catch {
+namespace Matchers {
+
+ namespace Floating {
+
+ enum class FloatingPointKind : uint8_t;
+
+ struct WithinAbsMatcher : MatcherBase<double> {
+ WithinAbsMatcher(double target, double margin);
+ bool match(double const& matchee) const override;
+ std::string describe() const override;
+ private:
+ double m_target;
+ double m_margin;
+ };
+
+ struct WithinUlpsMatcher : MatcherBase<double> {
+ WithinUlpsMatcher(double target, int ulps, FloatingPointKind baseType);
+ bool match(double const& matchee) const override;
+ std::string describe() const override;
+ private:
+ double m_target;
+ int m_ulps;
+ FloatingPointKind m_type;
+ };
+
+ } // namespace Floating
+
+ // The following functions create the actual matcher objects.
+ // This allows the types to be inferred
+ Floating::WithinUlpsMatcher WithinULP(double target, int maxUlpDiff);
+ Floating::WithinUlpsMatcher WithinULP(float target, int maxUlpDiff);
+ Floating::WithinAbsMatcher WithinAbs(double target, double margin);
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_floating.h
+// start catch_matchers_generic.hpp
+
+#include <functional>
+#include <string>
+
+namespace Catch {
+namespace Matchers {
+namespace Generic {
+
+namespace Detail {
+ std::string finalizeDescription(const std::string& desc);
+}
+
+template <typename T>
+class PredicateMatcher : public MatcherBase<T> {
+ std::function<bool(T const&)> m_predicate;
+ std::string m_description;
+public:
+
+ PredicateMatcher(std::function<bool(T const&)> const& elem, std::string const& descr)
+ :m_predicate(std::move(elem)),
+ m_description(Detail::finalizeDescription(descr))
+ {}
+
+ bool match( T const& item ) const override {
+ return m_predicate(item);
+ }
+
+ std::string describe() const override {
+ return m_description;
+ }
+};
+
+} // namespace Generic
+
+ // The following functions create the actual matcher objects.
+ // The user has to explicitly specify type to the function, because
+ // infering std::function<bool(T const&)> is hard (but possible) and
+ // requires a lot of TMP.
+ template<typename T>
+ Generic::PredicateMatcher<T> Predicate(std::function<bool(T const&)> const& predicate, std::string const& description = "") {
+ return Generic::PredicateMatcher<T>(predicate, description);
+ }
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_generic.hpp
+// start catch_matchers_string.h
+
+#include <string>
+
+namespace Catch {
+namespace Matchers {
+
+ namespace StdString {
+
+ struct CasedString
+ {
+ CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity );
+ std::string adjustString( std::string const& str ) const;
+ std::string caseSensitivitySuffix() const;
+
+ CaseSensitive::Choice m_caseSensitivity;
+ std::string m_str;
+ };
+
+ struct StringMatcherBase : MatcherBase<std::string> {
+ StringMatcherBase( std::string const& operation, CasedString const& comparator );
+ std::string describe() const override;
+
+ CasedString m_comparator;
+ std::string m_operation;
+ };
+
+ struct EqualsMatcher : StringMatcherBase {
+ EqualsMatcher( CasedString const& comparator );
+ bool match( std::string const& source ) const override;
+ };
+ struct ContainsMatcher : StringMatcherBase {
+ ContainsMatcher( CasedString const& comparator );
+ bool match( std::string const& source ) const override;
+ };
+ struct StartsWithMatcher : StringMatcherBase {
+ StartsWithMatcher( CasedString const& comparator );
+ bool match( std::string const& source ) const override;
+ };
+ struct EndsWithMatcher : StringMatcherBase {
+ EndsWithMatcher( CasedString const& comparator );
+ bool match( std::string const& source ) const override;
+ };
+
+ struct RegexMatcher : MatcherBase<std::string> {
+ RegexMatcher( std::string regex, CaseSensitive::Choice caseSensitivity );
+ bool match( std::string const& matchee ) const override;
+ std::string describe() const override;
+
+ private:
+ std::string m_regex;
+ CaseSensitive::Choice m_caseSensitivity;
+ };
+
+ } // namespace StdString
+
+ // The following functions create the actual matcher objects.
+ // This allows the types to be inferred
+
+ StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+ StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+ StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+ StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+ StdString::RegexMatcher Matches( std::string const& regex, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_string.h
+// start catch_matchers_vector.h
+
+#include <algorithm>
+
+namespace Catch {
+namespace Matchers {
+
+ namespace Vector {
+ namespace Detail {
+ template <typename InputIterator, typename T>
+ size_t count(InputIterator first, InputIterator last, T const& item) {
+ size_t cnt = 0;
+ for (; first != last; ++first) {
+ if (*first == item) {
+ ++cnt;
+ }
+ }
+ return cnt;
+ }
+ template <typename InputIterator, typename T>
+ bool contains(InputIterator first, InputIterator last, T const& item) {
+ for (; first != last; ++first) {
+ if (*first == item) {
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+
+ template<typename T>
+ struct ContainsElementMatcher : MatcherBase<std::vector<T>> {
+
+ ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
+
+ bool match(std::vector<T> const &v) const override {
+ for (auto const& el : v) {
+ if (el == m_comparator) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ std::string describe() const override {
+ return "Contains: " + ::Catch::Detail::stringify( m_comparator );
+ }
+
+ T const& m_comparator;
+ };
+
+ template<typename T>
+ struct ContainsMatcher : MatcherBase<std::vector<T>> {
+
+ ContainsMatcher(std::vector<T> const &comparator) : m_comparator( comparator ) {}
+
+ bool match(std::vector<T> const &v) const override {
+ // !TBD: see note in EqualsMatcher
+ if (m_comparator.size() > v.size())
+ return false;
+ for (auto const& comparator : m_comparator) {
+ auto present = false;
+ for (const auto& el : v) {
+ if (el == comparator) {
+ present = true;
+ break;
+ }
+ }
+ if (!present) {
+ return false;
+ }
+ }
+ return true;
+ }
+ std::string describe() const override {
+ return "Contains: " + ::Catch::Detail::stringify( m_comparator );
+ }
+
+ std::vector<T> const& m_comparator;
+ };
+
+ template<typename T>
+ struct EqualsMatcher : MatcherBase<std::vector<T>> {
+
+ EqualsMatcher(std::vector<T> const &comparator) : m_comparator( comparator ) {}
+
+ bool match(std::vector<T> const &v) const override {
+ // !TBD: This currently works if all elements can be compared using !=
+ // - a more general approach would be via a compare template that defaults
+ // to using !=. but could be specialised for, e.g. std::vector<T> etc
+ // - then just call that directly
+ if (m_comparator.size() != v.size())
+ return false;
+ for (std::size_t i = 0; i < v.size(); ++i)
+ if (m_comparator[i] != v[i])
+ return false;
+ return true;
+ }
+ std::string describe() const override {
+ return "Equals: " + ::Catch::Detail::stringify( m_comparator );
+ }
+ std::vector<T> const& m_comparator;
+ };
+
+ template<typename T>
+ struct UnorderedEqualsMatcher : MatcherBase<std::vector<T>> {
+ UnorderedEqualsMatcher(std::vector<T> const& target) : m_target(target) {}
+ bool match(std::vector<T> const& vec) const override {
+ // Note: This is a reimplementation of std::is_permutation,
+ // because I don't want to include <algorithm> inside the common path
+ if (m_target.size() != vec.size()) {
+ return false;
+ }
+ auto lfirst = m_target.begin(), llast = m_target.end();
+ auto rfirst = vec.begin(), rlast = vec.end();
+ // Cut common prefix to optimize checking of permuted parts
+ while (lfirst != llast && *lfirst == *rfirst) {
+ ++lfirst; ++rfirst;
+ }
+ if (lfirst == llast) {
+ return true;
+ }
+
+ for (auto mid = lfirst; mid != llast; ++mid) {
+ // Skip already counted items
+ if (Detail::contains(lfirst, mid, *mid)) {
+ continue;
+ }
+ size_t num_vec = Detail::count(rfirst, rlast, *mid);
+ if (num_vec == 0 || Detail::count(lfirst, llast, *mid) != num_vec) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ std::string describe() const override {
+ return "UnorderedEquals: " + ::Catch::Detail::stringify(m_target);
+ }
+ private:
+ std::vector<T> const& m_target;
+ };
+
+ } // namespace Vector
+
+ // The following functions create the actual matcher objects.
+ // This allows the types to be inferred
+
+ template<typename T>
+ Vector::ContainsMatcher<T> Contains( std::vector<T> const& comparator ) {
+ return Vector::ContainsMatcher<T>( comparator );
+ }
+
+ template<typename T>
+ Vector::ContainsElementMatcher<T> VectorContains( T const& comparator ) {
+ return Vector::ContainsElementMatcher<T>( comparator );
+ }
+
+ template<typename T>
+ Vector::EqualsMatcher<T> Equals( std::vector<T> const& comparator ) {
+ return Vector::EqualsMatcher<T>( comparator );
+ }
+
+ template<typename T>
+ Vector::UnorderedEqualsMatcher<T> UnorderedEquals(std::vector<T> const& target) {
+ return Vector::UnorderedEqualsMatcher<T>(target);
+ }
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_vector.h
+namespace Catch {
+
+ template<typename ArgT, typename MatcherT>
+ class MatchExpr : public ITransientExpression {
+ ArgT const& m_arg;
+ MatcherT m_matcher;
+ StringRef m_matcherString;
+ public:
+ MatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString )
+ : ITransientExpression{ true, matcher.match( arg ) },
+ m_arg( arg ),
+ m_matcher( matcher ),
+ m_matcherString( matcherString )
+ {}
+
+ void streamReconstructedExpression( std::ostream &os ) const override {
+ auto matcherAsString = m_matcher.toString();
+ os << Catch::Detail::stringify( m_arg ) << ' ';
+ if( matcherAsString == Detail::unprintableString )
+ os << m_matcherString;
+ else
+ os << matcherAsString;
+ }
+ };
+
+ using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
+
+ void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString );
+
+ template<typename ArgT, typename MatcherT>
+ auto makeMatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString ) -> MatchExpr<ArgT, MatcherT> {
+ return MatchExpr<ArgT, MatcherT>( arg, matcher, matcherString );
+ }
+
+} // namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \
+ do { \
+ Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+ INTERNAL_CATCH_TRY { \
+ catchAssertionHandler.handleExpr( Catch::makeMatchExpr( arg, matcher, #matcher##_catch_sr ) ); \
+ } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
+ INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+ } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_MATCHES( macroName, exceptionType, resultDisposition, matcher, ... ) \
+ do { \
+ Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(exceptionType) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+ if( catchAssertionHandler.allowThrows() ) \
+ try { \
+ static_cast<void>(__VA_ARGS__ ); \
+ catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+ } \
+ catch( exceptionType const& ex ) { \
+ catchAssertionHandler.handleExpr( Catch::makeMatchExpr( ex, matcher, #matcher##_catch_sr ) ); \
+ } \
+ catch( ... ) { \
+ catchAssertionHandler.handleUnexpectedInflightException(); \
+ } \
+ else \
+ catchAssertionHandler.handleThrowingCallSkipped(); \
+ INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+ } while( false )
+
+// end catch_capture_matchers.h
+#endif
+// start catch_generators.hpp
+
+// start catch_interfaces_generatortracker.h
+
+
+#include <memory>
+
+namespace Catch {
+
+ namespace Generators {
+ class GeneratorUntypedBase {
+ public:
+ GeneratorUntypedBase() = default;
+ virtual ~GeneratorUntypedBase();
+ // Attempts to move the generator to the next element
+ //
+ // Returns true iff the move succeeded (and a valid element
+ // can be retrieved).
+ virtual bool next() = 0;
+ };
+ using GeneratorBasePtr = std::unique_ptr<GeneratorUntypedBase>;
+
+ } // namespace Generators
+
+ struct IGeneratorTracker {
+ virtual ~IGeneratorTracker();
+ virtual auto hasGenerator() const -> bool = 0;
+ virtual auto getGenerator() const -> Generators::GeneratorBasePtr const& = 0;
+ virtual void setGenerator( Generators::GeneratorBasePtr&& generator ) = 0;
+ };
+
+} // namespace Catch
+
+// end catch_interfaces_generatortracker.h
+// start catch_enforce.h
+
+#include <stdexcept>
+
+namespace Catch {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+ template <typename Ex>
+ [[noreturn]]
+ void throw_exception(Ex const& e) {
+ throw e;
+ }
+#else // ^^ Exceptions are enabled // Exceptions are disabled vv
+ [[noreturn]]
+ void throw_exception(std::exception const& e);
+#endif
+} // namespace Catch;
+
+#define CATCH_PREPARE_EXCEPTION( type, msg ) \
+ type( ( Catch::ReusableStringStream() << msg ).str() )
+#define CATCH_INTERNAL_ERROR( msg ) \
+ Catch::throw_exception(CATCH_PREPARE_EXCEPTION( std::logic_error, CATCH_INTERNAL_LINEINFO << ": Internal Catch error: " << msg))
+#define CATCH_ERROR( msg ) \
+ Catch::throw_exception(CATCH_PREPARE_EXCEPTION( std::domain_error, msg ))
+#define CATCH_RUNTIME_ERROR( msg ) \
+ Catch::throw_exception(CATCH_PREPARE_EXCEPTION( std::runtime_error, msg ))
+#define CATCH_ENFORCE( condition, msg ) \
+ do{ if( !(condition) ) CATCH_ERROR( msg ); } while(false)
+
+// end catch_enforce.h
+#include <memory>
+#include <vector>
+#include <cassert>
+
+#include <utility>
+#include <exception>
+
+namespace Catch {
+
+class GeneratorException : public std::exception {
+ const char* const m_msg = "";
+
+public:
+ GeneratorException(const char* msg):
+ m_msg(msg)
+ {}
+
+ const char* what() const noexcept override final;
+};
+
+namespace Generators {
+
+ // !TBD move this into its own location?
+ namespace pf{
+ template<typename T, typename... Args>
+ std::unique_ptr<T> make_unique( Args&&... args ) {
+ return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+ }
+ }
+
+ template<typename T>
+ struct IGenerator : GeneratorUntypedBase {
+ virtual ~IGenerator() = default;
+
+ // Returns the current element of the generator
+ //
+ // \Precondition The generator is either freshly constructed,
+ // or the last call to `next()` returned true
+ virtual T const& get() const = 0;
+ using type = T;
+ };
+
+ template<typename T>
+ class SingleValueGenerator final : public IGenerator<T> {
+ T m_value;
+ public:
+ SingleValueGenerator(T const& value) : m_value( value ) {}
+ SingleValueGenerator(T&& value) : m_value(std::move(value)) {}
+
+ T const& get() const override {
+ return m_value;
+ }
+ bool next() override {
+ return false;
+ }
+ };
+
+ template<typename T>
+ class FixedValuesGenerator final : public IGenerator<T> {
+ std::vector<T> m_values;
+ size_t m_idx = 0;
+ public:
+ FixedValuesGenerator( std::initializer_list<T> values ) : m_values( values ) {}
+
+ T const& get() const override {
+ return m_values[m_idx];
+ }
+ bool next() override {
+ ++m_idx;
+ return m_idx < m_values.size();
+ }
+ };
+
+ template <typename T>
+ class GeneratorWrapper final {
+ std::unique_ptr<IGenerator<T>> m_generator;
+ public:
+ GeneratorWrapper(std::unique_ptr<IGenerator<T>> generator):
+ m_generator(std::move(generator))
+ {}
+ T const& get() const {
+ return m_generator->get();
+ }
+ bool next() {
+ return m_generator->next();
+ }
+ };
+
+ template <typename T>
+ GeneratorWrapper<T> value(T&& value) {
+ return GeneratorWrapper<T>(pf::make_unique<SingleValueGenerator<T>>(std::forward<T>(value)));
+ }
+ template <typename T>
+ GeneratorWrapper<T> values(std::initializer_list<T> values) {
+ return GeneratorWrapper<T>(pf::make_unique<FixedValuesGenerator<T>>(values));
+ }
+
+ template<typename T>
+ class Generators : public IGenerator<T> {
+ std::vector<GeneratorWrapper<T>> m_generators;
+ size_t m_current = 0;
+
+ void populate(GeneratorWrapper<T>&& generator) {
+ m_generators.emplace_back(std::move(generator));
+ }
+ void populate(T&& val) {
+ m_generators.emplace_back(value(std::move(val)));
+ }
+ template<typename U>
+ void populate(U&& val) {
+ populate(T(std::move(val)));
+ }
+ template<typename U, typename... Gs>
+ void populate(U&& valueOrGenerator, Gs... moreGenerators) {
+ populate(std::forward<U>(valueOrGenerator));
+ populate(std::forward<Gs>(moreGenerators)...);
+ }
+
+ public:
+ template <typename... Gs>
+ Generators(Gs... moreGenerators) {
+ m_generators.reserve(sizeof...(Gs));
+ populate(std::forward<Gs>(moreGenerators)...);
+ }
+
+ T const& get() const override {
+ return m_generators[m_current].get();
+ }
+
+ bool next() override {
+ if (m_current >= m_generators.size()) {
+ return false;
+ }
+ const bool current_status = m_generators[m_current].next();
+ if (!current_status) {
+ ++m_current;
+ }
+ return m_current < m_generators.size();
+ }
+ };
+
+ template<typename... Ts>
+ GeneratorWrapper<std::tuple<Ts...>> table( std::initializer_list<std::tuple<typename std::decay<Ts>::type...>> tuples ) {
+ return values<std::tuple<Ts...>>( tuples );
+ }
+
+ // Tag type to signal that a generator sequence should convert arguments to a specific type
+ template <typename T>
+ struct as {};
+
+ template<typename T, typename... Gs>
+ auto makeGenerators( GeneratorWrapper<T>&& generator, Gs... moreGenerators ) -> Generators<T> {
+ return Generators<T>(std::move(generator), std::forward<Gs>(moreGenerators)...);
+ }
+ template<typename T>
+ auto makeGenerators( GeneratorWrapper<T>&& generator ) -> Generators<T> {
+ return Generators<T>(std::move(generator));
+ }
+ template<typename T, typename... Gs>
+ auto makeGenerators( T&& val, Gs... moreGenerators ) -> Generators<T> {
+ return makeGenerators( value( std::forward<T>( val ) ), std::forward<Gs>( moreGenerators )... );
+ }
+ template<typename T, typename U, typename... Gs>
+ auto makeGenerators( as<T>, U&& val, Gs... moreGenerators ) -> Generators<T> {
+ return makeGenerators( value( T( std::forward<U>( val ) ) ), std::forward<Gs>( moreGenerators )... );
+ }
+
+ template <typename T>
+ class TakeGenerator : public IGenerator<T> {
+ GeneratorWrapper<T> m_generator;
+ size_t m_returned = 0;
+ size_t m_target;
+ public:
+ TakeGenerator(size_t target, GeneratorWrapper<T>&& generator):
+ m_generator(std::move(generator)),
+ m_target(target)
+ {
+ assert(target != 0 && "Empty generators are not allowed");
+ }
+ T const& get() const override {
+ return m_generator.get();
+ }
+ bool next() override {
+ ++m_returned;
+ if (m_returned >= m_target) {
+ return false;
+ }
+
+ const auto success = m_generator.next();
+ // If the underlying generator does not contain enough values
+ // then we cut short as well
+ if (!success) {
+ m_returned = m_target;
+ }
+ return success;
+ }
+ };
+
+ template <typename T>
+ GeneratorWrapper<T> take(size_t target, GeneratorWrapper<T>&& generator) {
+ return GeneratorWrapper<T>(pf::make_unique<TakeGenerator<T>>(target, std::move(generator)));
+ }
+
+ template <typename T, typename Predicate>
+ class FilterGenerator : public IGenerator<T> {
+ GeneratorWrapper<T> m_generator;
+ Predicate m_predicate;
+ public:
+ template <typename P = Predicate>
+ FilterGenerator(P&& pred, GeneratorWrapper<T>&& generator):
+ m_generator(std::move(generator)),
+ m_predicate(std::forward<P>(pred))
+ {
+ if (!m_predicate(m_generator.get())) {
+ // It might happen that there are no values that pass the
+ // filter. In that case we throw an exception.
+ auto has_initial_value = next();
+ if (!has_initial_value) {
+ Catch::throw_exception(GeneratorException("No valid value found in filtered generator"));
+ }
+ }
+ }
+
+ T const& get() const override {
+ return m_generator.get();
+ }
+
+ bool next() override {
+ bool success = m_generator.next();
+ if (!success) {
+ return false;
+ }
+ while (!m_predicate(m_generator.get()) && (success = m_generator.next()) == true);
+ return success;
+ }
+ };
+
+ template <typename T, typename Predicate>
+ GeneratorWrapper<T> filter(Predicate&& pred, GeneratorWrapper<T>&& generator) {
+ return GeneratorWrapper<T>(std::unique_ptr<IGenerator<T>>(pf::make_unique<FilterGenerator<T, Predicate>>(std::forward<Predicate>(pred), std::move(generator))));
+ }
+
+ template <typename T>
+ class RepeatGenerator : public IGenerator<T> {
+ GeneratorWrapper<T> m_generator;
+ mutable std::vector<T> m_returned;
+ size_t m_target_repeats;
+ size_t m_current_repeat = 0;
+ size_t m_repeat_index = 0;
+ public:
+ RepeatGenerator(size_t repeats, GeneratorWrapper<T>&& generator):
+ m_generator(std::move(generator)),
+ m_target_repeats(repeats)
+ {
+ assert(m_target_repeats > 0 && "Repeat generator must repeat at least once");
+ }
+
+ T const& get() const override {
+ if (m_current_repeat == 0) {
+ m_returned.push_back(m_generator.get());
+ return m_returned.back();
+ }
+ return m_returned[m_repeat_index];
+ }
+
+ bool next() override {
+ // There are 2 basic cases:
+ // 1) We are still reading the generator
+ // 2) We are reading our own cache
+
+ // In the first case, we need to poke the underlying generator.
+ // If it happily moves, we are left in that state, otherwise it is time to start reading from our cache
+ if (m_current_repeat == 0) {
+ const auto success = m_generator.next();
+ if (!success) {
+ ++m_current_repeat;
+ }
+ return m_current_repeat < m_target_repeats;
+ }
+
+ // In the second case, we need to move indices forward and check that we haven't run up against the end
+ ++m_repeat_index;
+ if (m_repeat_index == m_returned.size()) {
+ m_repeat_index = 0;
+ ++m_current_repeat;
+ }
+ return m_current_repeat < m_target_repeats;
+ }
+ };
+
+ template <typename T>
+ GeneratorWrapper<T> repeat(size_t repeats, GeneratorWrapper<T>&& generator) {
+ return GeneratorWrapper<T>(pf::make_unique<RepeatGenerator<T>>(repeats, std::move(generator)));
+ }
+
+ template <typename T, typename U, typename Func>
+ class MapGenerator : public IGenerator<T> {
+ // TBD: provide static assert for mapping function, for friendly error message
+ GeneratorWrapper<U> m_generator;
+ Func m_function;
+ // To avoid returning dangling reference, we have to save the values
+ T m_cache;
+ public:
+ template <typename F2 = Func>
+ MapGenerator(F2&& function, GeneratorWrapper<U>&& generator) :
+ m_generator(std::move(generator)),
+ m_function(std::forward<F2>(function)),
+ m_cache(m_function(m_generator.get()))
+ {}
+
+ T const& get() const override {
+ return m_cache;
+ }
+ bool next() override {
+ const auto success = m_generator.next();
+ if (success) {
+ m_cache = m_function(m_generator.get());
+ }
+ return success;
+ }
+ };
+
+ template <typename T, typename U, typename Func>
+ GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
+ return GeneratorWrapper<T>(
+ pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
+ );
+ }
+ template <typename T, typename Func>
+ GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<T>&& generator) {
+ return GeneratorWrapper<T>(
+ pf::make_unique<MapGenerator<T, T, Func>>(std::forward<Func>(function), std::move(generator))
+ );
+ }
+
+ auto acquireGeneratorTracker( SourceLineInfo const& lineInfo ) -> IGeneratorTracker&;
+
+ template<typename L>
+ // Note: The type after -> is weird, because VS2015 cannot parse
+ // the expression used in the typedef inside, when it is in
+ // return type. Yeah, ¯\_(ツ)_/¯
+ auto generate( SourceLineInfo const& lineInfo, L const& generatorExpression ) -> decltype(std::declval<decltype(generatorExpression())>().get()) {
+ using UnderlyingType = typename decltype(generatorExpression())::type;
+
+ IGeneratorTracker& tracker = acquireGeneratorTracker( lineInfo );
+ if (!tracker.hasGenerator()) {
+ tracker.setGenerator(pf::make_unique<Generators<UnderlyingType>>(generatorExpression()));
+ }
+
+ auto const& generator = static_cast<IGenerator<UnderlyingType> const&>( *tracker.getGenerator() );
+ return generator.get();
+ }
+
+} // namespace Generators
+} // namespace Catch
+
+#define GENERATE( ... ) \
+ Catch::Generators::generate( CATCH_INTERNAL_LINEINFO, []{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } )
+
+// end catch_generators.hpp
+
+// These files are included here so the single_include script doesn't put them
+// in the conditionally compiled sections
+// start catch_test_case_info.h
+
+#include <string>
+#include <vector>
+#include <memory>
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+namespace Catch {
+
+ struct ITestInvoker;
+
+ struct TestCaseInfo {
+ enum SpecialProperties{
+ None = 0,
+ IsHidden = 1 << 1,
+ ShouldFail = 1 << 2,
+ MayFail = 1 << 3,
+ Throws = 1 << 4,
+ NonPortable = 1 << 5,
+ Benchmark = 1 << 6
+ };
+
+ TestCaseInfo( std::string const& _name,
+ std::string const& _className,
+ std::string const& _description,
+ std::vector<std::string> const& _tags,
+ SourceLineInfo const& _lineInfo );
+
+ friend void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags );
+
+ bool isHidden() const;
+ bool throws() const;
+ bool okToFail() const;
+ bool expectedToFail() const;
+
+ std::string tagsAsString() const;
+
+ std::string name;
+ std::string className;
+ std::string description;
+ std::vector<std::string> tags;
+ std::vector<std::string> lcaseTags;
+ SourceLineInfo lineInfo;
+ SpecialProperties properties;
+ };
+
+ class TestCase : public TestCaseInfo {
+ public:
+
+ TestCase( ITestInvoker* testCase, TestCaseInfo&& info );
+
+ TestCase withName( std::string const& _newName ) const;
+
+ void invoke() const;
+
+ TestCaseInfo const& getTestCaseInfo() const;
+
+ bool operator == ( TestCase const& other ) const;
+ bool operator < ( TestCase const& other ) const;
+
+ private:
+ std::shared_ptr<ITestInvoker> test;
+ };
+
+ TestCase makeTestCase( ITestInvoker* testCase,
+ std::string const& className,
+ NameAndTags const& nameAndTags,
+ SourceLineInfo const& lineInfo );
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_case_info.h
+// start catch_interfaces_runner.h
+
+namespace Catch {
+
+ struct IRunner {
+ virtual ~IRunner();
+ virtual bool aborting() const = 0;
+ };
+}
+
+// end catch_interfaces_runner.h
+
+#ifdef __OBJC__
+// start catch_objc.hpp
+
+#import <objc/runtime.h>
+
+#include <string>
+
+// NB. Any general catch headers included here must be included
+// in catch.hpp first to make sure they are included by the single
+// header for non obj-usage
+
+///////////////////////////////////////////////////////////////////////////////
+// This protocol is really only here for (self) documenting purposes, since
+// all its methods are optional.
+@protocol OcFixture
+
+@optional
+
+-(void) setUp;
+-(void) tearDown;
+
+@end
+
+namespace Catch {
+
+ class OcMethod : public ITestInvoker {
+
+ public:
+ OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
+
+ virtual void invoke() const {
+ id obj = [[m_cls alloc] init];
+
+ performOptionalSelector( obj, @selector(setUp) );
+ performOptionalSelector( obj, m_sel );
+ performOptionalSelector( obj, @selector(tearDown) );
+
+ arcSafeRelease( obj );
+ }
+ private:
+ virtual ~OcMethod() {}
+
+ Class m_cls;
+ SEL m_sel;
+ };
+
+ namespace Detail{
+
+ inline std::string getAnnotation( Class cls,
+ std::string const& annotationName,
+ std::string const& testCaseName ) {
+ NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
+ SEL sel = NSSelectorFromString( selStr );
+ arcSafeRelease( selStr );
+ id value = performOptionalSelector( cls, sel );
+ if( value )
+ return [(NSString*)value UTF8String];
+ return "";
+ }
+ }
+
+ inline std::size_t registerTestMethods() {
+ std::size_t noTestMethods = 0;
+ int noClasses = objc_getClassList( nullptr, 0 );
+
+ Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
+ objc_getClassList( classes, noClasses );
+
+ for( int c = 0; c < noClasses; c++ ) {
+ Class cls = classes[c];
+ {
+ u_int count;
+ Method* methods = class_copyMethodList( cls, &count );
+ for( u_int m = 0; m < count ; m++ ) {
+ SEL selector = method_getName(methods[m]);
+ std::string methodName = sel_getName(selector);
+ if( startsWith( methodName, "Catch_TestCase_" ) ) {
+ std::string testCaseName = methodName.substr( 15 );
+ std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
+ std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
+ const char* className = class_getName( cls );
+
+ getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, NameAndTags( name.c_str(), desc.c_str() ), SourceLineInfo("",0) ) );
+ noTestMethods++;
+ }
+ }
+ free(methods);
+ }
+ }
+ return noTestMethods;
+ }
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+
+ namespace Matchers {
+ namespace Impl {
+ namespace NSStringMatchers {
+
+ struct StringHolder : MatcherBase<NSString*>{
+ StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
+ StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
+ StringHolder() {
+ arcSafeRelease( m_substr );
+ }
+
+ bool match( NSString* arg ) const override {
+ return false;
+ }
+
+ NSString* CATCH_ARC_STRONG m_substr;
+ };
+
+ struct Equals : StringHolder {
+ Equals( NSString* substr ) : StringHolder( substr ){}
+
+ bool match( NSString* str ) const override {
+ return (str != nil || m_substr == nil ) &&
+ [str isEqualToString:m_substr];
+ }
+
+ std::string describe() const override {
+ return "equals string: " + Catch::Detail::stringify( m_substr );
+ }
+ };
+
+ struct Contains : StringHolder {
+ Contains( NSString* substr ) : StringHolder( substr ){}
+
+ bool match( NSString* str ) const {
+ return (str != nil || m_substr == nil ) &&
+ [str rangeOfString:m_substr].location != NSNotFound;
+ }
+
+ std::string describe() const override {
+ return "contains string: " + Catch::Detail::stringify( m_substr );
+ }
+ };
+
+ struct StartsWith : StringHolder {
+ StartsWith( NSString* substr ) : StringHolder( substr ){}
+
+ bool match( NSString* str ) const override {
+ return (str != nil || m_substr == nil ) &&
+ [str rangeOfString:m_substr].location == 0;
+ }
+
+ std::string describe() const override {
+ return "starts with: " + Catch::Detail::stringify( m_substr );
+ }
+ };
+ struct EndsWith : StringHolder {
+ EndsWith( NSString* substr ) : StringHolder( substr ){}
+
+ bool match( NSString* str ) const override {
+ return (str != nil || m_substr == nil ) &&
+ [str rangeOfString:m_substr].location == [str length] - [m_substr length];
+ }
+
+ std::string describe() const override {
+ return "ends with: " + Catch::Detail::stringify( m_substr );
+ }
+ };
+
+ } // namespace NSStringMatchers
+ } // namespace Impl
+
+ inline Impl::NSStringMatchers::Equals
+ Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
+
+ inline Impl::NSStringMatchers::Contains
+ Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
+
+ inline Impl::NSStringMatchers::StartsWith
+ StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
+
+ inline Impl::NSStringMatchers::EndsWith
+ EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
+
+ } // namespace Matchers
+
+ using namespace Matchers;
+
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+} // namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define OC_MAKE_UNIQUE_NAME( root, uniqueSuffix ) root##uniqueSuffix
+#define OC_TEST_CASE2( name, desc, uniqueSuffix ) \
++(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Name_test_, uniqueSuffix ) \
+{ \
+return @ name; \
+} \
++(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Description_test_, uniqueSuffix ) \
+{ \
+return @ desc; \
+} \
+-(void) OC_MAKE_UNIQUE_NAME( Catch_TestCase_test_, uniqueSuffix )
+
+#define OC_TEST_CASE( name, desc ) OC_TEST_CASE2( name, desc, __LINE__ )
+
+// end catch_objc.hpp
+#endif
+
+#ifdef CATCH_CONFIG_EXTERNAL_INTERFACES
+// start catch_external_interfaces.h
+
+// start catch_reporter_bases.hpp
+
+// start catch_interfaces_reporter.h
+
+// start catch_config.hpp
+
+// start catch_test_spec_parser.h
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// start catch_test_spec.h
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// start catch_wildcard_pattern.h
+
+namespace Catch
+{
+ class WildcardPattern {
+ enum WildcardPosition {
+ NoWildcard = 0,
+ WildcardAtStart = 1,
+ WildcardAtEnd = 2,
+ WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
+ };
+
+ public:
+
+ WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity );
+ virtual ~WildcardPattern() = default;
+ virtual bool matches( std::string const& str ) const;
+
+ private:
+ std::string adjustCase( std::string const& str ) const;
+ CaseSensitive::Choice m_caseSensitivity;
+ WildcardPosition m_wildcard = NoWildcard;
+ std::string m_pattern;
+ };
+}
+
+// end catch_wildcard_pattern.h
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+ class TestSpec {
+ struct Pattern {
+ virtual ~Pattern();
+ virtual bool matches( TestCaseInfo const& testCase ) const = 0;
+ };
+ using PatternPtr = std::shared_ptr<Pattern>;
+
+ class NamePattern : public Pattern {
+ public:
+ NamePattern( std::string const& name );
+ virtual ~NamePattern();
+ virtual bool matches( TestCaseInfo const& testCase ) const override;
+ private:
+ WildcardPattern m_wildcardPattern;
+ };
+
+ class TagPattern : public Pattern {
+ public:
+ TagPattern( std::string const& tag );
+ virtual ~TagPattern();
+ virtual bool matches( TestCaseInfo const& testCase ) const override;
+ private:
+ std::string m_tag;
+ };
+
+ class ExcludedPattern : public Pattern {
+ public:
+ ExcludedPattern( PatternPtr const& underlyingPattern );
+ virtual ~ExcludedPattern();
+ virtual bool matches( TestCaseInfo const& testCase ) const override;
+ private:
+ PatternPtr m_underlyingPattern;
+ };
+
+ struct Filter {
+ std::vector<PatternPtr> m_patterns;
+
+ bool matches( TestCaseInfo const& testCase ) const;
+ };
+
+ public:
+ bool hasFilters() const;
+ bool matches( TestCaseInfo const& testCase ) const;
+
+ private:
+ std::vector<Filter> m_filters;
+
+ friend class TestSpecParser;
+ };
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_spec.h
+// start catch_interfaces_tag_alias_registry.h
+
+#include <string>
+
+namespace Catch {
+
+ struct TagAlias;
+
+ struct ITagAliasRegistry {
+ virtual ~ITagAliasRegistry();
+ // Nullptr if not present
+ virtual TagAlias const* find( std::string const& alias ) const = 0;
+ virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
+
+ static ITagAliasRegistry const& get();
+ };
+
+} // end namespace Catch
+
+// end catch_interfaces_tag_alias_registry.h
+namespace Catch {
+
+ class TestSpecParser {
+ enum Mode{ None, Name, QuotedName, Tag, EscapedName };
+ Mode m_mode = None;
+ bool m_exclusion = false;
+ std::size_t m_start = std::string::npos, m_pos = 0;
+ std::string m_arg;
+ std::vector<std::size_t> m_escapeChars;
+ TestSpec::Filter m_currentFilter;
+ TestSpec m_testSpec;
+ ITagAliasRegistry const* m_tagAliases = nullptr;
+
+ public:
+ TestSpecParser( ITagAliasRegistry const& tagAliases );
+
+ TestSpecParser& parse( std::string const& arg );
+ TestSpec testSpec();
+
+ private:
+ void visitChar( char c );
+ void startNewMode( Mode mode, std::size_t start );
+ void escape();
+ std::string subString() const;
+
+ template<typename T>
+ void addPattern() {
+ std::string token = subString();
+ for( std::size_t i = 0; i < m_escapeChars.size(); ++i )
+ token = token.substr( 0, m_escapeChars[i]-m_start-i ) + token.substr( m_escapeChars[i]-m_start-i+1 );
+ m_escapeChars.clear();
+ if( startsWith( token, "exclude:" ) ) {
+ m_exclusion = true;
+ token = token.substr( 8 );
+ }
+ if( !token.empty() ) {
+ TestSpec::PatternPtr pattern = std::make_shared<T>( token );
+ if( m_exclusion )
+ pattern = std::make_shared<TestSpec::ExcludedPattern>( pattern );
+ m_currentFilter.m_patterns.push_back( pattern );
+ }
+ m_exclusion = false;
+ m_mode = None;
+ }
+
+ void addFilter();
+ };
+ TestSpec parseTestSpec( std::string const& arg );
+
+} // namespace Catch
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_spec_parser.h
+// start catch_interfaces_config.h
+
+#include <iosfwd>
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+ enum class Verbosity {
+ Quiet = 0,
+ Normal,
+ High
+ };
+
+ struct WarnAbout { enum What {
+ Nothing = 0x00,
+ NoAssertions = 0x01,
+ NoTests = 0x02
+ }; };
+
+ struct ShowDurations { enum OrNot {
+ DefaultForReporter,
+ Always,
+ Never
+ }; };
+ struct RunTests { enum InWhatOrder {
+ InDeclarationOrder,
+ InLexicographicalOrder,
+ InRandomOrder
+ }; };
+ struct UseColour { enum YesOrNo {
+ Auto,
+ Yes,
+ No
+ }; };
+ struct WaitForKeypress { enum When {
+ Never,
+ BeforeStart = 1,
+ BeforeExit = 2,
+ BeforeStartAndExit = BeforeStart | BeforeExit
+ }; };
+
+ class TestSpec;
+
+ struct IConfig : NonCopyable {
+
+ virtual ~IConfig();
+
+ virtual bool allowThrows() const = 0;
+ virtual std::ostream& stream() const = 0;
+ virtual std::string name() const = 0;
+ virtual bool includeSuccessfulResults() const = 0;
+ virtual bool shouldDebugBreak() const = 0;
+ virtual bool warnAboutMissingAssertions() const = 0;
+ virtual bool warnAboutNoTests() const = 0;
+ virtual int abortAfter() const = 0;
+ virtual bool showInvisibles() const = 0;
+ virtual ShowDurations::OrNot showDurations() const = 0;
+ virtual TestSpec const& testSpec() const = 0;
+ virtual bool hasTestFilters() const = 0;
+ virtual RunTests::InWhatOrder runOrder() const = 0;
+ virtual unsigned int rngSeed() const = 0;
+ virtual int benchmarkResolutionMultiple() const = 0;
+ virtual UseColour::YesOrNo useColour() const = 0;
+ virtual std::vector<std::string> const& getSectionsToRun() const = 0;
+ virtual Verbosity verbosity() const = 0;
+ };
+
+ using IConfigPtr = std::shared_ptr<IConfig const>;
+}
+
+// end catch_interfaces_config.h
+// Libstdc++ doesn't like incomplete classes for unique_ptr
+
+#include <memory>
+#include <vector>
+#include <string>
+
+#ifndef CATCH_CONFIG_CONSOLE_WIDTH
+#define CATCH_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+namespace Catch {
+
+ struct IStream;
+
+ struct ConfigData {
+ bool listTests = false;
+ bool listTags = false;
+ bool listReporters = false;
+ bool listTestNamesOnly = false;
+
+ bool showSuccessfulTests = false;
+ bool shouldDebugBreak = false;
+ bool noThrow = false;
+ bool showHelp = false;
+ bool showInvisibles = false;
+ bool filenamesAsTags = false;
+ bool libIdentify = false;
+
+ int abortAfter = -1;
+ unsigned int rngSeed = 0;
+ int benchmarkResolutionMultiple = 100;
+
+ Verbosity verbosity = Verbosity::Normal;
+ WarnAbout::What warnings = WarnAbout::Nothing;
+ ShowDurations::OrNot showDurations = ShowDurations::DefaultForReporter;
+ RunTests::InWhatOrder runOrder = RunTests::InDeclarationOrder;
+ UseColour::YesOrNo useColour = UseColour::Auto;
+ WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
+
+ std::string outputFilename;
+ std::string name;
+ std::string processName;
+#ifndef CATCH_CONFIG_DEFAULT_REPORTER
+#define CATCH_CONFIG_DEFAULT_REPORTER "console"
+#endif
+ std::string reporterName = CATCH_CONFIG_DEFAULT_REPORTER;
+#undef CATCH_CONFIG_DEFAULT_REPORTER
+
+ std::vector<std::string> testsOrTags;
+ std::vector<std::string> sectionsToRun;
+ };
+
+ class Config : public IConfig {
+ public:
+
+ Config() = default;
+ Config( ConfigData const& data );
+ virtual ~Config() = default;
+
+ std::string const& getFilename() const;
+
+ bool listTests() const;
+ bool listTestNamesOnly() const;
+ bool listTags() const;
+ bool listReporters() const;
+
+ std::string getProcessName() const;
+ std::string const& getReporterName() const;
+
+ std::vector<std::string> const& getTestsOrTags() const;
+ std::vector<std::string> const& getSectionsToRun() const override;
+
+ virtual TestSpec const& testSpec() const override;
+ bool hasTestFilters() const override;
+
+ bool showHelp() const;
+
+ // IConfig interface
+ bool allowThrows() const override;
+ std::ostream& stream() const override;
+ std::string name() const override;
+ bool includeSuccessfulResults() const override;
+ bool warnAboutMissingAssertions() const override;
+ bool warnAboutNoTests() const override;
+ ShowDurations::OrNot showDurations() const override;
+ RunTests::InWhatOrder runOrder() const override;
+ unsigned int rngSeed() const override;
+ int benchmarkResolutionMultiple() const override;
+ UseColour::YesOrNo useColour() const override;
+ bool shouldDebugBreak() const override;
+ int abortAfter() const override;
+ bool showInvisibles() const override;
+ Verbosity verbosity() const override;
+
+ private:
+
+ IStream const* openStream();
+ ConfigData m_data;
+
+ std::unique_ptr<IStream const> m_stream;
+ TestSpec m_testSpec;
+ bool m_hasTestFilters = false;
+ };
+
+} // end namespace Catch
+
+// end catch_config.hpp
+// start catch_assertionresult.h
+
+#include <string>
+
+namespace Catch {
+
+ struct AssertionResultData
+ {
+ AssertionResultData() = delete;
+
+ AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
+
+ std::string message;
+ mutable std::string reconstructedExpression;
+ LazyExpression lazyExpression;
+ ResultWas::OfType resultType;
+
+ std::string reconstructExpression() const;
+ };
+
+ class AssertionResult {
+ public:
+ AssertionResult() = delete;
+ AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
+
+ bool isOk() const;
+ bool succeeded() const;
+ ResultWas::OfType getResultType() const;
+ bool hasExpression() const;
+ bool hasMessage() const;
+ std::string getExpression() const;
+ std::string getExpressionInMacro() const;
+ bool hasExpandedExpression() const;
+ std::string getExpandedExpression() const;
+ std::string getMessage() const;
+ SourceLineInfo getSourceInfo() const;
+ StringRef getTestMacroName() const;
+
+ //protected:
+ AssertionInfo m_info;
+ AssertionResultData m_resultData;
+ };
+
+} // end namespace Catch
+
+// end catch_assertionresult.h
+// start catch_option.hpp
+
+namespace Catch {
+
+ // An optional type
+ template<typename T>
+ class Option {
+ public:
+ Option() : nullableValue( nullptr ) {}
+ Option( T const& _value )
+ : nullableValue( new( storage ) T( _value ) )
+ {}
+ Option( Option const& _other )
+ : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
+ {}
+
+ ~Option() {
+ reset();
+ }
+
+ Option& operator= ( Option const& _other ) {
+ if( &_other != this ) {
+ reset();
+ if( _other )
+ nullableValue = new( storage ) T( *_other );
+ }
+ return *this;
+ }
+ Option& operator = ( T const& _value ) {
+ reset();
+ nullableValue = new( storage ) T( _value );
+ return *this;
+ }
+
+ void reset() {
+ if( nullableValue )
+ nullableValue->~T();
+ nullableValue = nullptr;
+ }
+
+ T& operator*() { return *nullableValue; }
+ T const& operator*() const { return *nullableValue; }
+ T* operator->() { return nullableValue; }
+ const T* operator->() const { return nullableValue; }
+
+ T valueOr( T const& defaultValue ) const {
+ return nullableValue ? *nullableValue : defaultValue;
+ }
+
+ bool some() const { return nullableValue != nullptr; }
+ bool none() const { return nullableValue == nullptr; }
+
+ bool operator !() const { return nullableValue == nullptr; }
+ explicit operator bool() const {
+ return some();
+ }
+
+ private:
+ T *nullableValue;
+ alignas(alignof(T)) char storage[sizeof(T)];
+ };
+
+} // end namespace Catch
+
+// end catch_option.hpp
+#include <string>
+#include <iosfwd>
+#include <map>
+#include <set>
+#include <memory>
+
+namespace Catch {
+
+ struct ReporterConfig {
+ explicit ReporterConfig( IConfigPtr const& _fullConfig );
+
+ ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream );
+
+ std::ostream& stream() const;
+ IConfigPtr fullConfig() const;
+
+ private:
+ std::ostream* m_stream;
+ IConfigPtr m_fullConfig;
+ };
+
+ struct ReporterPreferences {
+ bool shouldRedirectStdOut = false;
+ bool shouldReportAllAssertions = false;
+ };
+
+ template<typename T>
+ struct LazyStat : Option<T> {
+ LazyStat& operator=( T const& _value ) {
+ Option<T>::operator=( _value );
+ used = false;
+ return *this;
+ }
+ void reset() {
+ Option<T>::reset();
+ used = false;
+ }
+ bool used = false;
+ };
+
+ struct TestRunInfo {
+ TestRunInfo( std::string const& _name );
+ std::string name;
+ };
+ struct GroupInfo {
+ GroupInfo( std::string const& _name,
+ std::size_t _groupIndex,
+ std::size_t _groupsCount );
+
+ std::string name;
+ std::size_t groupIndex;
+ std::size_t groupsCounts;
+ };
+
+ struct AssertionStats {
+ AssertionStats( AssertionResult const& _assertionResult,
+ std::vector<MessageInfo> const& _infoMessages,
+ Totals const& _totals );
+
+ AssertionStats( AssertionStats const& ) = default;
+ AssertionStats( AssertionStats && ) = default;
+ AssertionStats& operator = ( AssertionStats const& ) = default;
+ AssertionStats& operator = ( AssertionStats && ) = default;
+ virtual ~AssertionStats();
+
+ AssertionResult assertionResult;
+ std::vector<MessageInfo> infoMessages;
+ Totals totals;
+ };
+
+ struct SectionStats {
+ SectionStats( SectionInfo const& _sectionInfo,
+ Counts const& _assertions,
+ double _durationInSeconds,
+ bool _missingAssertions );
+ SectionStats( SectionStats const& ) = default;
+ SectionStats( SectionStats && ) = default;
+ SectionStats& operator = ( SectionStats const& ) = default;
+ SectionStats& operator = ( SectionStats && ) = default;
+ virtual ~SectionStats();
+
+ SectionInfo sectionInfo;
+ Counts assertions;
+ double durationInSeconds;
+ bool missingAssertions;
+ };
+
+ struct TestCaseStats {
+ TestCaseStats( TestCaseInfo const& _testInfo,
+ Totals const& _totals,
+ std::string const& _stdOut,
+ std::string const& _stdErr,
+ bool _aborting );
+
+ TestCaseStats( TestCaseStats const& ) = default;
+ TestCaseStats( TestCaseStats && ) = default;
+ TestCaseStats& operator = ( TestCaseStats const& ) = default;
+ TestCaseStats& operator = ( TestCaseStats && ) = default;
+ virtual ~TestCaseStats();
+
+ TestCaseInfo testInfo;
+ Totals totals;
+ std::string stdOut;
+ std::string stdErr;
+ bool aborting;
+ };
+
+ struct TestGroupStats {
+ TestGroupStats( GroupInfo const& _groupInfo,
+ Totals const& _totals,
+ bool _aborting );
+ TestGroupStats( GroupInfo const& _groupInfo );
+
+ TestGroupStats( TestGroupStats const& ) = default;
+ TestGroupStats( TestGroupStats && ) = default;
+ TestGroupStats& operator = ( TestGroupStats const& ) = default;
+ TestGroupStats& operator = ( TestGroupStats && ) = default;
+ virtual ~TestGroupStats();
+
+ GroupInfo groupInfo;
+ Totals totals;
+ bool aborting;
+ };
+
+ struct TestRunStats {
+ TestRunStats( TestRunInfo const& _runInfo,
+ Totals const& _totals,
+ bool _aborting );
+
+ TestRunStats( TestRunStats const& ) = default;
+ TestRunStats( TestRunStats && ) = default;
+ TestRunStats& operator = ( TestRunStats const& ) = default;
+ TestRunStats& operator = ( TestRunStats && ) = default;
+ virtual ~TestRunStats();
+
+ TestRunInfo runInfo;
+ Totals totals;
+ bool aborting;
+ };
+
+ struct BenchmarkInfo {
+ std::string name;
+ };
+ struct BenchmarkStats {
+ BenchmarkInfo info;
+ std::size_t iterations;
+ uint64_t elapsedTimeInNanoseconds;
+ };
+
+ struct IStreamingReporter {
+ virtual ~IStreamingReporter() = default;
+
+ // Implementing class must also provide the following static methods:
+ // static std::string getDescription();
+ // static std::set<Verbosity> getSupportedVerbosities()
+
+ virtual ReporterPreferences getPreferences() const = 0;
+
+ virtual void noMatchingTestCases( std::string const& spec ) = 0;
+
+ virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
+ virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
+
+ virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
+ virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
+
+ // *** experimental ***
+ virtual void benchmarkStarting( BenchmarkInfo const& ) {}
+
+ virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
+
+ // The return value indicates if the messages buffer should be cleared:
+ virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
+
+ // *** experimental ***
+ virtual void benchmarkEnded( BenchmarkStats const& ) {}
+
+ virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
+ virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
+ virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
+ virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
+
+ virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
+
+ // Default empty implementation provided
+ virtual void fatalErrorEncountered( StringRef name );
+
+ virtual bool isMulti() const;
+ };
+ using IStreamingReporterPtr = std::unique_ptr<IStreamingReporter>;
+
+ struct IReporterFactory {
+ virtual ~IReporterFactory();
+ virtual IStreamingReporterPtr create( ReporterConfig const& config ) const = 0;
+ virtual std::string getDescription() const = 0;
+ };
+ using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
+
+ struct IReporterRegistry {
+ using FactoryMap = std::map<std::string, IReporterFactoryPtr>;
+ using Listeners = std::vector<IReporterFactoryPtr>;
+
+ virtual ~IReporterRegistry();
+ virtual IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const = 0;
+ virtual FactoryMap const& getFactories() const = 0;
+ virtual Listeners const& getListeners() const = 0;
+ };
+
+} // end namespace Catch
+
+// end catch_interfaces_reporter.h
+#include <algorithm>
+#include <cstring>
+#include <cfloat>
+#include <cstdio>
+#include <cassert>
+#include <memory>
+#include <ostream>
+
+namespace Catch {
+ void prepareExpandedExpression(AssertionResult& result);
+
+ // Returns double formatted as %.3f (format expected on output)
+ std::string getFormattedDuration( double duration );
+
+ template<typename DerivedT>
+ struct StreamingReporterBase : IStreamingReporter {
+
+ StreamingReporterBase( ReporterConfig const& _config )
+ : m_config( _config.fullConfig() ),
+ stream( _config.stream() )
+ {
+ m_reporterPrefs.shouldRedirectStdOut = false;
+ if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
+ CATCH_ERROR( "Verbosity level not supported by this reporter" );
+ }
+
+ ReporterPreferences getPreferences() const override {
+ return m_reporterPrefs;
+ }
+
+ static std::set<Verbosity> getSupportedVerbosities() {
+ return { Verbosity::Normal };
+ }
+
+ ~StreamingReporterBase() override = default;
+
+ void noMatchingTestCases(std::string const&) override {}
+
+ void testRunStarting(TestRunInfo const& _testRunInfo) override {
+ currentTestRunInfo = _testRunInfo;
+ }
+ void testGroupStarting(GroupInfo const& _groupInfo) override {
+ currentGroupInfo = _groupInfo;
+ }
+
+ void testCaseStarting(TestCaseInfo const& _testInfo) override {
+ currentTestCaseInfo = _testInfo;
+ }
+ void sectionStarting(SectionInfo const& _sectionInfo) override {
+ m_sectionStack.push_back(_sectionInfo);
+ }
+
+ void sectionEnded(SectionStats const& /* _sectionStats */) override {
+ m_sectionStack.pop_back();
+ }
+ void testCaseEnded(TestCaseStats const& /* _testCaseStats */) override {
+ currentTestCaseInfo.reset();
+ }
+ void testGroupEnded(TestGroupStats const& /* _testGroupStats */) override {
+ currentGroupInfo.reset();
+ }
+ void testRunEnded(TestRunStats const& /* _testRunStats */) override {
+ currentTestCaseInfo.reset();
+ currentGroupInfo.reset();
+ currentTestRunInfo.reset();
+ }
+
+ void skipTest(TestCaseInfo const&) override {
+ // Don't do anything with this by default.
+ // It can optionally be overridden in the derived class.
+ }
+
+ IConfigPtr m_config;
+ std::ostream& stream;
+
+ LazyStat<TestRunInfo> currentTestRunInfo;
+ LazyStat<GroupInfo> currentGroupInfo;
+ LazyStat<TestCaseInfo> currentTestCaseInfo;
+
+ std::vector<SectionInfo> m_sectionStack;
+ ReporterPreferences m_reporterPrefs;
+ };
+
+ template<typename DerivedT>
+ struct CumulativeReporterBase : IStreamingReporter {
+ template<typename T, typename ChildNodeT>
+ struct Node {
+ explicit Node( T const& _value ) : value( _value ) {}
+ virtual ~Node() {}
+
+ using ChildNodes = std::vector<std::shared_ptr<ChildNodeT>>;
+ T value;
+ ChildNodes children;
+ };
+ struct SectionNode {
+ explicit SectionNode(SectionStats const& _stats) : stats(_stats) {}
+ virtual ~SectionNode() = default;
+
+ bool operator == (SectionNode const& other) const {
+ return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
+ }
+ bool operator == (std::shared_ptr<SectionNode> const& other) const {
+ return operator==(*other);
+ }
+
+ SectionStats stats;
+ using ChildSections = std::vector<std::shared_ptr<SectionNode>>;
+ using Assertions = std::vector<AssertionStats>;
+ ChildSections childSections;
+ Assertions assertions;
+ std::string stdOut;
+ std::string stdErr;
+ };
+
+ struct BySectionInfo {
+ BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
+ BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
+ bool operator() (std::shared_ptr<SectionNode> const& node) const {
+ return ((node->stats.sectionInfo.name == m_other.name) &&
+ (node->stats.sectionInfo.lineInfo == m_other.lineInfo));
+ }
+ void operator=(BySectionInfo const&) = delete;
+
+ private:
+ SectionInfo const& m_other;
+ };
+
+ using TestCaseNode = Node<TestCaseStats, SectionNode>;
+ using TestGroupNode = Node<TestGroupStats, TestCaseNode>;
+ using TestRunNode = Node<TestRunStats, TestGroupNode>;
+
+ CumulativeReporterBase( ReporterConfig const& _config )
+ : m_config( _config.fullConfig() ),
+ stream( _config.stream() )
+ {
+ m_reporterPrefs.shouldRedirectStdOut = false;
+ if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
+ CATCH_ERROR( "Verbosity level not supported by this reporter" );
+ }
+ ~CumulativeReporterBase() override = default;
+
+ ReporterPreferences getPreferences() const override {
+ return m_reporterPrefs;
+ }
+
+ static std::set<Verbosity> getSupportedVerbosities() {
+ return { Verbosity::Normal };
+ }
+
+ void testRunStarting( TestRunInfo const& ) override {}
+ void testGroupStarting( GroupInfo const& ) override {}
+
+ void testCaseStarting( TestCaseInfo const& ) override {}
+
+ void sectionStarting( SectionInfo const& sectionInfo ) override {
+ SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
+ std::shared_ptr<SectionNode> node;
+ if( m_sectionStack.empty() ) {
+ if( !m_rootSection )
+ m_rootSection = std::make_shared<SectionNode>( incompleteStats );
+ node = m_rootSection;
+ }
+ else {
+ SectionNode& parentNode = *m_sectionStack.back();
+ auto it =
+ std::find_if( parentNode.childSections.begin(),
+ parentNode.childSections.end(),
+ BySectionInfo( sectionInfo ) );
+ if( it == parentNode.childSections.end() ) {
+ node = std::make_shared<SectionNode>( incompleteStats );
+ parentNode.childSections.push_back( node );
+ }
+ else
+ node = *it;
+ }
+ m_sectionStack.push_back( node );
+ m_deepestSection = std::move(node);
+ }
+
+ void assertionStarting(AssertionInfo const&) override {}
+
+ bool assertionEnded(AssertionStats const& assertionStats) override {
+ assert(!m_sectionStack.empty());
+ // AssertionResult holds a pointer to a temporary DecomposedExpression,
+ // which getExpandedExpression() calls to build the expression string.
+ // Our section stack copy of the assertionResult will likely outlive the
+ // temporary, so it must be expanded or discarded now to avoid calling
+ // a destroyed object later.
+ prepareExpandedExpression(const_cast<AssertionResult&>( assertionStats.assertionResult ) );
+ SectionNode& sectionNode = *m_sectionStack.back();
+ sectionNode.assertions.push_back(assertionStats);
+ return true;
+ }
+ void sectionEnded(SectionStats const& sectionStats) override {
+ assert(!m_sectionStack.empty());
+ SectionNode& node = *m_sectionStack.back();
+ node.stats = sectionStats;
+ m_sectionStack.pop_back();
+ }
+ void testCaseEnded(TestCaseStats const& testCaseStats) override {
+ auto node = std::make_shared<TestCaseNode>(testCaseStats);
+ assert(m_sectionStack.size() == 0);
+ node->children.push_back(m_rootSection);
+ m_testCases.push_back(node);
+ m_rootSection.reset();
+
+ assert(m_deepestSection);
+ m_deepestSection->stdOut = testCaseStats.stdOut;
+ m_deepestSection->stdErr = testCaseStats.stdErr;
+ }
+ void testGroupEnded(TestGroupStats const& testGroupStats) override {
+ auto node = std::make_shared<TestGroupNode>(testGroupStats);
+ node->children.swap(m_testCases);
+ m_testGroups.push_back(node);
+ }
+ void testRunEnded(TestRunStats const& testRunStats) override {
+ auto node = std::make_shared<TestRunNode>(testRunStats);
+ node->children.swap(m_testGroups);
+ m_testRuns.push_back(node);
+ testRunEndedCumulative();
+ }
+ virtual void testRunEndedCumulative() = 0;
+
+ void skipTest(TestCaseInfo const&) override {}
+
+ IConfigPtr m_config;
+ std::ostream& stream;
+ std::vector<AssertionStats> m_assertions;
+ std::vector<std::vector<std::shared_ptr<SectionNode>>> m_sections;
+ std::vector<std::shared_ptr<TestCaseNode>> m_testCases;
+ std::vector<std::shared_ptr<TestGroupNode>> m_testGroups;
+
+ std::vector<std::shared_ptr<TestRunNode>> m_testRuns;
+
+ std::shared_ptr<SectionNode> m_rootSection;
+ std::shared_ptr<SectionNode> m_deepestSection;
+ std::vector<std::shared_ptr<SectionNode>> m_sectionStack;
+ ReporterPreferences m_reporterPrefs;
+ };
+
+ template<char C>
+ char const* getLineOfChars() {
+ static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
+ if( !*line ) {
+ std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
+ line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
+ }
+ return line;
+ }
+
+ struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> {
+ TestEventListenerBase( ReporterConfig const& _config );
+
+ static std::set<Verbosity> getSupportedVerbosities();
+
+ void assertionStarting(AssertionInfo const&) override;
+ bool assertionEnded(AssertionStats const&) override;
+ };
+
+} // end namespace Catch
+
+// end catch_reporter_bases.hpp
+// start catch_console_colour.h
+
+namespace Catch {
+
+ struct Colour {
+ enum Code {
+ None = 0,
+
+ White,
+ Red,
+ Green,
+ Blue,
+ Cyan,
+ Yellow,
+ Grey,
+
+ Bright = 0x10,
+
+ BrightRed = Bright | Red,
+ BrightGreen = Bright | Green,
+ LightGrey = Bright | Grey,
+ BrightWhite = Bright | White,
+ BrightYellow = Bright | Yellow,
+
+ // By intention
+ FileName = LightGrey,
+ Warning = BrightYellow,
+ ResultError = BrightRed,
+ ResultSuccess = BrightGreen,
+ ResultExpectedFailure = Warning,
+
+ Error = BrightRed,
+ Success = Green,
+
+ OriginalExpression = Cyan,
+ ReconstructedExpression = BrightYellow,
+
+ SecondaryText = LightGrey,
+ Headers = White
+ };
+
+ // Use constructed object for RAII guard
+ Colour( Code _colourCode );
+ Colour( Colour&& other ) noexcept;
+ Colour& operator=( Colour&& other ) noexcept;
+ ~Colour();
+
+ // Use static method for one-shot changes
+ static void use( Code _colourCode );
+
+ private:
+ bool m_moved = false;
+ };
+
+ std::ostream& operator << ( std::ostream& os, Colour const& );
+
+} // end namespace Catch
+
+// end catch_console_colour.h
+// start catch_reporter_registrars.hpp
+
+
+namespace Catch {
+
+ template<typename T>
+ class ReporterRegistrar {
+
+ class ReporterFactory : public IReporterFactory {
+
+ virtual IStreamingReporterPtr create( ReporterConfig const& config ) const override {
+ return std::unique_ptr<T>( new T( config ) );
+ }
+
+ virtual std::string getDescription() const override {
+ return T::getDescription();
+ }
+ };
+
+ public:
+
+ explicit ReporterRegistrar( std::string const& name ) {
+ getMutableRegistryHub().registerReporter( name, std::make_shared<ReporterFactory>() );
+ }
+ };
+
+ template<typename T>
+ class ListenerRegistrar {
+
+ class ListenerFactory : public IReporterFactory {
+
+ virtual IStreamingReporterPtr create( ReporterConfig const& config ) const override {
+ return std::unique_ptr<T>( new T( config ) );
+ }
+ virtual std::string getDescription() const override {
+ return std::string();
+ }
+ };
+
+ public:
+
+ ListenerRegistrar() {
+ getMutableRegistryHub().registerListener( std::make_shared<ListenerFactory>() );
+ }
+ };
+}
+
+#if !defined(CATCH_CONFIG_DISABLE)
+
+#define CATCH_REGISTER_REPORTER( name, reporterType ) \
+ CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+ namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); } \
+ CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS
+
+#define CATCH_REGISTER_LISTENER( listenerType ) \
+ CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+ namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; } \
+ CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+#else // CATCH_CONFIG_DISABLE
+
+#define CATCH_REGISTER_REPORTER(name, reporterType)
+#define CATCH_REGISTER_LISTENER(listenerType)
+
+#endif // CATCH_CONFIG_DISABLE
+
+// end catch_reporter_registrars.hpp
+// Allow users to base their work off existing reporters
+// start catch_reporter_compact.h
+
+namespace Catch {
+
+ struct CompactReporter : StreamingReporterBase<CompactReporter> {
+
+ using StreamingReporterBase::StreamingReporterBase;
+
+ ~CompactReporter() override;
+
+ static std::string getDescription();
+
+ ReporterPreferences getPreferences() const override;
+
+ void noMatchingTestCases(std::string const& spec) override;
+
+ void assertionStarting(AssertionInfo const&) override;
+
+ bool assertionEnded(AssertionStats const& _assertionStats) override;
+
+ void sectionEnded(SectionStats const& _sectionStats) override;
+
+ void testRunEnded(TestRunStats const& _testRunStats) override;
+
+ };
+
+} // end namespace Catch
+
+// end catch_reporter_compact.h
+// start catch_reporter_console.h
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+ // Note that 4062 (not all labels are handled
+ // and default is missing) is enabled
+#endif
+
+namespace Catch {
+ // Fwd decls
+ struct SummaryColumn;
+ class TablePrinter;
+
+ struct ConsoleReporter : StreamingReporterBase<ConsoleReporter> {
+ std::unique_ptr<TablePrinter> m_tablePrinter;
+
+ ConsoleReporter(ReporterConfig const& config);
+ ~ConsoleReporter() override;
+ static std::string getDescription();
+
+ void noMatchingTestCases(std::string const& spec) override;
+
+ void assertionStarting(AssertionInfo const&) override;
+
+ bool assertionEnded(AssertionStats const& _assertionStats) override;
+
+ void sectionStarting(SectionInfo const& _sectionInfo) override;
+ void sectionEnded(SectionStats const& _sectionStats) override;
+
+ void benchmarkStarting(BenchmarkInfo const& info) override;
+ void benchmarkEnded(BenchmarkStats const& stats) override;
+
+ void testCaseEnded(TestCaseStats const& _testCaseStats) override;
+ void testGroupEnded(TestGroupStats const& _testGroupStats) override;
+ void testRunEnded(TestRunStats const& _testRunStats) override;
+
+ private:
+
+ void lazyPrint();
+
+ void lazyPrintWithoutClosingBenchmarkTable();
+ void lazyPrintRunInfo();
+ void lazyPrintGroupInfo();
+ void printTestCaseAndSectionHeader();
+
+ void printClosedHeader(std::string const& _name);
+ void printOpenHeader(std::string const& _name);
+
+ // if string has a : in first line will set indent to follow it on
+ // subsequent lines
+ void printHeaderString(std::string const& _string, std::size_t indent = 0);
+
+ void printTotals(Totals const& totals);
+ void printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row);
+
+ void printTotalsDivider(Totals const& totals);
+ void printSummaryDivider();
+
+ private:
+ bool m_headerPrinted = false;
+ };
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+// end catch_reporter_console.h
+// start catch_reporter_junit.h
+
+// start catch_xmlwriter.h
+
+#include <vector>
+
+namespace Catch {
+
+ class XmlEncode {
+ public:
+ enum ForWhat { ForTextNodes, ForAttributes };
+
+ XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes );
+
+ void encodeTo( std::ostream& os ) const;
+
+ friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
+
+ private:
+ std::string m_str;
+ ForWhat m_forWhat;
+ };
+
+ class XmlWriter {
+ public:
+
+ class ScopedElement {
+ public:
+ ScopedElement( XmlWriter* writer );
+
+ ScopedElement( ScopedElement&& other ) noexcept;
+ ScopedElement& operator=( ScopedElement&& other ) noexcept;
+
+ ~ScopedElement();
+
+ ScopedElement& writeText( std::string const& text, bool indent = true );
+
+ template<typename T>
+ ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
+ m_writer->writeAttribute( name, attribute );
+ return *this;
+ }
+
+ private:
+ mutable XmlWriter* m_writer = nullptr;
+ };
+
+ XmlWriter( std::ostream& os = Catch::cout() );
+ ~XmlWriter();
+
+ XmlWriter( XmlWriter const& ) = delete;
+ XmlWriter& operator=( XmlWriter const& ) = delete;
+
+ XmlWriter& startElement( std::string const& name );
+
+ ScopedElement scopedElement( std::string const& name );
+
+ XmlWriter& endElement();
+
+ XmlWriter& writeAttribute( std::string const& name, std::string const& attribute );
+
+ XmlWriter& writeAttribute( std::string const& name, bool attribute );
+
+ template<typename T>
+ XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
+ ReusableStringStream rss;
+ rss << attribute;
+ return writeAttribute( name, rss.str() );
+ }
+
+ XmlWriter& writeText( std::string const& text, bool indent = true );
+
+ XmlWriter& writeComment( std::string const& text );
+
+ void writeStylesheetRef( std::string const& url );
+
+ XmlWriter& writeBlankLine();
+
+ void ensureTagClosed();
+
+ private:
+
+ void writeDeclaration();
+
+ void newlineIfNecessary();
+
+ bool m_tagIsOpen = false;
+ bool m_needsNewline = false;
+ std::vector<std::string> m_tags;
+ std::string m_indent;
+ std::ostream& m_os;
+ };
+
+}
+
+// end catch_xmlwriter.h
+namespace Catch {
+
+ class JunitReporter : public CumulativeReporterBase<JunitReporter> {
+ public:
+ JunitReporter(ReporterConfig const& _config);
+
+ ~JunitReporter() override;
+
+ static std::string getDescription();
+
+ void noMatchingTestCases(std::string const& /*spec*/) override;
+
+ void testRunStarting(TestRunInfo const& runInfo) override;
+
+ void testGroupStarting(GroupInfo const& groupInfo) override;
+
+ void testCaseStarting(TestCaseInfo const& testCaseInfo) override;
+ bool assertionEnded(AssertionStats const& assertionStats) override;
+
+ void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+ void testGroupEnded(TestGroupStats const& testGroupStats) override;
+
+ void testRunEndedCumulative() override;
+
+ void writeGroup(TestGroupNode const& groupNode, double suiteTime);
+
+ void writeTestCase(TestCaseNode const& testCaseNode);
+
+ void writeSection(std::string const& className,
+ std::string const& rootName,
+ SectionNode const& sectionNode);
+
+ void writeAssertions(SectionNode const& sectionNode);
+ void writeAssertion(AssertionStats const& stats);
+
+ XmlWriter xml;
+ Timer suiteTimer;
+ std::string stdOutForSuite;
+ std::string stdErrForSuite;
+ unsigned int unexpectedExceptions = 0;
+ bool m_okToFail = false;
+ };
+
+} // end namespace Catch
+
+// end catch_reporter_junit.h
+// start catch_reporter_xml.h
+
+namespace Catch {
+ class XmlReporter : public StreamingReporterBase<XmlReporter> {
+ public:
+ XmlReporter(ReporterConfig const& _config);
+
+ ~XmlReporter() override;
+
+ static std::string getDescription();
+
+ virtual std::string getStylesheetRef() const;
+
+ void writeSourceInfo(SourceLineInfo const& sourceInfo);
+
+ public: // StreamingReporterBase
+
+ void noMatchingTestCases(std::string const& s) override;
+
+ void testRunStarting(TestRunInfo const& testInfo) override;
+
+ void testGroupStarting(GroupInfo const& groupInfo) override;
+
+ void testCaseStarting(TestCaseInfo const& testInfo) override;
+
+ void sectionStarting(SectionInfo const& sectionInfo) override;
+
+ void assertionStarting(AssertionInfo const&) override;
+
+ bool assertionEnded(AssertionStats const& assertionStats) override;
+
+ void sectionEnded(SectionStats const& sectionStats) override;
+
+ void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+ void testGroupEnded(TestGroupStats const& testGroupStats) override;
+
+ void testRunEnded(TestRunStats const& testRunStats) override;
+
+ private:
+ Timer m_testCaseTimer;
+ XmlWriter m_xml;
+ int m_sectionDepth = 0;
+ };
+
+} // end namespace Catch
+
+// end catch_reporter_xml.h
+
+// end catch_external_interfaces.h
+#endif
+
+#endif // ! CATCH_CONFIG_IMPL_ONLY
+
+#ifdef CATCH_IMPL
+// start catch_impl.hpp
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#endif
+
+// Keep these here for external reporters
+// start catch_test_case_tracker.h
+
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+namespace TestCaseTracking {
+
+ struct NameAndLocation {
+ std::string name;
+ SourceLineInfo location;
+
+ NameAndLocation( std::string const& _name, SourceLineInfo const& _location );
+ };
+
+ struct ITracker;
+
+ using ITrackerPtr = std::shared_ptr<ITracker>;
+
+ struct ITracker {
+ virtual ~ITracker();
+
+ // static queries
+ virtual NameAndLocation const& nameAndLocation() const = 0;
+
+ // dynamic queries
+ virtual bool isComplete() const = 0; // Successfully completed or failed
+ virtual bool isSuccessfullyCompleted() const = 0;
+ virtual bool isOpen() const = 0; // Started but not complete
+ virtual bool hasChildren() const = 0;
+
+ virtual ITracker& parent() = 0;
+
+ // actions
+ virtual void close() = 0; // Successfully complete
+ virtual void fail() = 0;
+ virtual void markAsNeedingAnotherRun() = 0;
+
+ virtual void addChild( ITrackerPtr const& child ) = 0;
+ virtual ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) = 0;
+ virtual void openChild() = 0;
+
+ // Debug/ checking
+ virtual bool isSectionTracker() const = 0;
+ virtual bool isGeneratorTracker() const = 0;
+ };
+
+ class TrackerContext {
+
+ enum RunState {
+ NotStarted,
+ Executing,
+ CompletedCycle
+ };
+
+ ITrackerPtr m_rootTracker;
+ ITracker* m_currentTracker = nullptr;
+ RunState m_runState = NotStarted;
+
+ public:
+
+ static TrackerContext& instance();
+
+ ITracker& startRun();
+ void endRun();
+
+ void startCycle();
+ void completeCycle();
+
+ bool completedCycle() const;
+ ITracker& currentTracker();
+ void setCurrentTracker( ITracker* tracker );
+ };
+
+ class TrackerBase : public ITracker {
+ protected:
+ enum CycleState {
+ NotStarted,
+ Executing,
+ ExecutingChildren,
+ NeedsAnotherRun,
+ CompletedSuccessfully,
+ Failed
+ };
+
+ using Children = std::vector<ITrackerPtr>;
+ NameAndLocation m_nameAndLocation;
+ TrackerContext& m_ctx;
+ ITracker* m_parent;
+ Children m_children;
+ CycleState m_runState = NotStarted;
+
+ public:
+ TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
+
+ NameAndLocation const& nameAndLocation() const override;
+ bool isComplete() const override;
+ bool isSuccessfullyCompleted() const override;
+ bool isOpen() const override;
+ bool hasChildren() const override;
+
+ void addChild( ITrackerPtr const& child ) override;
+
+ ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) override;
+ ITracker& parent() override;
+
+ void openChild() override;
+
+ bool isSectionTracker() const override;
+ bool isGeneratorTracker() const override;
+
+ void open();
+
+ void close() override;
+ void fail() override;
+ void markAsNeedingAnotherRun() override;
+
+ private:
+ void moveToParent();
+ void moveToThis();
+ };
+
+ class SectionTracker : public TrackerBase {
+ std::vector<std::string> m_filters;
+ public:
+ SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
+
+ bool isSectionTracker() const override;
+
+ bool isComplete() const override;
+
+ static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation );
+
+ void tryOpen();
+
+ void addInitialFilters( std::vector<std::string> const& filters );
+ void addNextFilters( std::vector<std::string> const& filters );
+ };
+
+} // namespace TestCaseTracking
+
+using TestCaseTracking::ITracker;
+using TestCaseTracking::TrackerContext;
+using TestCaseTracking::SectionTracker;
+
+} // namespace Catch
+
+// end catch_test_case_tracker.h
+
+// start catch_leak_detector.h
+
+namespace Catch {
+
+ struct LeakDetector {
+ LeakDetector();
+ ~LeakDetector();
+ };
+
+}
+// end catch_leak_detector.h
+// Cpp files will be included in the single-header file here
+// start catch_approx.cpp
+
+#include <cmath>
+#include <limits>
+
+namespace {
+
+// Performs equivalent check of std::fabs(lhs - rhs) <= margin
+// But without the subtraction to allow for INFINITY in comparison
+bool marginComparison(double lhs, double rhs, double margin) {
+ return (lhs + margin >= rhs) && (rhs + margin >= lhs);
+}
+
+}
+
+namespace Catch {
+namespace Detail {
+
+ Approx::Approx ( double value )
+ : m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
+ m_margin( 0.0 ),
+ m_scale( 0.0 ),
+ m_value( value )
+ {}
+
+ Approx Approx::custom() {
+ return Approx( 0 );
+ }
+
+ Approx Approx::operator-() const {
+ auto temp(*this);
+ temp.m_value = -temp.m_value;
+ return temp;
+ }
+
+ std::string Approx::toString() const {
+ ReusableStringStream rss;
+ rss << "Approx( " << ::Catch::Detail::stringify( m_value ) << " )";
+ return rss.str();
+ }
+
+ bool Approx::equalityComparisonImpl(const double other) const {
+ // First try with fixed margin, then compute margin based on epsilon, scale and Approx's value
+ // Thanks to Richard Harris for his help refining the scaled margin value
+ return marginComparison(m_value, other, m_margin) || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(m_value)));
+ }
+
+ void Approx::setMargin(double margin) {
+ CATCH_ENFORCE(margin >= 0,
+ "Invalid Approx::margin: " << margin << '.'
+ << " Approx::Margin has to be non-negative.");
+ m_margin = margin;
+ }
+
+ void Approx::setEpsilon(double epsilon) {
+ CATCH_ENFORCE(epsilon >= 0 && epsilon <= 1.0,
+ "Invalid Approx::epsilon: " << epsilon << '.'
+ << " Approx::epsilon has to be in [0, 1]");
+ m_epsilon = epsilon;
+ }
+
+} // end namespace Detail
+
+namespace literals {
+ Detail::Approx operator "" _a(long double val) {
+ return Detail::Approx(val);
+ }
+ Detail::Approx operator "" _a(unsigned long long val) {
+ return Detail::Approx(val);
+ }
+} // end namespace literals
+
+std::string StringMaker<Catch::Detail::Approx>::convert(Catch::Detail::Approx const& value) {
+ return value.toString();
+}
+
+} // end namespace Catch
+// end catch_approx.cpp
+// start catch_assertionhandler.cpp
+
+// start catch_context.h
+
+#include <memory>
+
+namespace Catch {
+
+ struct IResultCapture;
+ struct IRunner;
+ struct IConfig;
+ struct IMutableContext;
+
+ using IConfigPtr = std::shared_ptr<IConfig const>;
+
+ struct IContext
+ {
+ virtual ~IContext();
+
+ virtual IResultCapture* getResultCapture() = 0;
+ virtual IRunner* getRunner() = 0;
+ virtual IConfigPtr const& getConfig() const = 0;
+ };
+
+ struct IMutableContext : IContext
+ {
+ virtual ~IMutableContext();
+ virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
+ virtual void setRunner( IRunner* runner ) = 0;
+ virtual void setConfig( IConfigPtr const& config ) = 0;
+
+ private:
+ static IMutableContext *currentContext;
+ friend IMutableContext& getCurrentMutableContext();
+ friend void cleanUpContext();
+ static void createContext();
+ };
+
+ inline IMutableContext& getCurrentMutableContext()
+ {
+ if( !IMutableContext::currentContext )
+ IMutableContext::createContext();
+ return *IMutableContext::currentContext;
+ }
+
+ inline IContext& getCurrentContext()
+ {
+ return getCurrentMutableContext();
+ }
+
+ void cleanUpContext();
+}
+
+// end catch_context.h
+// start catch_debugger.h
+
+namespace Catch {
+ bool isDebuggerActive();
+}
+
+#ifdef CATCH_PLATFORM_MAC
+
+ #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+
+#elif defined(CATCH_PLATFORM_LINUX)
+ // If we can use inline assembler, do it because this allows us to break
+ // directly at the location of the failing check instead of breaking inside
+ // raise() called from it, i.e. one stack frame below.
+ #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
+ #define CATCH_TRAP() asm volatile ("int $3") /* NOLINT */
+ #else // Fall back to the generic way.
+ #include <signal.h>
+
+ #define CATCH_TRAP() raise(SIGTRAP)
+ #endif
+#elif defined(_MSC_VER)
+ #define CATCH_TRAP() __debugbreak()
+#elif defined(__MINGW32__)
+ extern "C" __declspec(dllimport) void __stdcall DebugBreak();
+ #define CATCH_TRAP() DebugBreak()
+#endif
+
+#ifdef CATCH_TRAP
+ #define CATCH_BREAK_INTO_DEBUGGER() []{ if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } }()
+#else
+ #define CATCH_BREAK_INTO_DEBUGGER() []{}()
+#endif
+
+// end catch_debugger.h
+// start catch_run_context.h
+
+// start catch_fatal_condition.h
+
+// start catch_windows_h_proxy.h
+
+
+#if defined(CATCH_PLATFORM_WINDOWS)
+
+#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
+# define CATCH_DEFINED_NOMINMAX
+# define NOMINMAX
+#endif
+#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
+# define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifdef __AFXDLL
+#include <AfxWin.h>
+#else
+#include <windows.h>
+#endif
+
+#ifdef CATCH_DEFINED_NOMINMAX
+# undef NOMINMAX
+#endif
+#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN
+# undef WIN32_LEAN_AND_MEAN
+#endif
+
+#endif // defined(CATCH_PLATFORM_WINDOWS)
+
+// end catch_windows_h_proxy.h
+#if defined( CATCH_CONFIG_WINDOWS_SEH )
+
+namespace Catch {
+
+ struct FatalConditionHandler {
+
+ static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo);
+ FatalConditionHandler();
+ static void reset();
+ ~FatalConditionHandler();
+
+ private:
+ static bool isSet;
+ static ULONG guaranteeSize;
+ static PVOID exceptionHandlerHandle;
+ };
+
+} // namespace Catch
+
+#elif defined ( CATCH_CONFIG_POSIX_SIGNALS )
+
+#include <signal.h>
+
+namespace Catch {
+
+ struct FatalConditionHandler {
+
+ static bool isSet;
+ static struct sigaction oldSigActions[];
+ static stack_t oldSigStack;
+ static char altStackMem[];
+
+ static void handleSignal( int sig );
+
+ FatalConditionHandler();
+ ~FatalConditionHandler();
+ static void reset();
+ };
+
+} // namespace Catch
+
+#else
+
+namespace Catch {
+ struct FatalConditionHandler {
+ void reset();
+ };
+}
+
+#endif
+
+// end catch_fatal_condition.h
+#include <string>
+
+namespace Catch {
+
+ struct IMutableContext;
+
+ ///////////////////////////////////////////////////////////////////////////
+
+ class RunContext : public IResultCapture, public IRunner {
+
+ public:
+ RunContext( RunContext const& ) = delete;
+ RunContext& operator =( RunContext const& ) = delete;
+
+ explicit RunContext( IConfigPtr const& _config, IStreamingReporterPtr&& reporter );
+
+ ~RunContext() override;
+
+ void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount );
+ void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount );
+
+ Totals runTest(TestCase const& testCase);
+
+ IConfigPtr config() const;
+ IStreamingReporter& reporter() const;
+
+ public: // IResultCapture
+
+ // Assertion handlers
+ void handleExpr
+ ( AssertionInfo const& info,
+ ITransientExpression const& expr,
+ AssertionReaction& reaction ) override;
+ void handleMessage
+ ( AssertionInfo const& info,
+ ResultWas::OfType resultType,
+ StringRef const& message,
+ AssertionReaction& reaction ) override;
+ void handleUnexpectedExceptionNotThrown
+ ( AssertionInfo const& info,
+ AssertionReaction& reaction ) override;
+ void handleUnexpectedInflightException
+ ( AssertionInfo const& info,
+ std::string const& message,
+ AssertionReaction& reaction ) override;
+ void handleIncomplete
+ ( AssertionInfo const& info ) override;
+ void handleNonExpr
+ ( AssertionInfo const &info,
+ ResultWas::OfType resultType,
+ AssertionReaction &reaction ) override;
+
+ bool sectionStarted( SectionInfo const& sectionInfo, Counts& assertions ) override;
+
+ void sectionEnded( SectionEndInfo const& endInfo ) override;
+ void sectionEndedEarly( SectionEndInfo const& endInfo ) override;
+
+ auto acquireGeneratorTracker( SourceLineInfo const& lineInfo ) -> IGeneratorTracker& override;
+
+ void benchmarkStarting( BenchmarkInfo const& info ) override;
+ void benchmarkEnded( BenchmarkStats const& stats ) override;
+
+ void pushScopedMessage( MessageInfo const& message ) override;
+ void popScopedMessage( MessageInfo const& message ) override;
+
+ std::string getCurrentTestName() const override;
+
+ const AssertionResult* getLastResult() const override;
+
+ void exceptionEarlyReported() override;
+
+ void handleFatalErrorCondition( StringRef message ) override;
+
+ bool lastAssertionPassed() override;
+
+ void assertionPassed() override;
+
+ public:
+ // !TBD We need to do this another way!
+ bool aborting() const final;
+
+ private:
+
+ void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr );
+ void invokeActiveTestCase();
+
+ void resetAssertionInfo();
+ bool testForMissingAssertions( Counts& assertions );
+
+ void assertionEnded( AssertionResult const& result );
+ void reportExpr
+ ( AssertionInfo const &info,
+ ResultWas::OfType resultType,
+ ITransientExpression const *expr,
+ bool negated );
+
+ void populateReaction( AssertionReaction& reaction );
+
+ private:
+
+ void handleUnfinishedSections();
+
+ TestRunInfo m_runInfo;
+ IMutableContext& m_context;
+ TestCase const* m_activeTestCase = nullptr;
+ ITracker* m_testCaseTracker = nullptr;
+ Option<AssertionResult> m_lastResult;
+
+ IConfigPtr m_config;
+ Totals m_totals;
+ IStreamingReporterPtr m_reporter;
+ std::vector<MessageInfo> m_messages;
+ AssertionInfo m_lastAssertionInfo;
+ std::vector<SectionEndInfo> m_unfinishedSections;
+ std::vector<ITracker*> m_activeSections;
+ TrackerContext m_trackerContext;
+ bool m_lastAssertionPassed = false;
+ bool m_shouldReportUnexpected = true;
+ bool m_includeSuccessfulResults;
+ };
+
+} // end namespace Catch
+
+// end catch_run_context.h
+namespace Catch {
+
+ namespace {
+ auto operator <<( std::ostream& os, ITransientExpression const& expr ) -> std::ostream& {
+ expr.streamReconstructedExpression( os );
+ return os;
+ }
+ }
+
+ LazyExpression::LazyExpression( bool isNegated )
+ : m_isNegated( isNegated )
+ {}
+
+ LazyExpression::LazyExpression( LazyExpression const& other ) : m_isNegated( other.m_isNegated ) {}
+
+ LazyExpression::operator bool() const {
+ return m_transientExpression != nullptr;
+ }
+
+ auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream& {
+ if( lazyExpr.m_isNegated )
+ os << "!";
+
+ if( lazyExpr ) {
+ if( lazyExpr.m_isNegated && lazyExpr.m_transientExpression->isBinaryExpression() )
+ os << "(" << *lazyExpr.m_transientExpression << ")";
+ else
+ os << *lazyExpr.m_transientExpression;
+ }
+ else {
+ os << "{** error - unchecked empty expression requested **}";
+ }
+ return os;
+ }
+
+ AssertionHandler::AssertionHandler
+ ( StringRef const& macroName,
+ SourceLineInfo const& lineInfo,
+ StringRef capturedExpression,
+ ResultDisposition::Flags resultDisposition )
+ : m_assertionInfo{ macroName, lineInfo, capturedExpression, resultDisposition },
+ m_resultCapture( getResultCapture() )
+ {}
+
+ void AssertionHandler::handleExpr( ITransientExpression const& expr ) {
+ m_resultCapture.handleExpr( m_assertionInfo, expr, m_reaction );
+ }
+ void AssertionHandler::handleMessage(ResultWas::OfType resultType, StringRef const& message) {
+ m_resultCapture.handleMessage( m_assertionInfo, resultType, message, m_reaction );
+ }
+
+ auto AssertionHandler::allowThrows() const -> bool {
+ return getCurrentContext().getConfig()->allowThrows();
+ }
+
+ void AssertionHandler::complete() {
+ setCompleted();
+ if( m_reaction.shouldDebugBreak ) {
+
+ // If you find your debugger stopping you here then go one level up on the
+ // call-stack for the code that caused it (typically a failed assertion)
+
+ // (To go back to the test and change execution, jump over the throw, next)
+ CATCH_BREAK_INTO_DEBUGGER();
+ }
+ if (m_reaction.shouldThrow) {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+ throw Catch::TestFailureException();
+#else
+ CATCH_ERROR( "Test failure requires aborting test!" );
+#endif
+ }
+ }
+ void AssertionHandler::setCompleted() {
+ m_completed = true;
+ }
+
+ void AssertionHandler::handleUnexpectedInflightException() {
+ m_resultCapture.handleUnexpectedInflightException( m_assertionInfo, Catch::translateActiveException(), m_reaction );
+ }
+
+ void AssertionHandler::handleExceptionThrownAsExpected() {
+ m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+ }
+ void AssertionHandler::handleExceptionNotThrownAsExpected() {
+ m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+ }
+
+ void AssertionHandler::handleUnexpectedExceptionNotThrown() {
+ m_resultCapture.handleUnexpectedExceptionNotThrown( m_assertionInfo, m_reaction );
+ }
+
+ void AssertionHandler::handleThrowingCallSkipped() {
+ m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+ }
+
+ // This is the overload that takes a string and infers the Equals matcher from it
+ // The more general overload, that takes any string matcher, is in catch_capture_matchers.cpp
+ void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString ) {
+ handleExceptionMatchExpr( handler, Matchers::Equals( str ), matcherString );
+ }
+
+} // namespace Catch
+// end catch_assertionhandler.cpp
+// start catch_assertionresult.cpp
+
+namespace Catch {
+ AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression):
+ lazyExpression(_lazyExpression),
+ resultType(_resultType) {}
+
+ std::string AssertionResultData::reconstructExpression() const {
+
+ if( reconstructedExpression.empty() ) {
+ if( lazyExpression ) {
+ ReusableStringStream rss;
+ rss << lazyExpression;
+ reconstructedExpression = rss.str();
+ }
+ }
+ return reconstructedExpression;
+ }
+
+ AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
+ : m_info( info ),
+ m_resultData( data )
+ {}
+
+ // Result was a success
+ bool AssertionResult::succeeded() const {
+ return Catch::isOk( m_resultData.resultType );
+ }
+
+ // Result was a success, or failure is suppressed
+ bool AssertionResult::isOk() const {
+ return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition );
+ }
+
+ ResultWas::OfType AssertionResult::getResultType() const {
+ return m_resultData.resultType;
+ }
+
+ bool AssertionResult::hasExpression() const {
+ return m_info.capturedExpression[0] != 0;
+ }
+
+ bool AssertionResult::hasMessage() const {
+ return !m_resultData.message.empty();
+ }
+
+ std::string AssertionResult::getExpression() const {
+ if( isFalseTest( m_info.resultDisposition ) )
+ return "!(" + m_info.capturedExpression + ")";
+ else
+ return m_info.capturedExpression;
+ }
+
+ std::string AssertionResult::getExpressionInMacro() const {
+ std::string expr;
+ if( m_info.macroName[0] == 0 )
+ expr = m_info.capturedExpression;
+ else {
+ expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
+ expr += m_info.macroName;
+ expr += "( ";
+ expr += m_info.capturedExpression;
+ expr += " )";
+ }
+ return expr;
+ }
+
+ bool AssertionResult::hasExpandedExpression() const {
+ return hasExpression() && getExpandedExpression() != getExpression();
+ }
+
+ std::string AssertionResult::getExpandedExpression() const {
+ std::string expr = m_resultData.reconstructExpression();
+ return expr.empty()
+ ? getExpression()
+ : expr;
+ }
+
+ std::string AssertionResult::getMessage() const {
+ return m_resultData.message;
+ }
+ SourceLineInfo AssertionResult::getSourceInfo() const {
+ return m_info.lineInfo;
+ }
+
+ StringRef AssertionResult::getTestMacroName() const {
+ return m_info.macroName;
+ }
+
+} // end namespace Catch
+// end catch_assertionresult.cpp
+// start catch_benchmark.cpp
+
+namespace Catch {
+
+ auto BenchmarkLooper::getResolution() -> uint64_t {
+ return getEstimatedClockResolution() * getCurrentContext().getConfig()->benchmarkResolutionMultiple();
+ }
+
+ void BenchmarkLooper::reportStart() {
+ getResultCapture().benchmarkStarting( { m_name } );
+ }
+ auto BenchmarkLooper::needsMoreIterations() -> bool {
+ auto elapsed = m_timer.getElapsedNanoseconds();
+
+ // Exponentially increasing iterations until we're confident in our timer resolution
+ if( elapsed < m_resolution ) {
+ m_iterationsToRun *= 10;
+ return true;
+ }
+
+ getResultCapture().benchmarkEnded( { { m_name }, m_count, elapsed } );
+ return false;
+ }
+
+} // end namespace Catch
+// end catch_benchmark.cpp
+// start catch_capture_matchers.cpp
+
+namespace Catch {
+
+ using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
+
+ // This is the general overload that takes a any string matcher
+ // There is another overload, in catch_assertionhandler.h/.cpp, that only takes a string and infers
+ // the Equals matcher (so the header does not mention matchers)
+ void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString ) {
+ std::string exceptionMessage = Catch::translateActiveException();
+ MatchExpr<std::string, StringMatcher const&> expr( exceptionMessage, matcher, matcherString );
+ handler.handleExpr( expr );
+ }
+
+} // namespace Catch
+// end catch_capture_matchers.cpp
+// start catch_commandline.cpp
+
+// start catch_commandline.h
+
+// start catch_clara.h
+
+// Use Catch's value for console width (store Clara's off to the side, if present)
+#ifdef CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#undef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#endif
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH-1
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+
+// start clara.hpp
+// Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// See https://github.com/philsquared/Clara for more details
+
+// Clara v1.1.5
+
+
+#ifndef CATCH_CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+
+#ifndef CLARA_CONFIG_OPTIONAL_TYPE
+#ifdef __has_include
+#if __has_include(<optional>) && __cplusplus >= 201703L
+#include <optional>
+#define CLARA_CONFIG_OPTIONAL_TYPE std::optional
+#endif
+#endif
+#endif
+
+// ----------- #included from clara_textflow.hpp -----------
+
+// TextFlowCpp
+//
+// A single-header library for wrapping and laying out basic text, by Phil Nash
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// This project is hosted at https://github.com/philsquared/textflowcpp
+
+
+#include <cassert>
+#include <ostream>
+#include <sstream>
+#include <vector>
+
+#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+namespace Catch {
+namespace clara {
+namespace TextFlow {
+
+inline auto isWhitespace(char c) -> bool {
+ static std::string chars = " \t\n\r";
+ return chars.find(c) != std::string::npos;
+}
+inline auto isBreakableBefore(char c) -> bool {
+ static std::string chars = "[({<|";
+ return chars.find(c) != std::string::npos;
+}
+inline auto isBreakableAfter(char c) -> bool {
+ static std::string chars = "])}>.,:;*+-=&/\\";
+ return chars.find(c) != std::string::npos;
+}
+
+class Columns;
+
+class Column {
+ std::vector<std::string> m_strings;
+ size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH;
+ size_t m_indent = 0;
+ size_t m_initialIndent = std::string::npos;
+
+public:
+ class iterator {
+ friend Column;
+
+ Column const& m_column;
+ size_t m_stringIndex = 0;
+ size_t m_pos = 0;
+
+ size_t m_len = 0;
+ size_t m_end = 0;
+ bool m_suffix = false;
+
+ iterator(Column const& column, size_t stringIndex)
+ : m_column(column),
+ m_stringIndex(stringIndex) {}
+
+ auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; }
+
+ auto isBoundary(size_t at) const -> bool {
+ assert(at > 0);
+ assert(at <= line().size());
+
+ return at == line().size() ||
+ (isWhitespace(line()[at]) && !isWhitespace(line()[at - 1])) ||
+ isBreakableBefore(line()[at]) ||
+ isBreakableAfter(line()[at - 1]);
+ }
+
+ void calcLength() {
+ assert(m_stringIndex < m_column.m_strings.size());
+
+ m_suffix = false;
+ auto width = m_column.m_width - indent();
+ m_end = m_pos;
+ while (m_end < line().size() && line()[m_end] != '\n')
+ ++m_end;
+
+ if (m_end < m_pos + width) {
+ m_len = m_end - m_pos;
+ } else {
+ size_t len = width;
+ while (len > 0 && !isBoundary(m_pos + len))
+ --len;
+ while (len > 0 && isWhitespace(line()[m_pos + len - 1]))
+ --len;
+
+ if (len > 0) {
+ m_len = len;
+ } else {
+ m_suffix = true;
+ m_len = width - 1;
+ }
+ }
+ }
+
+ auto indent() const -> size_t {
+ auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos;
+ return initial == std::string::npos ? m_column.m_indent : initial;
+ }
+
+ auto addIndentAndSuffix(std::string const &plain) const -> std::string {
+ return std::string(indent(), ' ') + (m_suffix ? plain + "-" : plain);
+ }
+
+ public:
+ using difference_type = std::ptrdiff_t;
+ using value_type = std::string;
+ using pointer = value_type * ;
+ using reference = value_type & ;
+ using iterator_category = std::forward_iterator_tag;
+
+ explicit iterator(Column const& column) : m_column(column) {
+ assert(m_column.m_width > m_column.m_indent);
+ assert(m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent);
+ calcLength();
+ if (m_len == 0)
+ m_stringIndex++; // Empty string
+ }
+
+ auto operator *() const -> std::string {
+ assert(m_stringIndex < m_column.m_strings.size());
+ assert(m_pos <= m_end);
+ return addIndentAndSuffix(line().substr(m_pos, m_len));
+ }
+
+ auto operator ++() -> iterator& {
+ m_pos += m_len;
+ if (m_pos < line().size() && line()[m_pos] == '\n')
+ m_pos += 1;
+ else
+ while (m_pos < line().size() && isWhitespace(line()[m_pos]))
+ ++m_pos;
+
+ if (m_pos == line().size()) {
+ m_pos = 0;
+ ++m_stringIndex;
+ }
+ if (m_stringIndex < m_column.m_strings.size())
+ calcLength();
+ return *this;
+ }
+ auto operator ++(int) -> iterator {
+ iterator prev(*this);
+ operator++();
+ return prev;
+ }
+
+ auto operator ==(iterator const& other) const -> bool {
+ return
+ m_pos == other.m_pos &&
+ m_stringIndex == other.m_stringIndex &&
+ &m_column == &other.m_column;
+ }
+ auto operator !=(iterator const& other) const -> bool {
+ return !operator==(other);
+ }
+ };
+ using const_iterator = iterator;
+
+ explicit Column(std::string const& text) { m_strings.push_back(text); }
+
+ auto width(size_t newWidth) -> Column& {
+ assert(newWidth > 0);
+ m_width = newWidth;
+ return *this;
+ }
+ auto indent(size_t newIndent) -> Column& {
+ m_indent = newIndent;
+ return *this;
+ }
+ auto initialIndent(size_t newIndent) -> Column& {
+ m_initialIndent = newIndent;
+ return *this;
+ }
+
+ auto width() const -> size_t { return m_width; }
+ auto begin() const -> iterator { return iterator(*this); }
+ auto end() const -> iterator { return { *this, m_strings.size() }; }
+
+ inline friend std::ostream& operator << (std::ostream& os, Column const& col) {
+ bool first = true;
+ for (auto line : col) {
+ if (first)
+ first = false;
+ else
+ os << "\n";
+ os << line;
+ }
+ return os;
+ }
+
+ auto operator + (Column const& other)->Columns;
+
+ auto toString() const -> std::string {
+ std::ostringstream oss;
+ oss << *this;
+ return oss.str();
+ }
+};
+
+class Spacer : public Column {
+
+public:
+ explicit Spacer(size_t spaceWidth) : Column("") {
+ width(spaceWidth);
+ }
+};
+
+class Columns {
+ std::vector<Column> m_columns;
+
+public:
+
+ class iterator {
+ friend Columns;
+ struct EndTag {};
+
+ std::vector<Column> const& m_columns;
+ std::vector<Column::iterator> m_iterators;
+ size_t m_activeIterators;
+
+ iterator(Columns const& columns, EndTag)
+ : m_columns(columns.m_columns),
+ m_activeIterators(0) {
+ m_iterators.reserve(m_columns.size());
+
+ for (auto const& col : m_columns)
+ m_iterators.push_back(col.end());
+ }
+
+ public:
+ using difference_type = std::ptrdiff_t;
+ using value_type = std::string;
+ using pointer = value_type * ;
+ using reference = value_type & ;
+ using iterator_category = std::forward_iterator_tag;
+
+ explicit iterator(Columns const& columns)
+ : m_columns(columns.m_columns),
+ m_activeIterators(m_columns.size()) {
+ m_iterators.reserve(m_columns.size());
+
+ for (auto const& col : m_columns)
+ m_iterators.push_back(col.begin());
+ }
+
+ auto operator ==(iterator const& other) const -> bool {
+ return m_iterators == other.m_iterators;
+ }
+ auto operator !=(iterator const& other) const -> bool {
+ return m_iterators != other.m_iterators;
+ }
+ auto operator *() const -> std::string {
+ std::string row, padding;
+
+ for (size_t i = 0; i < m_columns.size(); ++i) {
+ auto width = m_columns[i].width();
+ if (m_iterators[i] != m_columns[i].end()) {
+ std::string col = *m_iterators[i];
+ row += padding + col;
+ if (col.size() < width)
+ padding = std::string(width - col.size(), ' ');
+ else
+ padding = "";
+ } else {
+ padding += std::string(width, ' ');
+ }
+ }
+ return row;
+ }
+ auto operator ++() -> iterator& {
+ for (size_t i = 0; i < m_columns.size(); ++i) {
+ if (m_iterators[i] != m_columns[i].end())
+ ++m_iterators[i];
+ }
+ return *this;
+ }
+ auto operator ++(int) -> iterator {
+ iterator prev(*this);
+ operator++();
+ return prev;
+ }
+ };
+ using const_iterator = iterator;
+
+ auto begin() const -> iterator { return iterator(*this); }
+ auto end() const -> iterator { return { *this, iterator::EndTag() }; }
+
+ auto operator += (Column const& col) -> Columns& {
+ m_columns.push_back(col);
+ return *this;
+ }
+ auto operator + (Column const& col) -> Columns {
+ Columns combined = *this;
+ combined += col;
+ return combined;
+ }
+
+ inline friend std::ostream& operator << (std::ostream& os, Columns const& cols) {
+
+ bool first = true;
+ for (auto line : cols) {
+ if (first)
+ first = false;
+ else
+ os << "\n";
+ os << line;
+ }
+ return os;
+ }
+
+ auto toString() const -> std::string {
+ std::ostringstream oss;
+ oss << *this;
+ return oss.str();
+ }
+};
+
+inline auto Column::operator + (Column const& other) -> Columns {
+ Columns cols;
+ cols += *this;
+ cols += other;
+ return cols;
+}
+}
+
+}
+}
+
+// ----------- end of #include from clara_textflow.hpp -----------
+// ........... back in clara.hpp
+
+#include <string>
+#include <memory>
+#include <set>
+#include <algorithm>
+
+#if !defined(CATCH_PLATFORM_WINDOWS) && ( defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) )
+#define CATCH_PLATFORM_WINDOWS
+#endif
+
+namespace Catch { namespace clara {
+namespace detail {
+
+ // Traits for extracting arg and return type of lambdas (for single argument lambdas)
+ template<typename L>
+ struct UnaryLambdaTraits : UnaryLambdaTraits<decltype( &L::operator() )> {};
+
+ template<typename ClassT, typename ReturnT, typename... Args>
+ struct UnaryLambdaTraits<ReturnT( ClassT::* )( Args... ) const> {
+ static const bool isValid = false;
+ };
+
+ template<typename ClassT, typename ReturnT, typename ArgT>
+ struct UnaryLambdaTraits<ReturnT( ClassT::* )( ArgT ) const> {
+ static const bool isValid = true;
+ using ArgType = typename std::remove_const<typename std::remove_reference<ArgT>::type>::type;
+ using ReturnType = ReturnT;
+ };
+
+ class TokenStream;
+
+ // Transport for raw args (copied from main args, or supplied via init list for testing)
+ class Args {
+ friend TokenStream;
+ std::string m_exeName;
+ std::vector<std::string> m_args;
+
+ public:
+ Args( int argc, char const* const* argv )
+ : m_exeName(argv[0]),
+ m_args(argv + 1, argv + argc) {}
+
+ Args( std::initializer_list<std::string> args )
+ : m_exeName( *args.begin() ),
+ m_args( args.begin()+1, args.end() )
+ {}
+
+ auto exeName() const -> std::string {
+ return m_exeName;
+ }
+ };
+
+ // Wraps a token coming from a token stream. These may not directly correspond to strings as a single string
+ // may encode an option + its argument if the : or = form is used
+ enum class TokenType {
+ Option, Argument
+ };
+ struct Token {
+ TokenType type;
+ std::string token;
+ };
+
+ inline auto isOptPrefix( char c ) -> bool {
+ return c == '-'
+#ifdef CATCH_PLATFORM_WINDOWS
+ || c == '/'
+#endif
+ ;
+ }
+
+ // Abstracts iterators into args as a stream of tokens, with option arguments uniformly handled
+ class TokenStream {
+ using Iterator = std::vector<std::string>::const_iterator;
+ Iterator it;
+ Iterator itEnd;
+ std::vector<Token> m_tokenBuffer;
+
+ void loadBuffer() {
+ m_tokenBuffer.resize( 0 );
+
+ // Skip any empty strings
+ while( it != itEnd && it->empty() )
+ ++it;
+
+ if( it != itEnd ) {
+ auto const &next = *it;
+ if( isOptPrefix( next[0] ) ) {
+ auto delimiterPos = next.find_first_of( " :=" );
+ if( delimiterPos != std::string::npos ) {
+ m_tokenBuffer.push_back( { TokenType::Option, next.substr( 0, delimiterPos ) } );
+ m_tokenBuffer.push_back( { TokenType::Argument, next.substr( delimiterPos + 1 ) } );
+ } else {
+ if( next[1] != '-' && next.size() > 2 ) {
+ std::string opt = "- ";
+ for( size_t i = 1; i < next.size(); ++i ) {
+ opt[1] = next[i];
+ m_tokenBuffer.push_back( { TokenType::Option, opt } );
+ }
+ } else {
+ m_tokenBuffer.push_back( { TokenType::Option, next } );
+ }
+ }
+ } else {
+ m_tokenBuffer.push_back( { TokenType::Argument, next } );
+ }
+ }
+ }
+
+ public:
+ explicit TokenStream( Args const &args ) : TokenStream( args.m_args.begin(), args.m_args.end() ) {}
+
+ TokenStream( Iterator it, Iterator itEnd ) : it( it ), itEnd( itEnd ) {
+ loadBuffer();
+ }
+
+ explicit operator bool() const {
+ return !m_tokenBuffer.empty() || it != itEnd;
+ }
+
+ auto count() const -> size_t { return m_tokenBuffer.size() + (itEnd - it); }
+
+ auto operator*() const -> Token {
+ assert( !m_tokenBuffer.empty() );
+ return m_tokenBuffer.front();
+ }
+
+ auto operator->() const -> Token const * {
+ assert( !m_tokenBuffer.empty() );
+ return &m_tokenBuffer.front();
+ }
+
+ auto operator++() -> TokenStream & {
+ if( m_tokenBuffer.size() >= 2 ) {
+ m_tokenBuffer.erase( m_tokenBuffer.begin() );
+ } else {
+ if( it != itEnd )
+ ++it;
+ loadBuffer();
+ }
+ return *this;
+ }
+ };
+
+ class ResultBase {
+ public:
+ enum Type {
+ Ok, LogicError, RuntimeError
+ };
+
+ protected:
+ ResultBase( Type type ) : m_type( type ) {}
+ virtual ~ResultBase() = default;
+
+ virtual void enforceOk() const = 0;
+
+ Type m_type;
+ };
+
+ template<typename T>
+ class ResultValueBase : public ResultBase {
+ public:
+ auto value() const -> T const & {
+ enforceOk();
+ return m_value;
+ }
+
+ protected:
+ ResultValueBase( Type type ) : ResultBase( type ) {}
+
+ ResultValueBase( ResultValueBase const &other ) : ResultBase( other ) {
+ if( m_type == ResultBase::Ok )
+ new( &m_value ) T( other.m_value );
+ }
+
+ ResultValueBase( Type, T const &value ) : ResultBase( Ok ) {
+ new( &m_value ) T( value );
+ }
+
+ auto operator=( ResultValueBase const &other ) -> ResultValueBase & {
+ if( m_type == ResultBase::Ok )
+ m_value.~T();
+ ResultBase::operator=(other);
+ if( m_type == ResultBase::Ok )
+ new( &m_value ) T( other.m_value );
+ return *this;
+ }
+
+ ~ResultValueBase() override {
+ if( m_type == Ok )
+ m_value.~T();
+ }
+
+ union {
+ T m_value;
+ };
+ };
+
+ template<>
+ class ResultValueBase<void> : public ResultBase {
+ protected:
+ using ResultBase::ResultBase;
+ };
+
+ template<typename T = void>
+ class BasicResult : public ResultValueBase<T> {
+ public:
+ template<typename U>
+ explicit BasicResult( BasicResult<U> const &other )
+ : ResultValueBase<T>( other.type() ),
+ m_errorMessage( other.errorMessage() )
+ {
+ assert( type() != ResultBase::Ok );
+ }
+
+ template<typename U>
+ static auto ok( U const &value ) -> BasicResult { return { ResultBase::Ok, value }; }
+ static auto ok() -> BasicResult { return { ResultBase::Ok }; }
+ static auto logicError( std::string const &message ) -> BasicResult { return { ResultBase::LogicError, message }; }
+ static auto runtimeError( std::string const &message ) -> BasicResult { return { ResultBase::RuntimeError, message }; }
+
+ explicit operator bool() const { return m_type == ResultBase::Ok; }
+ auto type() const -> ResultBase::Type { return m_type; }
+ auto errorMessage() const -> std::string { return m_errorMessage; }
+
+ protected:
+ void enforceOk() const override {
+
+ // Errors shouldn't reach this point, but if they do
+ // the actual error message will be in m_errorMessage
+ assert( m_type != ResultBase::LogicError );
+ assert( m_type != ResultBase::RuntimeError );
+ if( m_type != ResultBase::Ok )
+ std::abort();
+ }
+
+ std::string m_errorMessage; // Only populated if resultType is an error
+
+ BasicResult( ResultBase::Type type, std::string const &message )
+ : ResultValueBase<T>(type),
+ m_errorMessage(message)
+ {
+ assert( m_type != ResultBase::Ok );
+ }
+
+ using ResultValueBase<T>::ResultValueBase;
+ using ResultBase::m_type;
+ };
+
+ enum class ParseResultType {
+ Matched, NoMatch, ShortCircuitAll, ShortCircuitSame
+ };
+
+ class ParseState {
+ public:
+
+ ParseState( ParseResultType type, TokenStream const &remainingTokens )
+ : m_type(type),
+ m_remainingTokens( remainingTokens )
+ {}
+
+ auto type() const -> ParseResultType { return m_type; }
+ auto remainingTokens() const -> TokenStream { return m_remainingTokens; }
+
+ private:
+ ParseResultType m_type;
+ TokenStream m_remainingTokens;
+ };
+
+ using Result = BasicResult<void>;
+ using ParserResult = BasicResult<ParseResultType>;
+ using InternalParseResult = BasicResult<ParseState>;
+
+ struct HelpColumns {
+ std::string left;
+ std::string right;
+ };
+
+ template<typename T>
+ inline auto convertInto( std::string const &source, T& target ) -> ParserResult {
+ std::stringstream ss;
+ ss << source;
+ ss >> target;
+ if( ss.fail() )
+ return ParserResult::runtimeError( "Unable to convert '" + source + "' to destination type" );
+ else
+ return ParserResult::ok( ParseResultType::Matched );
+ }
+ inline auto convertInto( std::string const &source, std::string& target ) -> ParserResult {
+ target = source;
+ return ParserResult::ok( ParseResultType::Matched );
+ }
+ inline auto convertInto( std::string const &source, bool &target ) -> ParserResult {
+ std::string srcLC = source;
+ std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( char c ) { return static_cast<char>( ::tolower(c) ); } );
+ if (srcLC == "y" || srcLC == "1" || srcLC == "true" || srcLC == "yes" || srcLC == "on")
+ target = true;
+ else if (srcLC == "n" || srcLC == "0" || srcLC == "false" || srcLC == "no" || srcLC == "off")
+ target = false;
+ else
+ return ParserResult::runtimeError( "Expected a boolean value but did not recognise: '" + source + "'" );
+ return ParserResult::ok( ParseResultType::Matched );
+ }
+#ifdef CLARA_CONFIG_OPTIONAL_TYPE
+ template<typename T>
+ inline auto convertInto( std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T>& target ) -> ParserResult {
+ T temp;
+ auto result = convertInto( source, temp );
+ if( result )
+ target = std::move(temp);
+ return result;
+ }
+#endif // CLARA_CONFIG_OPTIONAL_TYPE
+
+ struct NonCopyable {
+ NonCopyable() = default;
+ NonCopyable( NonCopyable const & ) = delete;
+ NonCopyable( NonCopyable && ) = delete;
+ NonCopyable &operator=( NonCopyable const & ) = delete;
+ NonCopyable &operator=( NonCopyable && ) = delete;
+ };
+
+ struct BoundRef : NonCopyable {
+ virtual ~BoundRef() = default;
+ virtual auto isContainer() const -> bool { return false; }
+ virtual auto isFlag() const -> bool { return false; }
+ };
+ struct BoundValueRefBase : BoundRef {
+ virtual auto setValue( std::string const &arg ) -> ParserResult = 0;
+ };
+ struct BoundFlagRefBase : BoundRef {
+ virtual auto setFlag( bool flag ) -> ParserResult = 0;
+ virtual auto isFlag() const -> bool { return true; }
+ };
+
+ template<typename T>
+ struct BoundValueRef : BoundValueRefBase {
+ T &m_ref;
+
+ explicit BoundValueRef( T &ref ) : m_ref( ref ) {}
+
+ auto setValue( std::string const &arg ) -> ParserResult override {
+ return convertInto( arg, m_ref );
+ }
+ };
+
+ template<typename T>
+ struct BoundValueRef<std::vector<T>> : BoundValueRefBase {
+ std::vector<T> &m_ref;
+
+ explicit BoundValueRef( std::vector<T> &ref ) : m_ref( ref ) {}
+
+ auto isContainer() const -> bool override { return true; }
+
+ auto setValue( std::string const &arg ) -> ParserResult override {
+ T temp;
+ auto result = convertInto( arg, temp );
+ if( result )
+ m_ref.push_back( temp );
+ return result;
+ }
+ };
+
+ struct BoundFlagRef : BoundFlagRefBase {
+ bool &m_ref;
+
+ explicit BoundFlagRef( bool &ref ) : m_ref( ref ) {}
+
+ auto setFlag( bool flag ) -> ParserResult override {
+ m_ref = flag;
+ return ParserResult::ok( ParseResultType::Matched );
+ }
+ };
+
+ template<typename ReturnType>
+ struct LambdaInvoker {
+ static_assert( std::is_same<ReturnType, ParserResult>::value, "Lambda must return void or clara::ParserResult" );
+
+ template<typename L, typename ArgType>
+ static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
+ return lambda( arg );
+ }
+ };
+
+ template<>
+ struct LambdaInvoker<void> {
+ template<typename L, typename ArgType>
+ static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
+ lambda( arg );
+ return ParserResult::ok( ParseResultType::Matched );
+ }
+ };
+
+ template<typename ArgType, typename L>
+ inline auto invokeLambda( L const &lambda, std::string const &arg ) -> ParserResult {
+ ArgType temp{};
+ auto result = convertInto( arg, temp );
+ return !result
+ ? result
+ : LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( lambda, temp );
+ }
+
+ template<typename L>
+ struct BoundLambda : BoundValueRefBase {
+ L m_lambda;
+
+ static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
+ explicit BoundLambda( L const &lambda ) : m_lambda( lambda ) {}
+
+ auto setValue( std::string const &arg ) -> ParserResult override {
+ return invokeLambda<typename UnaryLambdaTraits<L>::ArgType>( m_lambda, arg );
+ }
+ };
+
+ template<typename L>
+ struct BoundFlagLambda : BoundFlagRefBase {
+ L m_lambda;
+
+ static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
+ static_assert( std::is_same<typename UnaryLambdaTraits<L>::ArgType, bool>::value, "flags must be boolean" );
+
+ explicit BoundFlagLambda( L const &lambda ) : m_lambda( lambda ) {}
+
+ auto setFlag( bool flag ) -> ParserResult override {
+ return LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( m_lambda, flag );
+ }
+ };
+
+ enum class Optionality { Optional, Required };
+
+ struct Parser;
+
+ class ParserBase {
+ public:
+ virtual ~ParserBase() = default;
+ virtual auto validate() const -> Result { return Result::ok(); }
+ virtual auto parse( std::string const& exeName, TokenStream const &tokens) const -> InternalParseResult = 0;
+ virtual auto cardinality() const -> size_t { return 1; }
+
+ auto parse( Args const &args ) const -> InternalParseResult {
+ return parse( args.exeName(), TokenStream( args ) );
+ }
+ };
+
+ template<typename DerivedT>
+ class ComposableParserImpl : public ParserBase {
+ public:
+ template<typename T>
+ auto operator|( T const &other ) const -> Parser;
+
+ template<typename T>
+ auto operator+( T const &other ) const -> Parser;
+ };
+
+ // Common code and state for Args and Opts
+ template<typename DerivedT>
+ class ParserRefImpl : public ComposableParserImpl<DerivedT> {
+ protected:
+ Optionality m_optionality = Optionality::Optional;
+ std::shared_ptr<BoundRef> m_ref;
+ std::string m_hint;
+ std::string m_description;
+
+ explicit ParserRefImpl( std::shared_ptr<BoundRef> const &ref ) : m_ref( ref ) {}
+
+ public:
+ template<typename T>
+ ParserRefImpl( T &ref, std::string const &hint )
+ : m_ref( std::make_shared<BoundValueRef<T>>( ref ) ),
+ m_hint( hint )
+ {}
+
+ template<typename LambdaT>
+ ParserRefImpl( LambdaT const &ref, std::string const &hint )
+ : m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ),
+ m_hint(hint)
+ {}
+
+ auto operator()( std::string const &description ) -> DerivedT & {
+ m_description = description;
+ return static_cast<DerivedT &>( *this );
+ }
+
+ auto optional() -> DerivedT & {
+ m_optionality = Optionality::Optional;
+ return static_cast<DerivedT &>( *this );
+ };
+
+ auto required() -> DerivedT & {
+ m_optionality = Optionality::Required;
+ return static_cast<DerivedT &>( *this );
+ };
+
+ auto isOptional() const -> bool {
+ return m_optionality == Optionality::Optional;
+ }
+
+ auto cardinality() const -> size_t override {
+ if( m_ref->isContainer() )
+ return 0;
+ else
+ return 1;
+ }
+
+ auto hint() const -> std::string { return m_hint; }
+ };
+
+ class ExeName : public ComposableParserImpl<ExeName> {
+ std::shared_ptr<std::string> m_name;
+ std::shared_ptr<BoundValueRefBase> m_ref;
+
+ template<typename LambdaT>
+ static auto makeRef(LambdaT const &lambda) -> std::shared_ptr<BoundValueRefBase> {
+ return std::make_shared<BoundLambda<LambdaT>>( lambda) ;
+ }
+
+ public:
+ ExeName() : m_name( std::make_shared<std::string>( "<executable>" ) ) {}
+
+ explicit ExeName( std::string &ref ) : ExeName() {
+ m_ref = std::make_shared<BoundValueRef<std::string>>( ref );
+ }
+
+ template<typename LambdaT>
+ explicit ExeName( LambdaT const& lambda ) : ExeName() {
+ m_ref = std::make_shared<BoundLambda<LambdaT>>( lambda );
+ }
+
+ // The exe name is not parsed out of the normal tokens, but is handled specially
+ auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
+ return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
+ }
+
+ auto name() const -> std::string { return *m_name; }
+ auto set( std::string const& newName ) -> ParserResult {
+
+ auto lastSlash = newName.find_last_of( "\\/" );
+ auto filename = ( lastSlash == std::string::npos )
+ ? newName
+ : newName.substr( lastSlash+1 );
+
+ *m_name = filename;
+ if( m_ref )
+ return m_ref->setValue( filename );
+ else
+ return ParserResult::ok( ParseResultType::Matched );
+ }
+ };
+
+ class Arg : public ParserRefImpl<Arg> {
+ public:
+ using ParserRefImpl::ParserRefImpl;
+
+ auto parse( std::string const &, TokenStream const &tokens ) const -> InternalParseResult override {
+ auto validationResult = validate();
+ if( !validationResult )
+ return InternalParseResult( validationResult );
+
+ auto remainingTokens = tokens;
+ auto const &token = *remainingTokens;
+ if( token.type != TokenType::Argument )
+ return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
+
+ assert( !m_ref->isFlag() );
+ auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
+
+ auto result = valueRef->setValue( remainingTokens->token );
+ if( !result )
+ return InternalParseResult( result );
+ else
+ return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
+ }
+ };
+
+ inline auto normaliseOpt( std::string const &optName ) -> std::string {
+#ifdef CATCH_PLATFORM_WINDOWS
+ if( optName[0] == '/' )
+ return "-" + optName.substr( 1 );
+ else
+#endif
+ return optName;
+ }
+
+ class Opt : public ParserRefImpl<Opt> {
+ protected:
+ std::vector<std::string> m_optNames;
+
+ public:
+ template<typename LambdaT>
+ explicit Opt( LambdaT const &ref ) : ParserRefImpl( std::make_shared<BoundFlagLambda<LambdaT>>( ref ) ) {}
+
+ explicit Opt( bool &ref ) : ParserRefImpl( std::make_shared<BoundFlagRef>( ref ) ) {}
+
+ template<typename LambdaT>
+ Opt( LambdaT const &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
+
+ template<typename T>
+ Opt( T &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
+
+ auto operator[]( std::string const &optName ) -> Opt & {
+ m_optNames.push_back( optName );
+ return *this;
+ }
+
+ auto getHelpColumns() const -> std::vector<HelpColumns> {
+ std::ostringstream oss;
+ bool first = true;
+ for( auto const &opt : m_optNames ) {
+ if (first)
+ first = false;
+ else
+ oss << ", ";
+ oss << opt;
+ }
+ if( !m_hint.empty() )
+ oss << " <" << m_hint << ">";
+ return { { oss.str(), m_description } };
+ }
+
+ auto isMatch( std::string const &optToken ) const -> bool {
+ auto normalisedToken = normaliseOpt( optToken );
+ for( auto const &name : m_optNames ) {
+ if( normaliseOpt( name ) == normalisedToken )
+ return true;
+ }
+ return false;
+ }
+
+ using ParserBase::parse;
+
+ auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
+ auto validationResult = validate();
+ if( !validationResult )
+ return InternalParseResult( validationResult );
+
+ auto remainingTokens = tokens;
+ if( remainingTokens && remainingTokens->type == TokenType::Option ) {
+ auto const &token = *remainingTokens;
+ if( isMatch(token.token ) ) {
+ if( m_ref->isFlag() ) {
+ auto flagRef = static_cast<detail::BoundFlagRefBase*>( m_ref.get() );
+ auto result = flagRef->setFlag( true );
+ if( !result )
+ return InternalParseResult( result );
+ if( result.value() == ParseResultType::ShortCircuitAll )
+ return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
+ } else {
+ auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
+ ++remainingTokens;
+ if( !remainingTokens )
+ return InternalParseResult::runtimeError( "Expected argument following " + token.token );
+ auto const &argToken = *remainingTokens;
+ if( argToken.type != TokenType::Argument )
+ return InternalParseResult::runtimeError( "Expected argument following " + token.token );
+ auto result = valueRef->setValue( argToken.token );
+ if( !result )
+ return InternalParseResult( result );
+ if( result.value() == ParseResultType::ShortCircuitAll )
+ return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
+ }
+ return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
+ }
+ }
+ return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
+ }
+
+ auto validate() const -> Result override {
+ if( m_optNames.empty() )
+ return Result::logicError( "No options supplied to Opt" );
+ for( auto const &name : m_optNames ) {
+ if( name.empty() )
+ return Result::logicError( "Option name cannot be empty" );
+#ifdef CATCH_PLATFORM_WINDOWS
+ if( name[0] != '-' && name[0] != '/' )
+ return Result::logicError( "Option name must begin with '-' or '/'" );
+#else
+ if( name[0] != '-' )
+ return Result::logicError( "Option name must begin with '-'" );
+#endif
+ }
+ return ParserRefImpl::validate();
+ }
+ };
+
+ struct Help : Opt {
+ Help( bool &showHelpFlag )
+ : Opt([&]( bool flag ) {
+ showHelpFlag = flag;
+ return ParserResult::ok( ParseResultType::ShortCircuitAll );
+ })
+ {
+ static_cast<Opt &>( *this )
+ ("display usage information")
+ ["-?"]["-h"]["--help"]
+ .optional();
+ }
+ };
+
+ struct Parser : ParserBase {
+
+ mutable ExeName m_exeName;
+ std::vector<Opt> m_options;
+ std::vector<Arg> m_args;
+
+ auto operator|=( ExeName const &exeName ) -> Parser & {
+ m_exeName = exeName;
+ return *this;
+ }
+
+ auto operator|=( Arg const &arg ) -> Parser & {
+ m_args.push_back(arg);
+ return *this;
+ }
+
+ auto operator|=( Opt const &opt ) -> Parser & {
+ m_options.push_back(opt);
+ return *this;
+ }
+
+ auto operator|=( Parser const &other ) -> Parser & {
+ m_options.insert(m_options.end(), other.m_options.begin(), other.m_options.end());
+ m_args.insert(m_args.end(), other.m_args.begin(), other.m_args.end());
+ return *this;
+ }
+
+ template<typename T>
+ auto operator|( T const &other ) const -> Parser {
+ return Parser( *this ) |= other;
+ }
+
+ // Forward deprecated interface with '+' instead of '|'
+ template<typename T>
+ auto operator+=( T const &other ) -> Parser & { return operator|=( other ); }
+ template<typename T>
+ auto operator+( T const &other ) const -> Parser { return operator|( other ); }
+
+ auto getHelpColumns() const -> std::vector<HelpColumns> {
+ std::vector<HelpColumns> cols;
+ for (auto const &o : m_options) {
+ auto childCols = o.getHelpColumns();
+ cols.insert( cols.end(), childCols.begin(), childCols.end() );
+ }
+ return cols;
+ }
+
+ void writeToStream( std::ostream &os ) const {
+ if (!m_exeName.name().empty()) {
+ os << "usage:\n" << " " << m_exeName.name() << " ";
+ bool required = true, first = true;
+ for( auto const &arg : m_args ) {
+ if (first)
+ first = false;
+ else
+ os << " ";
+ if( arg.isOptional() && required ) {
+ os << "[";
+ required = false;
+ }
+ os << "<" << arg.hint() << ">";
+ if( arg.cardinality() == 0 )
+ os << " ... ";
+ }
+ if( !required )
+ os << "]";
+ if( !m_options.empty() )
+ os << " options";
+ os << "\n\nwhere options are:" << std::endl;
+ }
+
+ auto rows = getHelpColumns();
+ size_t consoleWidth = CATCH_CLARA_CONFIG_CONSOLE_WIDTH;
+ size_t optWidth = 0;
+ for( auto const &cols : rows )
+ optWidth = (std::max)(optWidth, cols.left.size() + 2);
+
+ optWidth = (std::min)(optWidth, consoleWidth/2);
+
+ for( auto const &cols : rows ) {
+ auto row =
+ TextFlow::Column( cols.left ).width( optWidth ).indent( 2 ) +
+ TextFlow::Spacer(4) +
+ TextFlow::Column( cols.right ).width( consoleWidth - 7 - optWidth );
+ os << row << std::endl;
+ }
+ }
+
+ friend auto operator<<( std::ostream &os, Parser const &parser ) -> std::ostream& {
+ parser.writeToStream( os );
+ return os;
+ }
+
+ auto validate() const -> Result override {
+ for( auto const &opt : m_options ) {
+ auto result = opt.validate();
+ if( !result )
+ return result;
+ }
+ for( auto const &arg : m_args ) {
+ auto result = arg.validate();
+ if( !result )
+ return result;
+ }
+ return Result::ok();
+ }
+
+ using ParserBase::parse;
+
+ auto parse( std::string const& exeName, TokenStream const &tokens ) const -> InternalParseResult override {
+
+ struct ParserInfo {
+ ParserBase const* parser = nullptr;
+ size_t count = 0;
+ };
+ const size_t totalParsers = m_options.size() + m_args.size();
+ assert( totalParsers < 512 );
+ // ParserInfo parseInfos[totalParsers]; // <-- this is what we really want to do
+ ParserInfo parseInfos[512];
+
+ {
+ size_t i = 0;
+ for (auto const &opt : m_options) parseInfos[i++].parser = &opt;
+ for (auto const &arg : m_args) parseInfos[i++].parser = &arg;
+ }
+
+ m_exeName.set( exeName );
+
+ auto result = InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
+ while( result.value().remainingTokens() ) {
+ bool tokenParsed = false;
+
+ for( size_t i = 0; i < totalParsers; ++i ) {
+ auto& parseInfo = parseInfos[i];
+ if( parseInfo.parser->cardinality() == 0 || parseInfo.count < parseInfo.parser->cardinality() ) {
+ result = parseInfo.parser->parse(exeName, result.value().remainingTokens());
+ if (!result)
+ return result;
+ if (result.value().type() != ParseResultType::NoMatch) {
+ tokenParsed = true;
+ ++parseInfo.count;
+ break;
+ }
+ }
+ }
+
+ if( result.value().type() == ParseResultType::ShortCircuitAll )
+ return result;
+ if( !tokenParsed )
+ return InternalParseResult::runtimeError( "Unrecognised token: " + result.value().remainingTokens()->token );
+ }
+ // !TBD Check missing required options
+ return result;
+ }
+ };
+
+ template<typename DerivedT>
+ template<typename T>
+ auto ComposableParserImpl<DerivedT>::operator|( T const &other ) const -> Parser {
+ return Parser() | static_cast<DerivedT const &>( *this ) | other;
+ }
+} // namespace detail
+
+// A Combined parser
+using detail::Parser;
+
+// A parser for options
+using detail::Opt;
+
+// A parser for arguments
+using detail::Arg;
+
+// Wrapper for argc, argv from main()
+using detail::Args;
+
+// Specifies the name of the executable
+using detail::ExeName;
+
+// Convenience wrapper for option parser that specifies the help option
+using detail::Help;
+
+// enum of result types from a parse
+using detail::ParseResultType;
+
+// Result type for parser operation
+using detail::ParserResult;
+
+}} // namespace Catch::clara
+
+// end clara.hpp
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// Restore Clara's value for console width, if present
+#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+
+// end catch_clara.h
+namespace Catch {
+
+ clara::Parser makeCommandLineParser( ConfigData& config );
+
+} // end namespace Catch
+
+// end catch_commandline.h
+#include <fstream>
+#include <ctime>
+
+namespace Catch {
+
+ clara::Parser makeCommandLineParser( ConfigData& config ) {
+
+ using namespace clara;
+
+ auto const setWarning = [&]( std::string const& warning ) {
+ auto warningSet = [&]() {
+ if( warning == "NoAssertions" )
+ return WarnAbout::NoAssertions;
+
+ if ( warning == "NoTests" )
+ return WarnAbout::NoTests;
+
+ return WarnAbout::Nothing;
+ }();
+
+ if (warningSet == WarnAbout::Nothing)
+ return ParserResult::runtimeError( "Unrecognised warning: '" + warning + "'" );
+ config.warnings = static_cast<WarnAbout::What>( config.warnings | warningSet );
+ return ParserResult::ok( ParseResultType::Matched );
+ };
+ auto const loadTestNamesFromFile = [&]( std::string const& filename ) {
+ std::ifstream f( filename.c_str() );
+ if( !f.is_open() )
+ return ParserResult::runtimeError( "Unable to load input file: '" + filename + "'" );
+
+ std::string line;
+ while( std::getline( f, line ) ) {
+ line = trim(line);
+ if( !line.empty() && !startsWith( line, '#' ) ) {
+ if( !startsWith( line, '"' ) )
+ line = '"' + line + '"';
+ config.testsOrTags.push_back( line + ',' );
+ }
+ }
+ return ParserResult::ok( ParseResultType::Matched );
+ };
+ auto const setTestOrder = [&]( std::string const& order ) {
+ if( startsWith( "declared", order ) )
+ config.runOrder = RunTests::InDeclarationOrder;
+ else if( startsWith( "lexical", order ) )
+ config.runOrder = RunTests::InLexicographicalOrder;
+ else if( startsWith( "random", order ) )
+ config.runOrder = RunTests::InRandomOrder;
+ else
+ return clara::ParserResult::runtimeError( "Unrecognised ordering: '" + order + "'" );
+ return ParserResult::ok( ParseResultType::Matched );
+ };
+ auto const setRngSeed = [&]( std::string const& seed ) {
+ if( seed != "time" )
+ return clara::detail::convertInto( seed, config.rngSeed );
+ config.rngSeed = static_cast<unsigned int>( std::time(nullptr) );
+ return ParserResult::ok( ParseResultType::Matched );
+ };
+ auto const setColourUsage = [&]( std::string const& useColour ) {
+ auto mode = toLower( useColour );
+
+ if( mode == "yes" )
+ config.useColour = UseColour::Yes;
+ else if( mode == "no" )
+ config.useColour = UseColour::No;
+ else if( mode == "auto" )
+ config.useColour = UseColour::Auto;
+ else
+ return ParserResult::runtimeError( "colour mode must be one of: auto, yes or no. '" + useColour + "' not recognised" );
+ return ParserResult::ok( ParseResultType::Matched );
+ };
+ auto const setWaitForKeypress = [&]( std::string const& keypress ) {
+ auto keypressLc = toLower( keypress );
+ if( keypressLc == "start" )
+ config.waitForKeypress = WaitForKeypress::BeforeStart;
+ else if( keypressLc == "exit" )
+ config.waitForKeypress = WaitForKeypress::BeforeExit;
+ else if( keypressLc == "both" )
+ config.waitForKeypress = WaitForKeypress::BeforeStartAndExit;
+ else
+ return ParserResult::runtimeError( "keypress argument must be one of: start, exit or both. '" + keypress + "' not recognised" );
+ return ParserResult::ok( ParseResultType::Matched );
+ };
+ auto const setVerbosity = [&]( std::string const& verbosity ) {
+ auto lcVerbosity = toLower( verbosity );
+ if( lcVerbosity == "quiet" )
+ config.verbosity = Verbosity::Quiet;
+ else if( lcVerbosity == "normal" )
+ config.verbosity = Verbosity::Normal;
+ else if( lcVerbosity == "high" )
+ config.verbosity = Verbosity::High;
+ else
+ return ParserResult::runtimeError( "Unrecognised verbosity, '" + verbosity + "'" );
+ return ParserResult::ok( ParseResultType::Matched );
+ };
+ auto const setReporter = [&]( std::string const& reporter ) {
+ IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+
+ auto lcReporter = toLower( reporter );
+ auto result = factories.find( lcReporter );
+
+ if( factories.end() != result )
+ config.reporterName = lcReporter;
+ else
+ return ParserResult::runtimeError( "Unrecognized reporter, '" + reporter + "'. Check available with --list-reporters" );
+ return ParserResult::ok( ParseResultType::Matched );
+ };
+
+ auto cli
+ = ExeName( config.processName )
+ | Help( config.showHelp )
+ | Opt( config.listTests )
+ ["-l"]["--list-tests"]
+ ( "list all/matching test cases" )
+ | Opt( config.listTags )
+ ["-t"]["--list-tags"]
+ ( "list all/matching tags" )
+ | Opt( config.showSuccessfulTests )
+ ["-s"]["--success"]
+ ( "include successful tests in output" )
+ | Opt( config.shouldDebugBreak )
+ ["-b"]["--break"]
+ ( "break into debugger on failure" )
+ | Opt( config.noThrow )
+ ["-e"]["--nothrow"]
+ ( "skip exception tests" )
+ | Opt( config.showInvisibles )
+ ["-i"]["--invisibles"]
+ ( "show invisibles (tabs, newlines)" )
+ | Opt( config.outputFilename, "filename" )
+ ["-o"]["--out"]
+ ( "output filename" )
+ | Opt( setReporter, "name" )
+ ["-r"]["--reporter"]
+ ( "reporter to use (defaults to console)" )
+ | Opt( config.name, "name" )
+ ["-n"]["--name"]
+ ( "suite name" )
+ | Opt( [&]( bool ){ config.abortAfter = 1; } )
+ ["-a"]["--abort"]
+ ( "abort at first failure" )
+ | Opt( [&]( int x ){ config.abortAfter = x; }, "no. failures" )
+ ["-x"]["--abortx"]
+ ( "abort after x failures" )
+ | Opt( setWarning, "warning name" )
+ ["-w"]["--warn"]
+ ( "enable warnings" )
+ | Opt( [&]( bool flag ) { config.showDurations = flag ? ShowDurations::Always : ShowDurations::Never; }, "yes|no" )
+ ["-d"]["--durations"]
+ ( "show test durations" )
+ | Opt( loadTestNamesFromFile, "filename" )
+ ["-f"]["--input-file"]
+ ( "load test names to run from a file" )
+ | Opt( config.filenamesAsTags )
+ ["-#"]["--filenames-as-tags"]
+ ( "adds a tag for the filename" )
+ | Opt( config.sectionsToRun, "section name" )
+ ["-c"]["--section"]
+ ( "specify section to run" )
+ | Opt( setVerbosity, "quiet|normal|high" )
+ ["-v"]["--verbosity"]
+ ( "set output verbosity" )
+ | Opt( config.listTestNamesOnly )
+ ["--list-test-names-only"]
+ ( "list all/matching test cases names only" )
+ | Opt( config.listReporters )
+ ["--list-reporters"]
+ ( "list all reporters" )
+ | Opt( setTestOrder, "decl|lex|rand" )
+ ["--order"]
+ ( "test case order (defaults to decl)" )
+ | Opt( setRngSeed, "'time'|number" )
+ ["--rng-seed"]
+ ( "set a specific seed for random numbers" )
+ | Opt( setColourUsage, "yes|no" )
+ ["--use-colour"]
+ ( "should output be colourised" )
+ | Opt( config.libIdentify )
+ ["--libidentify"]
+ ( "report name and version according to libidentify standard" )
+ | Opt( setWaitForKeypress, "start|exit|both" )
+ ["--wait-for-keypress"]
+ ( "waits for a keypress before exiting" )
+ | Opt( config.benchmarkResolutionMultiple, "multiplier" )
+ ["--benchmark-resolution-multiple"]
+ ( "multiple of clock resolution to run benchmarks" )
+
+ | Arg( config.testsOrTags, "test name|pattern|tags" )
+ ( "which test or tests to use" );
+
+ return cli;
+ }
+
+} // end namespace Catch
+// end catch_commandline.cpp
+// start catch_common.cpp
+
+#include <cstring>
+#include <ostream>
+
+namespace Catch {
+
+ bool SourceLineInfo::empty() const noexcept {
+ return file[0] == '\0';
+ }
+ bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept {
+ return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0);
+ }
+ bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const noexcept {
+ // We can assume that the same file will usually have the same pointer.
+ // Thus, if the pointers are the same, there is no point in calling the strcmp
+ return line < other.line || ( line == other.line && file != other.file && (std::strcmp(file, other.file) < 0));
+ }
+
+ std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
+#ifndef __GNUG__
+ os << info.file << '(' << info.line << ')';
+#else
+ os << info.file << ':' << info.line;
+#endif
+ return os;
+ }
+
+ std::string StreamEndStop::operator+() const {
+ return std::string();
+ }
+
+ NonCopyable::NonCopyable() = default;
+ NonCopyable::~NonCopyable() = default;
+
+}
+// end catch_common.cpp
+// start catch_config.cpp
+
+namespace Catch {
+
+ Config::Config( ConfigData const& data )
+ : m_data( data ),
+ m_stream( openStream() )
+ {
+ TestSpecParser parser(ITagAliasRegistry::get());
+ if (data.testsOrTags.empty()) {
+ parser.parse("~[.]"); // All not hidden tests
+ }
+ else {
+ m_hasTestFilters = true;
+ for( auto const& testOrTags : data.testsOrTags )
+ parser.parse( testOrTags );
+ }
+ m_testSpec = parser.testSpec();
+ }
+
+ std::string const& Config::getFilename() const {
+ return m_data.outputFilename ;
+ }
+
+ bool Config::listTests() const { return m_data.listTests; }
+ bool Config::listTestNamesOnly() const { return m_data.listTestNamesOnly; }
+ bool Config::listTags() const { return m_data.listTags; }
+ bool Config::listReporters() const { return m_data.listReporters; }
+
+ std::string Config::getProcessName() const { return m_data.processName; }
+ std::string const& Config::getReporterName() const { return m_data.reporterName; }
+
+ std::vector<std::string> const& Config::getTestsOrTags() const { return m_data.testsOrTags; }
+ std::vector<std::string> const& Config::getSectionsToRun() const { return m_data.sectionsToRun; }
+
+ TestSpec const& Config::testSpec() const { return m_testSpec; }
+ bool Config::hasTestFilters() const { return m_hasTestFilters; }
+
+ bool Config::showHelp() const { return m_data.showHelp; }
+
+ // IConfig interface
+ bool Config::allowThrows() const { return !m_data.noThrow; }
+ std::ostream& Config::stream() const { return m_stream->stream(); }
+ std::string Config::name() const { return m_data.name.empty() ? m_data.processName : m_data.name; }
+ bool Config::includeSuccessfulResults() const { return m_data.showSuccessfulTests; }
+ bool Config::warnAboutMissingAssertions() const { return !!(m_data.warnings & WarnAbout::NoAssertions); }
+ bool Config::warnAboutNoTests() const { return !!(m_data.warnings & WarnAbout::NoTests); }
+ ShowDurations::OrNot Config::showDurations() const { return m_data.showDurations; }
+ RunTests::InWhatOrder Config::runOrder() const { return m_data.runOrder; }
+ unsigned int Config::rngSeed() const { return m_data.rngSeed; }
+ int Config::benchmarkResolutionMultiple() const { return m_data.benchmarkResolutionMultiple; }
+ UseColour::YesOrNo Config::useColour() const { return m_data.useColour; }
+ bool Config::shouldDebugBreak() const { return m_data.shouldDebugBreak; }
+ int Config::abortAfter() const { return m_data.abortAfter; }
+ bool Config::showInvisibles() const { return m_data.showInvisibles; }
+ Verbosity Config::verbosity() const { return m_data.verbosity; }
+
+ IStream const* Config::openStream() {
+ return Catch::makeStream(m_data.outputFilename);
+ }
+
+} // end namespace Catch
+// end catch_config.cpp
+// start catch_console_colour.cpp
+
+#if defined(__clang__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+// start catch_errno_guard.h
+
+namespace Catch {
+
+ class ErrnoGuard {
+ public:
+ ErrnoGuard();
+ ~ErrnoGuard();
+ private:
+ int m_oldErrno;
+ };
+
+}
+
+// end catch_errno_guard.h
+#include <sstream>
+
+namespace Catch {
+ namespace {
+
+ struct IColourImpl {
+ virtual ~IColourImpl() = default;
+ virtual void use( Colour::Code _colourCode ) = 0;
+ };
+
+ struct NoColourImpl : IColourImpl {
+ void use( Colour::Code ) {}
+
+ static IColourImpl* instance() {
+ static NoColourImpl s_instance;
+ return &s_instance;
+ }
+ };
+
+ } // anon namespace
+} // namespace Catch
+
+#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI )
+# ifdef CATCH_PLATFORM_WINDOWS
+# define CATCH_CONFIG_COLOUR_WINDOWS
+# else
+# define CATCH_CONFIG_COLOUR_ANSI
+# endif
+#endif
+
+#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
+
+namespace Catch {
+namespace {
+
+ class Win32ColourImpl : public IColourImpl {
+ public:
+ Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) )
+ {
+ CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+ GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
+ originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
+ originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
+ }
+
+ virtual void use( Colour::Code _colourCode ) override {
+ switch( _colourCode ) {
+ case Colour::None: return setTextAttribute( originalForegroundAttributes );
+ case Colour::White: return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+ case Colour::Red: return setTextAttribute( FOREGROUND_RED );
+ case Colour::Green: return setTextAttribute( FOREGROUND_GREEN );
+ case Colour::Blue: return setTextAttribute( FOREGROUND_BLUE );
+ case Colour::Cyan: return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN );
+ case Colour::Yellow: return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN );
+ case Colour::Grey: return setTextAttribute( 0 );
+
+ case Colour::LightGrey: return setTextAttribute( FOREGROUND_INTENSITY );
+ case Colour::BrightRed: return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
+ case Colour::BrightGreen: return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
+ case Colour::BrightWhite: return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+ case Colour::BrightYellow: return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN );
+
+ case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
+
+ default:
+ CATCH_ERROR( "Unknown colour requested" );
+ }
+ }
+
+ private:
+ void setTextAttribute( WORD _textAttribute ) {
+ SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
+ }
+ HANDLE stdoutHandle;
+ WORD originalForegroundAttributes;
+ WORD originalBackgroundAttributes;
+ };
+
+ IColourImpl* platformColourInstance() {
+ static Win32ColourImpl s_instance;
+
+ IConfigPtr config = getCurrentContext().getConfig();
+ UseColour::YesOrNo colourMode = config
+ ? config->useColour()
+ : UseColour::Auto;
+ if( colourMode == UseColour::Auto )
+ colourMode = UseColour::Yes;
+ return colourMode == UseColour::Yes
+ ? &s_instance
+ : NoColourImpl::instance();
+ }
+
+} // end anon namespace
+} // end namespace Catch
+
+#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////
+
+#include <unistd.h>
+
+namespace Catch {
+namespace {
+
+ // use POSIX/ ANSI console terminal codes
+ // Thanks to Adam Strzelecki for original contribution
+ // (http://github.com/nanoant)
+ // https://github.com/philsquared/Catch/pull/131
+ class PosixColourImpl : public IColourImpl {
+ public:
+ virtual void use( Colour::Code _colourCode ) override {
+ switch( _colourCode ) {
+ case Colour::None:
+ case Colour::White: return setColour( "[0m" );
+ case Colour::Red: return setColour( "[0;31m" );
+ case Colour::Green: return setColour( "[0;32m" );
+ case Colour::Blue: return setColour( "[0;34m" );
+ case Colour::Cyan: return setColour( "[0;36m" );
+ case Colour::Yellow: return setColour( "[0;33m" );
+ case Colour::Grey: return setColour( "[1;30m" );
+
+ case Colour::LightGrey: return setColour( "[0;37m" );
+ case Colour::BrightRed: return setColour( "[1;31m" );
+ case Colour::BrightGreen: return setColour( "[1;32m" );
+ case Colour::BrightWhite: return setColour( "[1;37m" );
+ case Colour::BrightYellow: return setColour( "[1;33m" );
+
+ case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
+ default: CATCH_INTERNAL_ERROR( "Unknown colour requested" );
+ }
+ }
+ static IColourImpl* instance() {
+ static PosixColourImpl s_instance;
+ return &s_instance;
+ }
+
+ private:
+ void setColour( const char* _escapeCode ) {
+ getCurrentContext().getConfig()->stream()
+ << '\033' << _escapeCode;
+ }
+ };
+
+ bool useColourOnPlatform() {
+ return
+#ifdef CATCH_PLATFORM_MAC
+ !isDebuggerActive() &&
+#endif
+#if !(defined(__DJGPP__) && defined(__STRICT_ANSI__))
+ isatty(STDOUT_FILENO)
+#else
+ false
+#endif
+ ;
+ }
+ IColourImpl* platformColourInstance() {
+ ErrnoGuard guard;
+ IConfigPtr config = getCurrentContext().getConfig();
+ UseColour::YesOrNo colourMode = config
+ ? config->useColour()
+ : UseColour::Auto;
+ if( colourMode == UseColour::Auto )
+ colourMode = useColourOnPlatform()
+ ? UseColour::Yes
+ : UseColour::No;
+ return colourMode == UseColour::Yes
+ ? PosixColourImpl::instance()
+ : NoColourImpl::instance();
+ }
+
+} // end anon namespace
+} // end namespace Catch
+
+#else // not Windows or ANSI ///////////////////////////////////////////////
+
+namespace Catch {
+
+ static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); }
+
+} // end namespace Catch
+
+#endif // Windows/ ANSI/ None
+
+namespace Catch {
+
+ Colour::Colour( Code _colourCode ) { use( _colourCode ); }
+ Colour::Colour( Colour&& rhs ) noexcept {
+ m_moved = rhs.m_moved;
+ rhs.m_moved = true;
+ }
+ Colour& Colour::operator=( Colour&& rhs ) noexcept {
+ m_moved = rhs.m_moved;
+ rhs.m_moved = true;
+ return *this;
+ }
+
+ Colour::~Colour(){ if( !m_moved ) use( None ); }
+
+ void Colour::use( Code _colourCode ) {
+ static IColourImpl* impl = platformColourInstance();
+ impl->use( _colourCode );
+ }
+
+ std::ostream& operator << ( std::ostream& os, Colour const& ) {
+ return os;
+ }
+
+} // end namespace Catch
+
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#endif
+
+// end catch_console_colour.cpp
+// start catch_context.cpp
+
+namespace Catch {
+
+ class Context : public IMutableContext, NonCopyable {
+
+ public: // IContext
+ virtual IResultCapture* getResultCapture() override {
+ return m_resultCapture;
+ }
+ virtual IRunner* getRunner() override {
+ return m_runner;
+ }
+
+ virtual IConfigPtr const& getConfig() const override {
+ return m_config;
+ }
+
+ virtual ~Context() override;
+
+ public: // IMutableContext
+ virtual void setResultCapture( IResultCapture* resultCapture ) override {
+ m_resultCapture = resultCapture;
+ }
+ virtual void setRunner( IRunner* runner ) override {
+ m_runner = runner;
+ }
+ virtual void setConfig( IConfigPtr const& config ) override {
+ m_config = config;
+ }
+
+ friend IMutableContext& getCurrentMutableContext();
+
+ private:
+ IConfigPtr m_config;
+ IRunner* m_runner = nullptr;
+ IResultCapture* m_resultCapture = nullptr;
+ };
+
+ IMutableContext *IMutableContext::currentContext = nullptr;
+
+ void IMutableContext::createContext()
+ {
+ currentContext = new Context();
+ }
+
+ void cleanUpContext() {
+ delete IMutableContext::currentContext;
+ IMutableContext::currentContext = nullptr;
+ }
+ IContext::~IContext() = default;
+ IMutableContext::~IMutableContext() = default;
+ Context::~Context() = default;
+}
+// end catch_context.cpp
+// start catch_debug_console.cpp
+
+// start catch_debug_console.h
+
+#include <string>
+
+namespace Catch {
+ void writeToDebugConsole( std::string const& text );
+}
+
+// end catch_debug_console.h
+#ifdef CATCH_PLATFORM_WINDOWS
+
+ namespace Catch {
+ void writeToDebugConsole( std::string const& text ) {
+ ::OutputDebugStringA( text.c_str() );
+ }
+ }
+
+#else
+
+ namespace Catch {
+ void writeToDebugConsole( std::string const& text ) {
+ // !TBD: Need a version for Mac/ XCode and other IDEs
+ Catch::cout() << text;
+ }
+ }
+
+#endif // Platform
+// end catch_debug_console.cpp
+// start catch_debugger.cpp
+
+#ifdef CATCH_PLATFORM_MAC
+
+# include <assert.h>
+# include <stdbool.h>
+# include <sys/types.h>
+# include <unistd.h>
+# include <sys/sysctl.h>
+# include <cstddef>
+# include <ostream>
+
+namespace Catch {
+
+ // The following function is taken directly from the following technical note:
+ // http://developer.apple.com/library/mac/#qa/qa2004/qa1361.html
+
+ // Returns true if the current process is being debugged (either
+ // running under the debugger or has a debugger attached post facto).
+ bool isDebuggerActive(){
+
+ int mib[4];
+ struct kinfo_proc info;
+ std::size_t size;
+
+ // Initialize the flags so that, if sysctl fails for some bizarre
+ // reason, we get a predictable result.
+
+ info.kp_proc.p_flag = 0;
+
+ // Initialize mib, which tells sysctl the info we want, in this case
+ // we're looking for information about a specific process ID.
+
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_PROC;
+ mib[2] = KERN_PROC_PID;
+ mib[3] = getpid();
+
+ // Call sysctl.
+
+ size = sizeof(info);
+ if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, nullptr, 0) != 0 ) {
+ Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl;
+ return false;
+ }
+
+ // We're being debugged if the P_TRACED flag is set.
+
+ return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
+ }
+ } // namespace Catch
+
+#elif defined(CATCH_PLATFORM_LINUX)
+ #include <fstream>
+ #include <string>
+
+ namespace Catch{
+ // The standard POSIX way of detecting a debugger is to attempt to
+ // ptrace() the process, but this needs to be done from a child and not
+ // this process itself to still allow attaching to this process later
+ // if wanted, so is rather heavy. Under Linux we have the PID of the
+ // "debugger" (which doesn't need to be gdb, of course, it could also
+ // be strace, for example) in /proc/$PID/status, so just get it from
+ // there instead.
+ bool isDebuggerActive(){
+ // Libstdc++ has a bug, where std::ifstream sets errno to 0
+ // This way our users can properly assert over errno values
+ ErrnoGuard guard;
+ std::ifstream in("/proc/self/status");
+ for( std::string line; std::getline(in, line); ) {
+ static const int PREFIX_LEN = 11;
+ if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) {
+ // We're traced if the PID is not 0 and no other PID starts
+ // with 0 digit, so it's enough to check for just a single
+ // character.
+ return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0';
+ }
+ }
+
+ return false;
+ }
+ } // namespace Catch
+#elif defined(_MSC_VER)
+ extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+ namespace Catch {
+ bool isDebuggerActive() {
+ return IsDebuggerPresent() != 0;
+ }
+ }
+#elif defined(__MINGW32__)
+ extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+ namespace Catch {
+ bool isDebuggerActive() {
+ return IsDebuggerPresent() != 0;
+ }
+ }
+#else
+ namespace Catch {
+ bool isDebuggerActive() { return false; }
+ }
+#endif // Platform
+// end catch_debugger.cpp
+// start catch_decomposer.cpp
+
+namespace Catch {
+
+ ITransientExpression::~ITransientExpression() = default;
+
+ void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs ) {
+ if( lhs.size() + rhs.size() < 40 &&
+ lhs.find('\n') == std::string::npos &&
+ rhs.find('\n') == std::string::npos )
+ os << lhs << " " << op << " " << rhs;
+ else
+ os << lhs << "\n" << op << "\n" << rhs;
+ }
+}
+// end catch_decomposer.cpp
+// start catch_enforce.cpp
+
+namespace Catch {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER)
+ [[noreturn]]
+ void throw_exception(std::exception const& e) {
+ Catch::cerr() << "Catch will terminate because it needed to throw an exception.\n"
+ << "The message was: " << e.what() << '\n';
+ std::terminate();
+ }
+#endif
+} // namespace Catch;
+// end catch_enforce.cpp
+// start catch_errno_guard.cpp
+
+#include <cerrno>
+
+namespace Catch {
+ ErrnoGuard::ErrnoGuard():m_oldErrno(errno){}
+ ErrnoGuard::~ErrnoGuard() { errno = m_oldErrno; }
+}
+// end catch_errno_guard.cpp
+// start catch_exception_translator_registry.cpp
+
+// start catch_exception_translator_registry.h
+
+#include <vector>
+#include <string>
+#include <memory>
+
+namespace Catch {
+
+ class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
+ public:
+ ~ExceptionTranslatorRegistry();
+ virtual void registerTranslator( const IExceptionTranslator* translator );
+ virtual std::string translateActiveException() const override;
+ std::string tryTranslators() const;
+
+ private:
+ std::vector<std::unique_ptr<IExceptionTranslator const>> m_translators;
+ };
+}
+
+// end catch_exception_translator_registry.h
+#ifdef __OBJC__
+#import "Foundation/Foundation.h"
+#endif
+
+namespace Catch {
+
+ ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() {
+ }
+
+ void ExceptionTranslatorRegistry::registerTranslator( const IExceptionTranslator* translator ) {
+ m_translators.push_back( std::unique_ptr<const IExceptionTranslator>( translator ) );
+ }
+
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+ std::string ExceptionTranslatorRegistry::translateActiveException() const {
+ try {
+#ifdef __OBJC__
+ // In Objective-C try objective-c exceptions first
+ @try {
+ return tryTranslators();
+ }
+ @catch (NSException *exception) {
+ return Catch::Detail::stringify( [exception description] );
+ }
+#else
+ // Compiling a mixed mode project with MSVC means that CLR
+ // exceptions will be caught in (...) as well. However, these
+ // do not fill-in std::current_exception and thus lead to crash
+ // when attempting rethrow.
+ // /EHa switch also causes structured exceptions to be caught
+ // here, but they fill-in current_exception properly, so
+ // at worst the output should be a little weird, instead of
+ // causing a crash.
+ if (std::current_exception() == nullptr) {
+ return "Non C++ exception. Possibly a CLR exception.";
+ }
+ return tryTranslators();
+#endif
+ }
+ catch( TestFailureException& ) {
+ std::rethrow_exception(std::current_exception());
+ }
+ catch( std::exception& ex ) {
+ return ex.what();
+ }
+ catch( std::string& msg ) {
+ return msg;
+ }
+ catch( const char* msg ) {
+ return msg;
+ }
+ catch(...) {
+ return "Unknown exception";
+ }
+ }
+
+ std::string ExceptionTranslatorRegistry::tryTranslators() const {
+ if (m_translators.empty()) {
+ std::rethrow_exception(std::current_exception());
+ } else {
+ return m_translators[0]->translate(m_translators.begin() + 1, m_translators.end());
+ }
+ }
+
+#else // ^^ Exceptions are enabled // Exceptions are disabled vv
+ std::string ExceptionTranslatorRegistry::translateActiveException() const {
+ CATCH_INTERNAL_ERROR("Attempted to translate active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+ }
+
+ std::string ExceptionTranslatorRegistry::tryTranslators() const {
+ CATCH_INTERNAL_ERROR("Attempted to use exception translators under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+ }
+#endif
+
+}
+// end catch_exception_translator_registry.cpp
+// start catch_fatal_condition.cpp
+
+#if defined(__GNUC__)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH ) || defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+namespace {
+ // Report the error condition
+ void reportFatal( char const * const message ) {
+ Catch::getCurrentContext().getResultCapture()->handleFatalErrorCondition( message );
+ }
+}
+
+#endif // signals/SEH handling
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH )
+
+namespace Catch {
+ struct SignalDefs { DWORD id; const char* name; };
+
+ // There is no 1-1 mapping between signals and windows exceptions.
+ // Windows can easily distinguish between SO and SigSegV,
+ // but SigInt, SigTerm, etc are handled differently.
+ static SignalDefs signalDefs[] = {
+ { EXCEPTION_ILLEGAL_INSTRUCTION, "SIGILL - Illegal instruction signal" },
+ { EXCEPTION_STACK_OVERFLOW, "SIGSEGV - Stack overflow" },
+ { EXCEPTION_ACCESS_VIOLATION, "SIGSEGV - Segmentation violation signal" },
+ { EXCEPTION_INT_DIVIDE_BY_ZERO, "Divide by zero error" },
+ };
+
+ LONG CALLBACK FatalConditionHandler::handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
+ for (auto const& def : signalDefs) {
+ if (ExceptionInfo->ExceptionRecord->ExceptionCode == def.id) {
+ reportFatal(def.name);
+ }
+ }
+ // If its not an exception we care about, pass it along.
+ // This stops us from eating debugger breaks etc.
+ return EXCEPTION_CONTINUE_SEARCH;
+ }
+
+ FatalConditionHandler::FatalConditionHandler() {
+ isSet = true;
+ // 32k seems enough for Catch to handle stack overflow,
+ // but the value was found experimentally, so there is no strong guarantee
+ guaranteeSize = 32 * 1024;
+ exceptionHandlerHandle = nullptr;
+ // Register as first handler in current chain
+ exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException);
+ // Pass in guarantee size to be filled
+ SetThreadStackGuarantee(&guaranteeSize);
+ }
+
+ void FatalConditionHandler::reset() {
+ if (isSet) {
+ RemoveVectoredExceptionHandler(exceptionHandlerHandle);
+ SetThreadStackGuarantee(&guaranteeSize);
+ exceptionHandlerHandle = nullptr;
+ isSet = false;
+ }
+ }
+
+ FatalConditionHandler::~FatalConditionHandler() {
+ reset();
+ }
+
+bool FatalConditionHandler::isSet = false;
+ULONG FatalConditionHandler::guaranteeSize = 0;
+PVOID FatalConditionHandler::exceptionHandlerHandle = nullptr;
+
+} // namespace Catch
+
+#elif defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+namespace Catch {
+
+ struct SignalDefs {
+ int id;
+ const char* name;
+ };
+
+ // 32kb for the alternate stack seems to be sufficient. However, this value
+ // is experimentally determined, so that's not guaranteed.
+ constexpr static std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
+
+ static SignalDefs signalDefs[] = {
+ { SIGINT, "SIGINT - Terminal interrupt signal" },
+ { SIGILL, "SIGILL - Illegal instruction signal" },
+ { SIGFPE, "SIGFPE - Floating point error signal" },
+ { SIGSEGV, "SIGSEGV - Segmentation violation signal" },
+ { SIGTERM, "SIGTERM - Termination request signal" },
+ { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
+ };
+
+ void FatalConditionHandler::handleSignal( int sig ) {
+ char const * name = "<unknown signal>";
+ for (auto const& def : signalDefs) {
+ if (sig == def.id) {
+ name = def.name;
+ break;
+ }
+ }
+ reset();
+ reportFatal(name);
+ raise( sig );
+ }
+
+ FatalConditionHandler::FatalConditionHandler() {
+ isSet = true;
+ stack_t sigStack;
+ sigStack.ss_sp = altStackMem;
+ sigStack.ss_size = sigStackSize;
+ sigStack.ss_flags = 0;
+ sigaltstack(&sigStack, &oldSigStack);
+ struct sigaction sa = { };
+
+ sa.sa_handler = handleSignal;
+ sa.sa_flags = SA_ONSTACK;
+ for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) {
+ sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
+ }
+ }
+
+ FatalConditionHandler::~FatalConditionHandler() {
+ reset();
+ }
+
+ void FatalConditionHandler::reset() {
+ if( isSet ) {
+ // Set signals back to previous values -- hopefully nobody overwrote them in the meantime
+ for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i ) {
+ sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
+ }
+ // Return the old stack
+ sigaltstack(&oldSigStack, nullptr);
+ isSet = false;
+ }
+ }
+
+ bool FatalConditionHandler::isSet = false;
+ struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
+ stack_t FatalConditionHandler::oldSigStack = {};
+ char FatalConditionHandler::altStackMem[sigStackSize] = {};
+
+} // namespace Catch
+
+#else
+
+namespace Catch {
+ void FatalConditionHandler::reset() {}
+}
+
+#endif // signals/SEH handling
+
+#if defined(__GNUC__)
+# pragma GCC diagnostic pop
+#endif
+// end catch_fatal_condition.cpp
+// start catch_generators.cpp
+
+// start catch_random_number_generator.h
+
+#include <algorithm>
+#include <random>
+
+namespace Catch {
+
+ struct IConfig;
+
+ std::mt19937& rng();
+ void seedRng( IConfig const& config );
+ unsigned int rngSeed();
+
+}
+
+// end catch_random_number_generator.h
+#include <limits>
+#include <set>
+
+namespace Catch {
+
+IGeneratorTracker::~IGeneratorTracker() {}
+
+const char* GeneratorException::what() const noexcept {
+ return m_msg;
+}
+
+namespace Generators {
+
+ GeneratorUntypedBase::~GeneratorUntypedBase() {}
+
+ auto acquireGeneratorTracker( SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
+ return getResultCapture().acquireGeneratorTracker( lineInfo );
+ }
+
+} // namespace Generators
+} // namespace Catch
+// end catch_generators.cpp
+// start catch_interfaces_capture.cpp
+
+namespace Catch {
+ IResultCapture::~IResultCapture() = default;
+}
+// end catch_interfaces_capture.cpp
+// start catch_interfaces_config.cpp
+
+namespace Catch {
+ IConfig::~IConfig() = default;
+}
+// end catch_interfaces_config.cpp
+// start catch_interfaces_exception.cpp
+
+namespace Catch {
+ IExceptionTranslator::~IExceptionTranslator() = default;
+ IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() = default;
+}
+// end catch_interfaces_exception.cpp
+// start catch_interfaces_registry_hub.cpp
+
+namespace Catch {
+ IRegistryHub::~IRegistryHub() = default;
+ IMutableRegistryHub::~IMutableRegistryHub() = default;
+}
+// end catch_interfaces_registry_hub.cpp
+// start catch_interfaces_reporter.cpp
+
+// start catch_reporter_listening.h
+
+namespace Catch {
+
+ class ListeningReporter : public IStreamingReporter {
+ using Reporters = std::vector<IStreamingReporterPtr>;
+ Reporters m_listeners;
+ IStreamingReporterPtr m_reporter = nullptr;
+ ReporterPreferences m_preferences;
+
+ public:
+ ListeningReporter();
+
+ void addListener( IStreamingReporterPtr&& listener );
+ void addReporter( IStreamingReporterPtr&& reporter );
+
+ public: // IStreamingReporter
+
+ ReporterPreferences getPreferences() const override;
+
+ void noMatchingTestCases( std::string const& spec ) override;
+
+ static std::set<Verbosity> getSupportedVerbosities();
+
+ void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override;
+ void benchmarkEnded( BenchmarkStats const& benchmarkStats ) override;
+
+ void testRunStarting( TestRunInfo const& testRunInfo ) override;
+ void testGroupStarting( GroupInfo const& groupInfo ) override;
+ void testCaseStarting( TestCaseInfo const& testInfo ) override;
+ void sectionStarting( SectionInfo const& sectionInfo ) override;
+ void assertionStarting( AssertionInfo const& assertionInfo ) override;
+
+ // The return value indicates if the messages buffer should be cleared:
+ bool assertionEnded( AssertionStats const& assertionStats ) override;
+ void sectionEnded( SectionStats const& sectionStats ) override;
+ void testCaseEnded( TestCaseStats const& testCaseStats ) override;
+ void testGroupEnded( TestGroupStats const& testGroupStats ) override;
+ void testRunEnded( TestRunStats const& testRunStats ) override;
+
+ void skipTest( TestCaseInfo const& testInfo ) override;
+ bool isMulti() const override;
+
+ };
+
+} // end namespace Catch
+
+// end catch_reporter_listening.h
+namespace Catch {
+
+ ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig )
+ : m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {}
+
+ ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream )
+ : m_stream( &_stream ), m_fullConfig( _fullConfig ) {}
+
+ std::ostream& ReporterConfig::stream() const { return *m_stream; }
+ IConfigPtr ReporterConfig::fullConfig() const { return m_fullConfig; }
+
+ TestRunInfo::TestRunInfo( std::string const& _name ) : name( _name ) {}
+
+ GroupInfo::GroupInfo( std::string const& _name,
+ std::size_t _groupIndex,
+ std::size_t _groupsCount )
+ : name( _name ),
+ groupIndex( _groupIndex ),
+ groupsCounts( _groupsCount )
+ {}
+
+ AssertionStats::AssertionStats( AssertionResult const& _assertionResult,
+ std::vector<MessageInfo> const& _infoMessages,
+ Totals const& _totals )
+ : assertionResult( _assertionResult ),
+ infoMessages( _infoMessages ),
+ totals( _totals )
+ {
+ assertionResult.m_resultData.lazyExpression.m_transientExpression = _assertionResult.m_resultData.lazyExpression.m_transientExpression;
+
+ if( assertionResult.hasMessage() ) {
+ // Copy message into messages list.
+ // !TBD This should have been done earlier, somewhere
+ MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
+ builder << assertionResult.getMessage();
+ builder.m_info.message = builder.m_stream.str();
+
+ infoMessages.push_back( builder.m_info );
+ }
+ }
+
+ AssertionStats::~AssertionStats() = default;
+
+ SectionStats::SectionStats( SectionInfo const& _sectionInfo,
+ Counts const& _assertions,
+ double _durationInSeconds,
+ bool _missingAssertions )
+ : sectionInfo( _sectionInfo ),
+ assertions( _assertions ),
+ durationInSeconds( _durationInSeconds ),
+ missingAssertions( _missingAssertions )
+ {}
+
+ SectionStats::~SectionStats() = default;
+
+ TestCaseStats::TestCaseStats( TestCaseInfo const& _testInfo,
+ Totals const& _totals,
+ std::string const& _stdOut,
+ std::string const& _stdErr,
+ bool _aborting )
+ : testInfo( _testInfo ),
+ totals( _totals ),
+ stdOut( _stdOut ),
+ stdErr( _stdErr ),
+ aborting( _aborting )
+ {}
+
+ TestCaseStats::~TestCaseStats() = default;
+
+ TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo,
+ Totals const& _totals,
+ bool _aborting )
+ : groupInfo( _groupInfo ),
+ totals( _totals ),
+ aborting( _aborting )
+ {}
+
+ TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo )
+ : groupInfo( _groupInfo ),
+ aborting( false )
+ {}
+
+ TestGroupStats::~TestGroupStats() = default;
+
+ TestRunStats::TestRunStats( TestRunInfo const& _runInfo,
+ Totals const& _totals,
+ bool _aborting )
+ : runInfo( _runInfo ),
+ totals( _totals ),
+ aborting( _aborting )
+ {}
+
+ TestRunStats::~TestRunStats() = default;
+
+ void IStreamingReporter::fatalErrorEncountered( StringRef ) {}
+ bool IStreamingReporter::isMulti() const { return false; }
+
+ IReporterFactory::~IReporterFactory() = default;
+ IReporterRegistry::~IReporterRegistry() = default;
+
+} // end namespace Catch
+// end catch_interfaces_reporter.cpp
+// start catch_interfaces_runner.cpp
+
+namespace Catch {
+ IRunner::~IRunner() = default;
+}
+// end catch_interfaces_runner.cpp
+// start catch_interfaces_testcase.cpp
+
+namespace Catch {
+ ITestInvoker::~ITestInvoker() = default;
+ ITestCaseRegistry::~ITestCaseRegistry() = default;
+}
+// end catch_interfaces_testcase.cpp
+// start catch_leak_detector.cpp
+
+#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
+#include <crtdbg.h>
+
+namespace Catch {
+
+ LeakDetector::LeakDetector() {
+ int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
+ flag |= _CRTDBG_LEAK_CHECK_DF;
+ flag |= _CRTDBG_ALLOC_MEM_DF;
+ _CrtSetDbgFlag(flag);
+ _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+ _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+ // Change this to leaking allocation's number to break there
+ _CrtSetBreakAlloc(-1);
+ }
+}
+
+#else
+
+ Catch::LeakDetector::LeakDetector() {}
+
+#endif
+
+Catch::LeakDetector::~LeakDetector() {
+ Catch::cleanUp();
+}
+// end catch_leak_detector.cpp
+// start catch_list.cpp
+
+// start catch_list.h
+
+#include <set>
+
+namespace Catch {
+
+ std::size_t listTests( Config const& config );
+
+ std::size_t listTestsNamesOnly( Config const& config );
+
+ struct TagInfo {
+ void add( std::string const& spelling );
+ std::string all() const;
+
+ std::set<std::string> spellings;
+ std::size_t count = 0;
+ };
+
+ std::size_t listTags( Config const& config );
+
+ std::size_t listReporters();
+
+ Option<std::size_t> list( Config const& config );
+
+} // end namespace Catch
+
+// end catch_list.h
+// start catch_text.h
+
+namespace Catch {
+ using namespace clara::TextFlow;
+}
+
+// end catch_text.h
+#include <limits>
+#include <algorithm>
+#include <iomanip>
+
+namespace Catch {
+
+ std::size_t listTests( Config const& config ) {
+ TestSpec testSpec = config.testSpec();
+ if( config.hasTestFilters() )
+ Catch::cout() << "Matching test cases:\n";
+ else {
+ Catch::cout() << "All available test cases:\n";
+ }
+
+ auto matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+ for( auto const& testCaseInfo : matchedTestCases ) {
+ Colour::Code colour = testCaseInfo.isHidden()
+ ? Colour::SecondaryText
+ : Colour::None;
+ Colour colourGuard( colour );
+
+ Catch::cout() << Column( testCaseInfo.name ).initialIndent( 2 ).indent( 4 ) << "\n";
+ if( config.verbosity() >= Verbosity::High ) {
+ Catch::cout() << Column( Catch::Detail::stringify( testCaseInfo.lineInfo ) ).indent(4) << std::endl;
+ std::string description = testCaseInfo.description;
+ if( description.empty() )
+ description = "(NO DESCRIPTION)";
+ Catch::cout() << Column( description ).indent(4) << std::endl;
+ }
+ if( !testCaseInfo.tags.empty() )
+ Catch::cout() << Column( testCaseInfo.tagsAsString() ).indent( 6 ) << "\n";
+ }
+
+ if( !config.hasTestFilters() )
+ Catch::cout() << pluralise( matchedTestCases.size(), "test case" ) << '\n' << std::endl;
+ else
+ Catch::cout() << pluralise( matchedTestCases.size(), "matching test case" ) << '\n' << std::endl;
+ return matchedTestCases.size();
+ }
+
+ std::size_t listTestsNamesOnly( Config const& config ) {
+ TestSpec testSpec = config.testSpec();
+ std::size_t matchedTests = 0;
+ std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+ for( auto const& testCaseInfo : matchedTestCases ) {
+ matchedTests++;
+ if( startsWith( testCaseInfo.name, '#' ) )
+ Catch::cout() << '"' << testCaseInfo.name << '"';
+ else
+ Catch::cout() << testCaseInfo.name;
+ if ( config.verbosity() >= Verbosity::High )
+ Catch::cout() << "\t@" << testCaseInfo.lineInfo;
+ Catch::cout() << std::endl;
+ }
+ return matchedTests;
+ }
+
+ void TagInfo::add( std::string const& spelling ) {
+ ++count;
+ spellings.insert( spelling );
+ }
+
+ std::string TagInfo::all() const {
+ std::string out;
+ for( auto const& spelling : spellings )
+ out += "[" + spelling + "]";
+ return out;
+ }
+
+ std::size_t listTags( Config const& config ) {
+ TestSpec testSpec = config.testSpec();
+ if( config.hasTestFilters() )
+ Catch::cout() << "Tags for matching test cases:\n";
+ else {
+ Catch::cout() << "All available tags:\n";
+ }
+
+ std::map<std::string, TagInfo> tagCounts;
+
+ std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+ for( auto const& testCase : matchedTestCases ) {
+ for( auto const& tagName : testCase.getTestCaseInfo().tags ) {
+ std::string lcaseTagName = toLower( tagName );
+ auto countIt = tagCounts.find( lcaseTagName );
+ if( countIt == tagCounts.end() )
+ countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first;
+ countIt->second.add( tagName );
+ }
+ }
+
+ for( auto const& tagCount : tagCounts ) {
+ ReusableStringStream rss;
+ rss << " " << std::setw(2) << tagCount.second.count << " ";
+ auto str = rss.str();
+ auto wrapper = Column( tagCount.second.all() )
+ .initialIndent( 0 )
+ .indent( str.size() )
+ .width( CATCH_CONFIG_CONSOLE_WIDTH-10 );
+ Catch::cout() << str << wrapper << '\n';
+ }
+ Catch::cout() << pluralise( tagCounts.size(), "tag" ) << '\n' << std::endl;
+ return tagCounts.size();
+ }
+
+ std::size_t listReporters() {
+ Catch::cout() << "Available reporters:\n";
+ IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+ std::size_t maxNameLen = 0;
+ for( auto const& factoryKvp : factories )
+ maxNameLen = (std::max)( maxNameLen, factoryKvp.first.size() );
+
+ for( auto const& factoryKvp : factories ) {
+ Catch::cout()
+ << Column( factoryKvp.first + ":" )
+ .indent(2)
+ .width( 5+maxNameLen )
+ + Column( factoryKvp.second->getDescription() )
+ .initialIndent(0)
+ .indent(2)
+ .width( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 )
+ << "\n";
+ }
+ Catch::cout() << std::endl;
+ return factories.size();
+ }
+
+ Option<std::size_t> list( Config const& config ) {
+ Option<std::size_t> listedCount;
+ if( config.listTests() )
+ listedCount = listedCount.valueOr(0) + listTests( config );
+ if( config.listTestNamesOnly() )
+ listedCount = listedCount.valueOr(0) + listTestsNamesOnly( config );
+ if( config.listTags() )
+ listedCount = listedCount.valueOr(0) + listTags( config );
+ if( config.listReporters() )
+ listedCount = listedCount.valueOr(0) + listReporters();
+ return listedCount;
+ }
+
+} // end namespace Catch
+// end catch_list.cpp
+// start catch_matchers.cpp
+
+namespace Catch {
+namespace Matchers {
+ namespace Impl {
+
+ std::string MatcherUntypedBase::toString() const {
+ if( m_cachedToString.empty() )
+ m_cachedToString = describe();
+ return m_cachedToString;
+ }
+
+ MatcherUntypedBase::~MatcherUntypedBase() = default;
+
+ } // namespace Impl
+} // namespace Matchers
+
+using namespace Matchers;
+using Matchers::Impl::MatcherBase;
+
+} // namespace Catch
+// end catch_matchers.cpp
+// start catch_matchers_floating.cpp
+
+// start catch_polyfills.hpp
+
+namespace Catch {
+ bool isnan(float f);
+ bool isnan(double d);
+}
+
+// end catch_polyfills.hpp
+// start catch_to_string.hpp
+
+#include <string>
+
+namespace Catch {
+ template <typename T>
+ std::string to_string(T const& t) {
+#if defined(CATCH_CONFIG_CPP11_TO_STRING)
+ return std::to_string(t);
+#else
+ ReusableStringStream rss;
+ rss << t;
+ return rss.str();
+#endif
+ }
+} // end namespace Catch
+
+// end catch_to_string.hpp
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+
+namespace Catch {
+namespace Matchers {
+namespace Floating {
+enum class FloatingPointKind : uint8_t {
+ Float,
+ Double
+};
+}
+}
+}
+
+namespace {
+
+template <typename T>
+struct Converter;
+
+template <>
+struct Converter<float> {
+ static_assert(sizeof(float) == sizeof(int32_t), "Important ULP matcher assumption violated");
+ Converter(float f) {
+ std::memcpy(&i, &f, sizeof(f));
+ }
+ int32_t i;
+};
+
+template <>
+struct Converter<double> {
+ static_assert(sizeof(double) == sizeof(int64_t), "Important ULP matcher assumption violated");
+ Converter(double d) {
+ std::memcpy(&i, &d, sizeof(d));
+ }
+ int64_t i;
+};
+
+template <typename T>
+auto convert(T t) -> Converter<T> {
+ return Converter<T>(t);
+}
+
+template <typename FP>
+bool almostEqualUlps(FP lhs, FP rhs, int maxUlpDiff) {
+ // Comparison with NaN should always be false.
+ // This way we can rule it out before getting into the ugly details
+ if (Catch::isnan(lhs) || Catch::isnan(rhs)) {
+ return false;
+ }
+
+ auto lc = convert(lhs);
+ auto rc = convert(rhs);
+
+ if ((lc.i < 0) != (rc.i < 0)) {
+ // Potentially we can have +0 and -0
+ return lhs == rhs;
+ }
+
+ auto ulpDiff = std::abs(lc.i - rc.i);
+ return ulpDiff <= maxUlpDiff;
+}
+
+}
+
+namespace Catch {
+namespace Matchers {
+namespace Floating {
+ WithinAbsMatcher::WithinAbsMatcher(double target, double margin)
+ :m_target{ target }, m_margin{ margin } {
+ CATCH_ENFORCE(margin >= 0, "Invalid margin: " << margin << '.'
+ << " Margin has to be non-negative.");
+ }
+
+ // Performs equivalent check of std::fabs(lhs - rhs) <= margin
+ // But without the subtraction to allow for INFINITY in comparison
+ bool WithinAbsMatcher::match(double const& matchee) const {
+ return (matchee + m_margin >= m_target) && (m_target + m_margin >= matchee);
+ }
+
+ std::string WithinAbsMatcher::describe() const {
+ return "is within " + ::Catch::Detail::stringify(m_margin) + " of " + ::Catch::Detail::stringify(m_target);
+ }
+
+ WithinUlpsMatcher::WithinUlpsMatcher(double target, int ulps, FloatingPointKind baseType)
+ :m_target{ target }, m_ulps{ ulps }, m_type{ baseType } {
+ CATCH_ENFORCE(ulps >= 0, "Invalid ULP setting: " << ulps << '.'
+ << " ULPs have to be non-negative.");
+ }
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+// Clang <3.5 reports on the default branch in the switch below
+#pragma clang diagnostic ignored "-Wunreachable-code"
+#endif
+
+ bool WithinUlpsMatcher::match(double const& matchee) const {
+ switch (m_type) {
+ case FloatingPointKind::Float:
+ return almostEqualUlps<float>(static_cast<float>(matchee), static_cast<float>(m_target), m_ulps);
+ case FloatingPointKind::Double:
+ return almostEqualUlps<double>(matchee, m_target, m_ulps);
+ default:
+ CATCH_INTERNAL_ERROR( "Unknown FloatingPointKind value" );
+ }
+ }
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
+ std::string WithinUlpsMatcher::describe() const {
+ return "is within " + Catch::to_string(m_ulps) + " ULPs of " + ::Catch::Detail::stringify(m_target) + ((m_type == FloatingPointKind::Float)? "f" : "");
+ }
+
+}// namespace Floating
+
+Floating::WithinUlpsMatcher WithinULP(double target, int maxUlpDiff) {
+ return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Double);
+}
+
+Floating::WithinUlpsMatcher WithinULP(float target, int maxUlpDiff) {
+ return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Float);
+}
+
+Floating::WithinAbsMatcher WithinAbs(double target, double margin) {
+ return Floating::WithinAbsMatcher(target, margin);
+}
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_floating.cpp
+// start catch_matchers_generic.cpp
+
+std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
+ if (desc.empty()) {
+ return "matches undescribed predicate";
+ } else {
+ return "matches predicate: \"" + desc + '"';
+ }
+}
+// end catch_matchers_generic.cpp
+// start catch_matchers_string.cpp
+
+#include <regex>
+
+namespace Catch {
+namespace Matchers {
+
+ namespace StdString {
+
+ CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
+ : m_caseSensitivity( caseSensitivity ),
+ m_str( adjustString( str ) )
+ {}
+ std::string CasedString::adjustString( std::string const& str ) const {
+ return m_caseSensitivity == CaseSensitive::No
+ ? toLower( str )
+ : str;
+ }
+ std::string CasedString::caseSensitivitySuffix() const {
+ return m_caseSensitivity == CaseSensitive::No
+ ? " (case insensitive)"
+ : std::string();
+ }
+
+ StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator )
+ : m_comparator( comparator ),
+ m_operation( operation ) {
+ }
+
+ std::string StringMatcherBase::describe() const {
+ std::string description;
+ description.reserve(5 + m_operation.size() + m_comparator.m_str.size() +
+ m_comparator.caseSensitivitySuffix().size());
+ description += m_operation;
+ description += ": \"";
+ description += m_comparator.m_str;
+ description += "\"";
+ description += m_comparator.caseSensitivitySuffix();
+ return description;
+ }
+
+ EqualsMatcher::EqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {}
+
+ bool EqualsMatcher::match( std::string const& source ) const {
+ return m_comparator.adjustString( source ) == m_comparator.m_str;
+ }
+
+ ContainsMatcher::ContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {}
+
+ bool ContainsMatcher::match( std::string const& source ) const {
+ return contains( m_comparator.adjustString( source ), m_comparator.m_str );
+ }
+
+ StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {}
+
+ bool StartsWithMatcher::match( std::string const& source ) const {
+ return startsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+ }
+
+ EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {}
+
+ bool EndsWithMatcher::match( std::string const& source ) const {
+ return endsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+ }
+
+ RegexMatcher::RegexMatcher(std::string regex, CaseSensitive::Choice caseSensitivity): m_regex(std::move(regex)), m_caseSensitivity(caseSensitivity) {}
+
+ bool RegexMatcher::match(std::string const& matchee) const {
+ auto flags = std::regex::ECMAScript; // ECMAScript is the default syntax option anyway
+ if (m_caseSensitivity == CaseSensitive::Choice::No) {
+ flags |= std::regex::icase;
+ }
+ auto reg = std::regex(m_regex, flags);
+ return std::regex_match(matchee, reg);
+ }
+
+ std::string RegexMatcher::describe() const {
+ return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Choice::Yes)? " case sensitively" : " case insensitively");
+ }
+
+ } // namespace StdString
+
+ StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+ return StdString::EqualsMatcher( StdString::CasedString( str, caseSensitivity) );
+ }
+ StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+ return StdString::ContainsMatcher( StdString::CasedString( str, caseSensitivity) );
+ }
+ StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+ return StdString::EndsWithMatcher( StdString::CasedString( str, caseSensitivity) );
+ }
+ StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+ return StdString::StartsWithMatcher( StdString::CasedString( str, caseSensitivity) );
+ }
+
+ StdString::RegexMatcher Matches(std::string const& regex, CaseSensitive::Choice caseSensitivity) {
+ return StdString::RegexMatcher(regex, caseSensitivity);
+ }
+
+} // namespace Matchers
+} // namespace Catch
+// end catch_matchers_string.cpp
+// start catch_message.cpp
+
+// start catch_uncaught_exceptions.h
+
+namespace Catch {
+ bool uncaught_exceptions();
+} // end namespace Catch
+
+// end catch_uncaught_exceptions.h
+#include <cassert>
+#include <stack>
+
+namespace Catch {
+
+ MessageInfo::MessageInfo( StringRef const& _macroName,
+ SourceLineInfo const& _lineInfo,
+ ResultWas::OfType _type )
+ : macroName( _macroName ),
+ lineInfo( _lineInfo ),
+ type( _type ),
+ sequence( ++globalCount )
+ {}
+
+ bool MessageInfo::operator==( MessageInfo const& other ) const {
+ return sequence == other.sequence;
+ }
+
+ bool MessageInfo::operator<( MessageInfo const& other ) const {
+ return sequence < other.sequence;
+ }
+
+ // This may need protecting if threading support is added
+ unsigned int MessageInfo::globalCount = 0;
+
+ ////////////////////////////////////////////////////////////////////////////
+
+ Catch::MessageBuilder::MessageBuilder( StringRef const& macroName,
+ SourceLineInfo const& lineInfo,
+ ResultWas::OfType type )
+ :m_info(macroName, lineInfo, type) {}
+
+ ////////////////////////////////////////////////////////////////////////////
+
+ ScopedMessage::ScopedMessage( MessageBuilder const& builder )
+ : m_info( builder.m_info )
+ {
+ m_info.message = builder.m_stream.str();
+ getResultCapture().pushScopedMessage( m_info );
+ }
+
+ ScopedMessage::~ScopedMessage() {
+ if ( !uncaught_exceptions() ){
+ getResultCapture().popScopedMessage(m_info);
+ }
+ }
+
+ Capturer::Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names ) {
+ auto trimmed = [&] (size_t start, size_t end) {
+ while (names[start] == ',' || isspace(names[start])) {
+ ++start;
+ }
+ while (names[end] == ',' || isspace(names[end])) {
+ --end;
+ }
+ return names.substr(start, end - start + 1);
+ };
+
+ size_t start = 0;
+ std::stack<char> openings;
+ for (size_t pos = 0; pos < names.size(); ++pos) {
+ char c = names[pos];
+ switch (c) {
+ case '[':
+ case '{':
+ case '(':
+ // It is basically impossible to disambiguate between
+ // comparison and start of template args in this context
+// case '<':
+ openings.push(c);
+ break;
+ case ']':
+ case '}':
+ case ')':
+// case '>':
+ openings.pop();
+ break;
+ case ',':
+ if (start != pos && openings.size() == 0) {
+ m_messages.emplace_back(macroName, lineInfo, resultType);
+ m_messages.back().message = trimmed(start, pos);
+ m_messages.back().message += " := ";
+ start = pos;
+ }
+ }
+ }
+ assert(openings.size() == 0 && "Mismatched openings");
+ m_messages.emplace_back(macroName, lineInfo, resultType);
+ m_messages.back().message = trimmed(start, names.size() - 1);
+ m_messages.back().message += " := ";
+ }
+ Capturer::~Capturer() {
+ if ( !uncaught_exceptions() ){
+ assert( m_captured == m_messages.size() );
+ for( size_t i = 0; i < m_captured; ++i )
+ m_resultCapture.popScopedMessage( m_messages[i] );
+ }
+ }
+
+ void Capturer::captureValue( size_t index, std::string const& value ) {
+ assert( index < m_messages.size() );
+ m_messages[index].message += value;
+ m_resultCapture.pushScopedMessage( m_messages[index] );
+ m_captured++;
+ }
+
+} // end namespace Catch
+// end catch_message.cpp
+// start catch_output_redirect.cpp
+
+// start catch_output_redirect.h
+#ifndef TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+#define TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+
+#include <cstdio>
+#include <iosfwd>
+#include <string>
+
+namespace Catch {
+
+ class RedirectedStream {
+ std::ostream& m_originalStream;
+ std::ostream& m_redirectionStream;
+ std::streambuf* m_prevBuf;
+
+ public:
+ RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream );
+ ~RedirectedStream();
+ };
+
+ class RedirectedStdOut {
+ ReusableStringStream m_rss;
+ RedirectedStream m_cout;
+ public:
+ RedirectedStdOut();
+ auto str() const -> std::string;
+ };
+
+ // StdErr has two constituent streams in C++, std::cerr and std::clog
+ // This means that we need to redirect 2 streams into 1 to keep proper
+ // order of writes
+ class RedirectedStdErr {
+ ReusableStringStream m_rss;
+ RedirectedStream m_cerr;
+ RedirectedStream m_clog;
+ public:
+ RedirectedStdErr();
+ auto str() const -> std::string;
+ };
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+
+ // Windows's implementation of std::tmpfile is terrible (it tries
+ // to create a file inside system folder, thus requiring elevated
+ // privileges for the binary), so we have to use tmpnam(_s) and
+ // create the file ourselves there.
+ class TempFile {
+ public:
+ TempFile(TempFile const&) = delete;
+ TempFile& operator=(TempFile const&) = delete;
+ TempFile(TempFile&&) = delete;
+ TempFile& operator=(TempFile&&) = delete;
+
+ TempFile();
+ ~TempFile();
+
+ std::FILE* getFile();
+ std::string getContents();
+
+ private:
+ std::FILE* m_file = nullptr;
+ #if defined(_MSC_VER)
+ char m_buffer[L_tmpnam] = { 0 };
+ #endif
+ };
+
+ class OutputRedirect {
+ public:
+ OutputRedirect(OutputRedirect const&) = delete;
+ OutputRedirect& operator=(OutputRedirect const&) = delete;
+ OutputRedirect(OutputRedirect&&) = delete;
+ OutputRedirect& operator=(OutputRedirect&&) = delete;
+
+ OutputRedirect(std::string& stdout_dest, std::string& stderr_dest);
+ ~OutputRedirect();
+
+ private:
+ int m_originalStdout = -1;
+ int m_originalStderr = -1;
+ TempFile m_stdoutFile;
+ TempFile m_stderrFile;
+ std::string& m_stdoutDest;
+ std::string& m_stderrDest;
+ };
+
+#endif
+
+} // end namespace Catch
+
+#endif // TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+// end catch_output_redirect.h
+#include <cstdio>
+#include <cstring>
+#include <fstream>
+#include <sstream>
+#include <stdexcept>
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+ #if defined(_MSC_VER)
+ #include <io.h> //_dup and _dup2
+ #define dup _dup
+ #define dup2 _dup2
+ #define fileno _fileno
+ #else
+ #include <unistd.h> // dup and dup2
+ #endif
+#endif
+
+namespace Catch {
+
+ RedirectedStream::RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream )
+ : m_originalStream( originalStream ),
+ m_redirectionStream( redirectionStream ),
+ m_prevBuf( m_originalStream.rdbuf() )
+ {
+ m_originalStream.rdbuf( m_redirectionStream.rdbuf() );
+ }
+
+ RedirectedStream::~RedirectedStream() {
+ m_originalStream.rdbuf( m_prevBuf );
+ }
+
+ RedirectedStdOut::RedirectedStdOut() : m_cout( Catch::cout(), m_rss.get() ) {}
+ auto RedirectedStdOut::str() const -> std::string { return m_rss.str(); }
+
+ RedirectedStdErr::RedirectedStdErr()
+ : m_cerr( Catch::cerr(), m_rss.get() ),
+ m_clog( Catch::clog(), m_rss.get() )
+ {}
+ auto RedirectedStdErr::str() const -> std::string { return m_rss.str(); }
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+
+#if defined(_MSC_VER)
+ TempFile::TempFile() {
+ if (tmpnam_s(m_buffer)) {
+ CATCH_RUNTIME_ERROR("Could not get a temp filename");
+ }
+ if (fopen_s(&m_file, m_buffer, "w")) {
+ char buffer[100];
+ if (strerror_s(buffer, errno)) {
+ CATCH_RUNTIME_ERROR("Could not translate errno to a string");
+ }
+ CATCH_RUNTIME_ERROR("Coul dnot open the temp file: '" << m_buffer << "' because: " << buffer);
+ }
+ }
+#else
+ TempFile::TempFile() {
+ m_file = std::tmpfile();
+ if (!m_file) {
+ CATCH_RUNTIME_ERROR("Could not create a temp file.");
+ }
+ }
+
+#endif
+
+ TempFile::~TempFile() {
+ // TBD: What to do about errors here?
+ std::fclose(m_file);
+ // We manually create the file on Windows only, on Linux
+ // it will be autodeleted
+#if defined(_MSC_VER)
+ std::remove(m_buffer);
+#endif
+ }
+
+ FILE* TempFile::getFile() {
+ return m_file;
+ }
+
+ std::string TempFile::getContents() {
+ std::stringstream sstr;
+ char buffer[100] = {};
+ std::rewind(m_file);
+ while (std::fgets(buffer, sizeof(buffer), m_file)) {
+ sstr << buffer;
+ }
+ return sstr.str();
+ }
+
+ OutputRedirect::OutputRedirect(std::string& stdout_dest, std::string& stderr_dest) :
+ m_originalStdout(dup(1)),
+ m_originalStderr(dup(2)),
+ m_stdoutDest(stdout_dest),
+ m_stderrDest(stderr_dest) {
+ dup2(fileno(m_stdoutFile.getFile()), 1);
+ dup2(fileno(m_stderrFile.getFile()), 2);
+ }
+
+ OutputRedirect::~OutputRedirect() {
+ Catch::cout() << std::flush;
+ fflush(stdout);
+ // Since we support overriding these streams, we flush cerr
+ // even though std::cerr is unbuffered
+ Catch::cerr() << std::flush;
+ Catch::clog() << std::flush;
+ fflush(stderr);
+
+ dup2(m_originalStdout, 1);
+ dup2(m_originalStderr, 2);
+
+ m_stdoutDest += m_stdoutFile.getContents();
+ m_stderrDest += m_stderrFile.getContents();
+ }
+
+#endif // CATCH_CONFIG_NEW_CAPTURE
+
+} // namespace Catch
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+ #if defined(_MSC_VER)
+ #undef dup
+ #undef dup2
+ #undef fileno
+ #endif
+#endif
+// end catch_output_redirect.cpp
+// start catch_polyfills.cpp
+
+#include <cmath>
+
+namespace Catch {
+
+#if !defined(CATCH_CONFIG_POLYFILL_ISNAN)
+ bool isnan(float f) {
+ return std::isnan(f);
+ }
+ bool isnan(double d) {
+ return std::isnan(d);
+ }
+#else
+ // For now we only use this for embarcadero
+ bool isnan(float f) {
+ return std::_isnan(f);
+ }
+ bool isnan(double d) {
+ return std::_isnan(d);
+ }
+#endif
+
+} // end namespace Catch
+// end catch_polyfills.cpp
+// start catch_random_number_generator.cpp
+
+namespace Catch {
+
+ std::mt19937& rng() {
+ static std::mt19937 s_rng;
+ return s_rng;
+ }
+
+ void seedRng( IConfig const& config ) {
+ if( config.rngSeed() != 0 ) {
+ std::srand( config.rngSeed() );
+ rng().seed( config.rngSeed() );
+ }
+ }
+
+ unsigned int rngSeed() {
+ return getCurrentContext().getConfig()->rngSeed();
+ }
+}
+// end catch_random_number_generator.cpp
+// start catch_registry_hub.cpp
+
+// start catch_test_case_registry_impl.h
+
+#include <vector>
+#include <set>
+#include <algorithm>
+#include <ios>
+
+namespace Catch {
+
+ class TestCase;
+ struct IConfig;
+
+ std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases );
+ bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
+
+ void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions );
+
+ std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
+ std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
+
+ class TestRegistry : public ITestCaseRegistry {
+ public:
+ virtual ~TestRegistry() = default;
+
+ virtual void registerTest( TestCase const& testCase );
+
+ std::vector<TestCase> const& getAllTests() const override;
+ std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const override;
+
+ private:
+ std::vector<TestCase> m_functions;
+ mutable RunTests::InWhatOrder m_currentSortOrder = RunTests::InDeclarationOrder;
+ mutable std::vector<TestCase> m_sortedFunctions;
+ std::size_t m_unnamedCount = 0;
+ std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
+ };
+
+ ///////////////////////////////////////////////////////////////////////////
+
+ class TestInvokerAsFunction : public ITestInvoker {
+ void(*m_testAsFunction)();
+ public:
+ TestInvokerAsFunction( void(*testAsFunction)() ) noexcept;
+
+ void invoke() const override;
+ };
+
+ std::string extractClassName( StringRef const& classOrQualifiedMethodName );
+
+ ///////////////////////////////////////////////////////////////////////////
+
+} // end namespace Catch
+
+// end catch_test_case_registry_impl.h
+// start catch_reporter_registry.h
+
+#include <map>
+
+namespace Catch {
+
+ class ReporterRegistry : public IReporterRegistry {
+
+ public:
+
+ ~ReporterRegistry() override;
+
+ IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const override;
+
+ void registerReporter( std::string const& name, IReporterFactoryPtr const& factory );
+ void registerListener( IReporterFactoryPtr const& factory );
+
+ FactoryMap const& getFactories() const override;
+ Listeners const& getListeners() const override;
+
+ private:
+ FactoryMap m_factories;
+ Listeners m_listeners;
+ };
+}
+
+// end catch_reporter_registry.h
+// start catch_tag_alias_registry.h
+
+// start catch_tag_alias.h
+
+#include <string>
+
+namespace Catch {
+
+ struct TagAlias {
+ TagAlias(std::string const& _tag, SourceLineInfo _lineInfo);
+
+ std::string tag;
+ SourceLineInfo lineInfo;
+ };
+
+} // end namespace Catch
+
+// end catch_tag_alias.h
+#include <map>
+
+namespace Catch {
+
+ class TagAliasRegistry : public ITagAliasRegistry {
+ public:
+ ~TagAliasRegistry() override;
+ TagAlias const* find( std::string const& alias ) const override;
+ std::string expandAliases( std::string const& unexpandedTestSpec ) const override;
+ void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo );
+
+ private:
+ std::map<std::string, TagAlias> m_registry;
+ };
+
+} // end namespace Catch
+
+// end catch_tag_alias_registry.h
+// start catch_startup_exception_registry.h
+
+#include <vector>
+#include <exception>
+
+namespace Catch {
+
+ class StartupExceptionRegistry {
+ public:
+ void add(std::exception_ptr const& exception) noexcept;
+ std::vector<std::exception_ptr> const& getExceptions() const noexcept;
+ private:
+ std::vector<std::exception_ptr> m_exceptions;
+ };
+
+} // end namespace Catch
+
+// end catch_startup_exception_registry.h
+// start catch_singletons.hpp
+
+namespace Catch {
+
+ struct ISingleton {
+ virtual ~ISingleton();
+ };
+
+ void addSingleton( ISingleton* singleton );
+ void cleanupSingletons();
+
+ template<typename SingletonImplT, typename InterfaceT = SingletonImplT, typename MutableInterfaceT = InterfaceT>
+ class Singleton : SingletonImplT, public ISingleton {
+
+ static auto getInternal() -> Singleton* {
+ static Singleton* s_instance = nullptr;
+ if( !s_instance ) {
+ s_instance = new Singleton;
+ addSingleton( s_instance );
+ }
+ return s_instance;
+ }
+
+ public:
+ static auto get() -> InterfaceT const& {
+ return *getInternal();
+ }
+ static auto getMutable() -> MutableInterfaceT& {
+ return *getInternal();
+ }
+ };
+
+} // namespace Catch
+
+// end catch_singletons.hpp
+namespace Catch {
+
+ namespace {
+
+ class RegistryHub : public IRegistryHub, public IMutableRegistryHub,
+ private NonCopyable {
+
+ public: // IRegistryHub
+ RegistryHub() = default;
+ IReporterRegistry const& getReporterRegistry() const override {
+ return m_reporterRegistry;
+ }
+ ITestCaseRegistry const& getTestCaseRegistry() const override {
+ return m_testCaseRegistry;
+ }
+ IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const override {
+ return m_exceptionTranslatorRegistry;
+ }
+ ITagAliasRegistry const& getTagAliasRegistry() const override {
+ return m_tagAliasRegistry;
+ }
+ StartupExceptionRegistry const& getStartupExceptionRegistry() const override {
+ return m_exceptionRegistry;
+ }
+
+ public: // IMutableRegistryHub
+ void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) override {
+ m_reporterRegistry.registerReporter( name, factory );
+ }
+ void registerListener( IReporterFactoryPtr const& factory ) override {
+ m_reporterRegistry.registerListener( factory );
+ }
+ void registerTest( TestCase const& testInfo ) override {
+ m_testCaseRegistry.registerTest( testInfo );
+ }
+ void registerTranslator( const IExceptionTranslator* translator ) override {
+ m_exceptionTranslatorRegistry.registerTranslator( translator );
+ }
+ void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
+ m_tagAliasRegistry.add( alias, tag, lineInfo );
+ }
+ void registerStartupException() noexcept override {
+ m_exceptionRegistry.add(std::current_exception());
+ }
+
+ private:
+ TestRegistry m_testCaseRegistry;
+ ReporterRegistry m_reporterRegistry;
+ ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
+ TagAliasRegistry m_tagAliasRegistry;
+ StartupExceptionRegistry m_exceptionRegistry;
+ };
+ }
+
+ using RegistryHubSingleton = Singleton<RegistryHub, IRegistryHub, IMutableRegistryHub>;
+
+ IRegistryHub const& getRegistryHub() {
+ return RegistryHubSingleton::get();
+ }
+ IMutableRegistryHub& getMutableRegistryHub() {
+ return RegistryHubSingleton::getMutable();
+ }
+ void cleanUp() {
+ cleanupSingletons();
+ cleanUpContext();
+ }
+ std::string translateActiveException() {
+ return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
+ }
+
+} // end namespace Catch
+// end catch_registry_hub.cpp
+// start catch_reporter_registry.cpp
+
+namespace Catch {
+
+ ReporterRegistry::~ReporterRegistry() = default;
+
+ IStreamingReporterPtr ReporterRegistry::create( std::string const& name, IConfigPtr const& config ) const {
+ auto it = m_factories.find( name );
+ if( it == m_factories.end() )
+ return nullptr;
+ return it->second->create( ReporterConfig( config ) );
+ }
+
+ void ReporterRegistry::registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) {
+ m_factories.emplace(name, factory);
+ }
+ void ReporterRegistry::registerListener( IReporterFactoryPtr const& factory ) {
+ m_listeners.push_back( factory );
+ }
+
+ IReporterRegistry::FactoryMap const& ReporterRegistry::getFactories() const {
+ return m_factories;
+ }
+ IReporterRegistry::Listeners const& ReporterRegistry::getListeners() const {
+ return m_listeners;
+ }
+
+}
+// end catch_reporter_registry.cpp
+// start catch_result_type.cpp
+
+namespace Catch {
+
+ bool isOk( ResultWas::OfType resultType ) {
+ return ( resultType & ResultWas::FailureBit ) == 0;
+ }
+ bool isJustInfo( int flags ) {
+ return flags == ResultWas::Info;
+ }
+
+ ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
+ return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
+ }
+
+ bool shouldContinueOnFailure( int flags ) { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
+ bool shouldSuppressFailure( int flags ) { return ( flags & ResultDisposition::SuppressFail ) != 0; }
+
+} // end namespace Catch
+// end catch_result_type.cpp
+// start catch_run_context.cpp
+
+#include <cassert>
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+ namespace Generators {
+ struct GeneratorTracker : TestCaseTracking::TrackerBase, IGeneratorTracker {
+ GeneratorBasePtr m_generator;
+
+ GeneratorTracker( TestCaseTracking::NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+ : TrackerBase( nameAndLocation, ctx, parent )
+ {}
+ ~GeneratorTracker();
+
+ static GeneratorTracker& acquire( TrackerContext& ctx, TestCaseTracking::NameAndLocation const& nameAndLocation ) {
+ std::shared_ptr<GeneratorTracker> tracker;
+
+ ITracker& currentTracker = ctx.currentTracker();
+ if( TestCaseTracking::ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
+ assert( childTracker );
+ assert( childTracker->isGeneratorTracker() );
+ tracker = std::static_pointer_cast<GeneratorTracker>( childTracker );
+ }
+ else {
+ tracker = std::make_shared<GeneratorTracker>( nameAndLocation, ctx, ¤tTracker );
+ currentTracker.addChild( tracker );
+ }
+
+ if( !ctx.completedCycle() && !tracker->isComplete() ) {
+ tracker->open();
+ }
+
+ return *tracker;
+ }
+
+ // TrackerBase interface
+ bool isGeneratorTracker() const override { return true; }
+ auto hasGenerator() const -> bool override {
+ return !!m_generator;
+ }
+ void close() override {
+ TrackerBase::close();
+ // Generator interface only finds out if it has another item on atual move
+ if (m_runState == CompletedSuccessfully && m_generator->next()) {
+ m_children.clear();
+ m_runState = Executing;
+ }
+ }
+
+ // IGeneratorTracker interface
+ auto getGenerator() const -> GeneratorBasePtr const& override {
+ return m_generator;
+ }
+ void setGenerator( GeneratorBasePtr&& generator ) override {
+ m_generator = std::move( generator );
+ }
+ };
+ GeneratorTracker::~GeneratorTracker() {}
+ }
+
+ RunContext::RunContext(IConfigPtr const& _config, IStreamingReporterPtr&& reporter)
+ : m_runInfo(_config->name()),
+ m_context(getCurrentMutableContext()),
+ m_config(_config),
+ m_reporter(std::move(reporter)),
+ m_lastAssertionInfo{ StringRef(), SourceLineInfo("",0), StringRef(), ResultDisposition::Normal },
+ m_includeSuccessfulResults( m_config->includeSuccessfulResults() || m_reporter->getPreferences().shouldReportAllAssertions )
+ {
+ m_context.setRunner(this);
+ m_context.setConfig(m_config);
+ m_context.setResultCapture(this);
+ m_reporter->testRunStarting(m_runInfo);
+ }
+
+ RunContext::~RunContext() {
+ m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, aborting()));
+ }
+
+ void RunContext::testGroupStarting(std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount) {
+ m_reporter->testGroupStarting(GroupInfo(testSpec, groupIndex, groupsCount));
+ }
+
+ void RunContext::testGroupEnded(std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount) {
+ m_reporter->testGroupEnded(TestGroupStats(GroupInfo(testSpec, groupIndex, groupsCount), totals, aborting()));
+ }
+
+ Totals RunContext::runTest(TestCase const& testCase) {
+ Totals prevTotals = m_totals;
+
+ std::string redirectedCout;
+ std::string redirectedCerr;
+
+ auto const& testInfo = testCase.getTestCaseInfo();
+
+ m_reporter->testCaseStarting(testInfo);
+
+ m_activeTestCase = &testCase;
+
+ ITracker& rootTracker = m_trackerContext.startRun();
+ assert(rootTracker.isSectionTracker());
+ static_cast<SectionTracker&>(rootTracker).addInitialFilters(m_config->getSectionsToRun());
+ do {
+ m_trackerContext.startCycle();
+ m_testCaseTracker = &SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(testInfo.name, testInfo.lineInfo));
+ runCurrentTest(redirectedCout, redirectedCerr);
+ } while (!m_testCaseTracker->isSuccessfullyCompleted() && !aborting());
+
+ Totals deltaTotals = m_totals.delta(prevTotals);
+ if (testInfo.expectedToFail() && deltaTotals.testCases.passed > 0) {
+ deltaTotals.assertions.failed++;
+ deltaTotals.testCases.passed--;
+ deltaTotals.testCases.failed++;
+ }
+ m_totals.testCases += deltaTotals.testCases;
+ m_reporter->testCaseEnded(TestCaseStats(testInfo,
+ deltaTotals,
+ redirectedCout,
+ redirectedCerr,
+ aborting()));
+
+ m_activeTestCase = nullptr;
+ m_testCaseTracker = nullptr;
+
+ return deltaTotals;
+ }
+
+ IConfigPtr RunContext::config() const {
+ return m_config;
+ }
+
+ IStreamingReporter& RunContext::reporter() const {
+ return *m_reporter;
+ }
+
+ void RunContext::assertionEnded(AssertionResult const & result) {
+ if (result.getResultType() == ResultWas::Ok) {
+ m_totals.assertions.passed++;
+ m_lastAssertionPassed = true;
+ } else if (!result.isOk()) {
+ m_lastAssertionPassed = false;
+ if( m_activeTestCase->getTestCaseInfo().okToFail() )
+ m_totals.assertions.failedButOk++;
+ else
+ m_totals.assertions.failed++;
+ }
+ else {
+ m_lastAssertionPassed = true;
+ }
+
+ // We have no use for the return value (whether messages should be cleared), because messages were made scoped
+ // and should be let to clear themselves out.
+ static_cast<void>(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals)));
+
+ // Reset working state
+ resetAssertionInfo();
+ m_lastResult = result;
+ }
+ void RunContext::resetAssertionInfo() {
+ m_lastAssertionInfo.macroName = StringRef();
+ m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}"_sr;
+ }
+
+ bool RunContext::sectionStarted(SectionInfo const & sectionInfo, Counts & assertions) {
+ ITracker& sectionTracker = SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(sectionInfo.name, sectionInfo.lineInfo));
+ if (!sectionTracker.isOpen())
+ return false;
+ m_activeSections.push_back(§ionTracker);
+
+ m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
+
+ m_reporter->sectionStarting(sectionInfo);
+
+ assertions = m_totals.assertions;
+
+ return true;
+ }
+ auto RunContext::acquireGeneratorTracker( SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
+ using namespace Generators;
+ GeneratorTracker& tracker = GeneratorTracker::acquire( m_trackerContext, TestCaseTracking::NameAndLocation( "generator", lineInfo ) );
+ assert( tracker.isOpen() );
+ m_lastAssertionInfo.lineInfo = lineInfo;
+ return tracker;
+ }
+
+ bool RunContext::testForMissingAssertions(Counts& assertions) {
+ if (assertions.total() != 0)
+ return false;
+ if (!m_config->warnAboutMissingAssertions())
+ return false;
+ if (m_trackerContext.currentTracker().hasChildren())
+ return false;
+ m_totals.assertions.failed++;
+ assertions.failed++;
+ return true;
+ }
+
+ void RunContext::sectionEnded(SectionEndInfo const & endInfo) {
+ Counts assertions = m_totals.assertions - endInfo.prevAssertions;
+ bool missingAssertions = testForMissingAssertions(assertions);
+
+ if (!m_activeSections.empty()) {
+ m_activeSections.back()->close();
+ m_activeSections.pop_back();
+ }
+
+ m_reporter->sectionEnded(SectionStats(endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions));
+ m_messages.clear();
+ }
+
+ void RunContext::sectionEndedEarly(SectionEndInfo const & endInfo) {
+ if (m_unfinishedSections.empty())
+ m_activeSections.back()->fail();
+ else
+ m_activeSections.back()->close();
+ m_activeSections.pop_back();
+
+ m_unfinishedSections.push_back(endInfo);
+ }
+ void RunContext::benchmarkStarting( BenchmarkInfo const& info ) {
+ m_reporter->benchmarkStarting( info );
+ }
+ void RunContext::benchmarkEnded( BenchmarkStats const& stats ) {
+ m_reporter->benchmarkEnded( stats );
+ }
+
+ void RunContext::pushScopedMessage(MessageInfo const & message) {
+ m_messages.push_back(message);
+ }
+
+ void RunContext::popScopedMessage(MessageInfo const & message) {
+ m_messages.erase(std::remove(m_messages.begin(), m_messages.end(), message), m_messages.end());
+ }
+
+ std::string RunContext::getCurrentTestName() const {
+ return m_activeTestCase
+ ? m_activeTestCase->getTestCaseInfo().name
+ : std::string();
+ }
+
+ const AssertionResult * RunContext::getLastResult() const {
+ return &(*m_lastResult);
+ }
+
+ void RunContext::exceptionEarlyReported() {
+ m_shouldReportUnexpected = false;
+ }
+
+ void RunContext::handleFatalErrorCondition( StringRef message ) {
+ // First notify reporter that bad things happened
+ m_reporter->fatalErrorEncountered(message);
+
+ // Don't rebuild the result -- the stringification itself can cause more fatal errors
+ // Instead, fake a result data.
+ AssertionResultData tempResult( ResultWas::FatalErrorCondition, { false } );
+ tempResult.message = message;
+ AssertionResult result(m_lastAssertionInfo, tempResult);
+
+ assertionEnded(result);
+
+ handleUnfinishedSections();
+
+ // Recreate section for test case (as we will lose the one that was in scope)
+ auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+ SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
+
+ Counts assertions;
+ assertions.failed = 1;
+ SectionStats testCaseSectionStats(testCaseSection, assertions, 0, false);
+ m_reporter->sectionEnded(testCaseSectionStats);
+
+ auto const& testInfo = m_activeTestCase->getTestCaseInfo();
+
+ Totals deltaTotals;
+ deltaTotals.testCases.failed = 1;
+ deltaTotals.assertions.failed = 1;
+ m_reporter->testCaseEnded(TestCaseStats(testInfo,
+ deltaTotals,
+ std::string(),
+ std::string(),
+ false));
+ m_totals.testCases.failed++;
+ testGroupEnded(std::string(), m_totals, 1, 1);
+ m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, false));
+ }
+
+ bool RunContext::lastAssertionPassed() {
+ return m_lastAssertionPassed;
+ }
+
+ void RunContext::assertionPassed() {
+ m_lastAssertionPassed = true;
+ ++m_totals.assertions.passed;
+ resetAssertionInfo();
+ }
+
+ bool RunContext::aborting() const {
+ return m_totals.assertions.failed >= static_cast<std::size_t>(m_config->abortAfter());
+ }
+
+ void RunContext::runCurrentTest(std::string & redirectedCout, std::string & redirectedCerr) {
+ auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+ SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
+ m_reporter->sectionStarting(testCaseSection);
+ Counts prevAssertions = m_totals.assertions;
+ double duration = 0;
+ m_shouldReportUnexpected = true;
+ m_lastAssertionInfo = { "TEST_CASE"_sr, testCaseInfo.lineInfo, StringRef(), ResultDisposition::Normal };
+
+ seedRng(*m_config);
+
+ Timer timer;
+ CATCH_TRY {
+ if (m_reporter->getPreferences().shouldRedirectStdOut) {
+#if !defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
+ RedirectedStdOut redirectedStdOut;
+ RedirectedStdErr redirectedStdErr;
+
+ timer.start();
+ invokeActiveTestCase();
+ redirectedCout += redirectedStdOut.str();
+ redirectedCerr += redirectedStdErr.str();
+#else
+ OutputRedirect r(redirectedCout, redirectedCerr);
+ timer.start();
+ invokeActiveTestCase();
+#endif
+ } else {
+ timer.start();
+ invokeActiveTestCase();
+ }
+ duration = timer.getElapsedSeconds();
+ } CATCH_CATCH_ANON (TestFailureException&) {
+ // This just means the test was aborted due to failure
+ } CATCH_CATCH_ALL {
+ // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
+ // are reported without translation at the point of origin.
+ if( m_shouldReportUnexpected ) {
+ AssertionReaction dummyReaction;
+ handleUnexpectedInflightException( m_lastAssertionInfo, translateActiveException(), dummyReaction );
+ }
+ }
+ Counts assertions = m_totals.assertions - prevAssertions;
+ bool missingAssertions = testForMissingAssertions(assertions);
+
+ m_testCaseTracker->close();
+ handleUnfinishedSections();
+ m_messages.clear();
+
+ SectionStats testCaseSectionStats(testCaseSection, assertions, duration, missingAssertions);
+ m_reporter->sectionEnded(testCaseSectionStats);
+ }
+
+ void RunContext::invokeActiveTestCase() {
+ FatalConditionHandler fatalConditionHandler; // Handle signals
+ m_activeTestCase->invoke();
+ fatalConditionHandler.reset();
+ }
+
+ void RunContext::handleUnfinishedSections() {
+ // If sections ended prematurely due to an exception we stored their
+ // infos here so we can tear them down outside the unwind process.
+ for (auto it = m_unfinishedSections.rbegin(),
+ itEnd = m_unfinishedSections.rend();
+ it != itEnd;
+ ++it)
+ sectionEnded(*it);
+ m_unfinishedSections.clear();
+ }
+
+ void RunContext::handleExpr(
+ AssertionInfo const& info,
+ ITransientExpression const& expr,
+ AssertionReaction& reaction
+ ) {
+ m_reporter->assertionStarting( info );
+
+ bool negated = isFalseTest( info.resultDisposition );
+ bool result = expr.getResult() != negated;
+
+ if( result ) {
+ if (!m_includeSuccessfulResults) {
+ assertionPassed();
+ }
+ else {
+ reportExpr(info, ResultWas::Ok, &expr, negated);
+ }
+ }
+ else {
+ reportExpr(info, ResultWas::ExpressionFailed, &expr, negated );
+ populateReaction( reaction );
+ }
+ }
+ void RunContext::reportExpr(
+ AssertionInfo const &info,
+ ResultWas::OfType resultType,
+ ITransientExpression const *expr,
+ bool negated ) {
+
+ m_lastAssertionInfo = info;
+ AssertionResultData data( resultType, LazyExpression( negated ) );
+
+ AssertionResult assertionResult{ info, data };
+ assertionResult.m_resultData.lazyExpression.m_transientExpression = expr;
+
+ assertionEnded( assertionResult );
+ }
+
+ void RunContext::handleMessage(
+ AssertionInfo const& info,
+ ResultWas::OfType resultType,
+ StringRef const& message,
+ AssertionReaction& reaction
+ ) {
+ m_reporter->assertionStarting( info );
+
+ m_lastAssertionInfo = info;
+
+ AssertionResultData data( resultType, LazyExpression( false ) );
+ data.message = message;
+ AssertionResult assertionResult{ m_lastAssertionInfo, data };
+ assertionEnded( assertionResult );
+ if( !assertionResult.isOk() )
+ populateReaction( reaction );
+ }
+ void RunContext::handleUnexpectedExceptionNotThrown(
+ AssertionInfo const& info,
+ AssertionReaction& reaction
+ ) {
+ handleNonExpr(info, Catch::ResultWas::DidntThrowException, reaction);
+ }
+
+ void RunContext::handleUnexpectedInflightException(
+ AssertionInfo const& info,
+ std::string const& message,
+ AssertionReaction& reaction
+ ) {
+ m_lastAssertionInfo = info;
+
+ AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
+ data.message = message;
+ AssertionResult assertionResult{ info, data };
+ assertionEnded( assertionResult );
+ populateReaction( reaction );
+ }
+
+ void RunContext::populateReaction( AssertionReaction& reaction ) {
+ reaction.shouldDebugBreak = m_config->shouldDebugBreak();
+ reaction.shouldThrow = aborting() || (m_lastAssertionInfo.resultDisposition & ResultDisposition::Normal);
+ }
+
+ void RunContext::handleIncomplete(
+ AssertionInfo const& info
+ ) {
+ m_lastAssertionInfo = info;
+
+ AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
+ data.message = "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE";
+ AssertionResult assertionResult{ info, data };
+ assertionEnded( assertionResult );
+ }
+ void RunContext::handleNonExpr(
+ AssertionInfo const &info,
+ ResultWas::OfType resultType,
+ AssertionReaction &reaction
+ ) {
+ m_lastAssertionInfo = info;
+
+ AssertionResultData data( resultType, LazyExpression( false ) );
+ AssertionResult assertionResult{ info, data };
+ assertionEnded( assertionResult );
+
+ if( !assertionResult.isOk() )
+ populateReaction( reaction );
+ }
+
+ IResultCapture& getResultCapture() {
+ if (auto* capture = getCurrentContext().getResultCapture())
+ return *capture;
+ else
+ CATCH_INTERNAL_ERROR("No result capture instance");
+ }
+}
+// end catch_run_context.cpp
+// start catch_section.cpp
+
+namespace Catch {
+
+ Section::Section( SectionInfo const& info )
+ : m_info( info ),
+ m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) )
+ {
+ m_timer.start();
+ }
+
+ Section::~Section() {
+ if( m_sectionIncluded ) {
+ SectionEndInfo endInfo{ m_info, m_assertions, m_timer.getElapsedSeconds() };
+ if( uncaught_exceptions() )
+ getResultCapture().sectionEndedEarly( endInfo );
+ else
+ getResultCapture().sectionEnded( endInfo );
+ }
+ }
+
+ // This indicates whether the section should be executed or not
+ Section::operator bool() const {
+ return m_sectionIncluded;
+ }
+
+} // end namespace Catch
+// end catch_section.cpp
+// start catch_section_info.cpp
+
+namespace Catch {
+
+ SectionInfo::SectionInfo
+ ( SourceLineInfo const& _lineInfo,
+ std::string const& _name )
+ : name( _name ),
+ lineInfo( _lineInfo )
+ {}
+
+} // end namespace Catch
+// end catch_section_info.cpp
+// start catch_session.cpp
+
+// start catch_session.h
+
+#include <memory>
+
+namespace Catch {
+
+ class Session : NonCopyable {
+ public:
+
+ Session();
+ ~Session() override;
+
+ void showHelp() const;
+ void libIdentify();
+
+ int applyCommandLine( int argc, char const * const * argv );
+ #if defined(CATCH_CONFIG_WCHAR) && defined(WIN32) && defined(UNICODE)
+ int applyCommandLine( int argc, wchar_t const * const * argv );
+ #endif
+
+ void useConfigData( ConfigData const& configData );
+
+ template<typename CharT>
+ int run(int argc, CharT const * const argv[]) {
+ if (m_startupExceptions)
+ return 1;
+ int returnCode = applyCommandLine(argc, argv);
+ if (returnCode == 0)
+ returnCode = run();
+ return returnCode;
+ }
+
+ int run();
+
+ clara::Parser const& cli() const;
+ void cli( clara::Parser const& newParser );
+ ConfigData& configData();
+ Config& config();
+ private:
+ int runInternal();
+
+ clara::Parser m_cli;
+ ConfigData m_configData;
+ std::shared_ptr<Config> m_config;
+ bool m_startupExceptions = false;
+ };
+
+} // end namespace Catch
+
+// end catch_session.h
+// start catch_version.h
+
+#include <iosfwd>
+
+namespace Catch {
+
+ // Versioning information
+ struct Version {
+ Version( Version const& ) = delete;
+ Version& operator=( Version const& ) = delete;
+ Version( unsigned int _majorVersion,
+ unsigned int _minorVersion,
+ unsigned int _patchNumber,
+ char const * const _branchName,
+ unsigned int _buildNumber );
+
+ unsigned int const majorVersion;
+ unsigned int const minorVersion;
+ unsigned int const patchNumber;
+
+ // buildNumber is only used if branchName is not null
+ char const * const branchName;
+ unsigned int const buildNumber;
+
+ friend std::ostream& operator << ( std::ostream& os, Version const& version );
+ };
+
+ Version const& libraryVersion();
+}
+
+// end catch_version.h
+#include <cstdlib>
+#include <iomanip>
+
+namespace Catch {
+
+ namespace {
+ const int MaxExitCode = 255;
+
+ IStreamingReporterPtr createReporter(std::string const& reporterName, IConfigPtr const& config) {
+ auto reporter = Catch::getRegistryHub().getReporterRegistry().create(reporterName, config);
+ CATCH_ENFORCE(reporter, "No reporter registered with name: '" << reporterName << "'");
+
+ return reporter;
+ }
+
+ IStreamingReporterPtr makeReporter(std::shared_ptr<Config> const& config) {
+ if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()) {
+ return createReporter(config->getReporterName(), config);
+ }
+
+ // On older platforms, returning std::unique_ptr<ListeningReporter>
+ // when the return type is std::unique_ptr<IStreamingReporter>
+ // doesn't compile without a std::move call. However, this causes
+ // a warning on newer platforms. Thus, we have to work around
+ // it a bit and downcast the pointer manually.
+ auto ret = std::unique_ptr<IStreamingReporter>(new ListeningReporter);
+ auto& multi = static_cast<ListeningReporter&>(*ret);
+ auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
+ for (auto const& listener : listeners) {
+ multi.addListener(listener->create(Catch::ReporterConfig(config)));
+ }
+ multi.addReporter(createReporter(config->getReporterName(), config));
+ return ret;
+ }
+
+ Catch::Totals runTests(std::shared_ptr<Config> const& config) {
+ auto reporter = makeReporter(config);
+
+ RunContext context(config, std::move(reporter));
+
+ Totals totals;
+
+ context.testGroupStarting(config->name(), 1, 1);
+
+ TestSpec testSpec = config->testSpec();
+
+ auto const& allTestCases = getAllTestCasesSorted(*config);
+ for (auto const& testCase : allTestCases) {
+ if (!context.aborting() && matchTest(testCase, testSpec, *config))
+ totals += context.runTest(testCase);
+ else
+ context.reporter().skipTest(testCase);
+ }
+
+ if (config->warnAboutNoTests() && totals.testCases.total() == 0) {
+ ReusableStringStream testConfig;
+
+ bool first = true;
+ for (const auto& input : config->getTestsOrTags()) {
+ if (!first) { testConfig << ' '; }
+ first = false;
+ testConfig << input;
+ }
+
+ context.reporter().noMatchingTestCases(testConfig.str());
+ totals.error = -1;
+ }
+
+ context.testGroupEnded(config->name(), totals, 1, 1);
+ return totals;
+ }
+
+ void applyFilenamesAsTags(Catch::IConfig const& config) {
+ auto& tests = const_cast<std::vector<TestCase>&>(getAllTestCasesSorted(config));
+ for (auto& testCase : tests) {
+ auto tags = testCase.tags;
+
+ std::string filename = testCase.lineInfo.file;
+ auto lastSlash = filename.find_last_of("\\/");
+ if (lastSlash != std::string::npos) {
+ filename.erase(0, lastSlash);
+ filename[0] = '#';
+ }
+
+ auto lastDot = filename.find_last_of('.');
+ if (lastDot != std::string::npos) {
+ filename.erase(lastDot);
+ }
+
+ tags.push_back(std::move(filename));
+ setTags(testCase, tags);
+ }
+ }
+
+ } // anon namespace
+
+ Session::Session() {
+ static bool alreadyInstantiated = false;
+ if( alreadyInstantiated ) {
+ CATCH_TRY { CATCH_INTERNAL_ERROR( "Only one instance of Catch::Session can ever be used" ); }
+ CATCH_CATCH_ALL { getMutableRegistryHub().registerStartupException(); }
+ }
+
+ // There cannot be exceptions at startup in no-exception mode.
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+ const auto& exceptions = getRegistryHub().getStartupExceptionRegistry().getExceptions();
+ if ( !exceptions.empty() ) {
+ m_startupExceptions = true;
+ Colour colourGuard( Colour::Red );
+ Catch::cerr() << "Errors occurred during startup!" << '\n';
+ // iterate over all exceptions and notify user
+ for ( const auto& ex_ptr : exceptions ) {
+ try {
+ std::rethrow_exception(ex_ptr);
+ } catch ( std::exception const& ex ) {
+ Catch::cerr() << Column( ex.what() ).indent(2) << '\n';
+ }
+ }
+ }
+#endif
+
+ alreadyInstantiated = true;
+ m_cli = makeCommandLineParser( m_configData );
+ }
+ Session::~Session() {
+ Catch::cleanUp();
+ }
+
+ void Session::showHelp() const {
+ Catch::cout()
+ << "\nCatch v" << libraryVersion() << "\n"
+ << m_cli << std::endl
+ << "For more detailed usage please see the project docs\n" << std::endl;
+ }
+ void Session::libIdentify() {
+ Catch::cout()
+ << std::left << std::setw(16) << "description: " << "A Catch test executable\n"
+ << std::left << std::setw(16) << "category: " << "testframework\n"
+ << std::left << std::setw(16) << "framework: " << "Catch Test\n"
+ << std::left << std::setw(16) << "version: " << libraryVersion() << std::endl;
+ }
+
+ int Session::applyCommandLine( int argc, char const * const * argv ) {
+ if( m_startupExceptions )
+ return 1;
+
+ auto result = m_cli.parse( clara::Args( argc, argv ) );
+ if( !result ) {
+ Catch::cerr()
+ << Colour( Colour::Red )
+ << "\nError(s) in input:\n"
+ << Column( result.errorMessage() ).indent( 2 )
+ << "\n\n";
+ Catch::cerr() << "Run with -? for usage\n" << std::endl;
+ return MaxExitCode;
+ }
+
+ if( m_configData.showHelp )
+ showHelp();
+ if( m_configData.libIdentify )
+ libIdentify();
+ m_config.reset();
+ return 0;
+ }
+
+#if defined(CATCH_CONFIG_WCHAR) && defined(WIN32) && defined(UNICODE)
+ int Session::applyCommandLine( int argc, wchar_t const * const * argv ) {
+
+ char **utf8Argv = new char *[ argc ];
+
+ for ( int i = 0; i < argc; ++i ) {
+ int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, NULL, 0, NULL, NULL );
+
+ utf8Argv[ i ] = new char[ bufSize ];
+
+ WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, NULL, NULL );
+ }
+
+ int returnCode = applyCommandLine( argc, utf8Argv );
+
+ for ( int i = 0; i < argc; ++i )
+ delete [] utf8Argv[ i ];
+
+ delete [] utf8Argv;
+
+ return returnCode;
+ }
+#endif
+
+ void Session::useConfigData( ConfigData const& configData ) {
+ m_configData = configData;
+ m_config.reset();
+ }
+
+ int Session::run() {
+ if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) {
+ Catch::cout() << "...waiting for enter/ return before starting" << std::endl;
+ static_cast<void>(std::getchar());
+ }
+ int exitCode = runInternal();
+ if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeExit ) != 0 ) {
+ Catch::cout() << "...waiting for enter/ return before exiting, with code: " << exitCode << std::endl;
+ static_cast<void>(std::getchar());
+ }
+ return exitCode;
+ }
+
+ clara::Parser const& Session::cli() const {
+ return m_cli;
+ }
+ void Session::cli( clara::Parser const& newParser ) {
+ m_cli = newParser;
+ }
+ ConfigData& Session::configData() {
+ return m_configData;
+ }
+ Config& Session::config() {
+ if( !m_config )
+ m_config = std::make_shared<Config>( m_configData );
+ return *m_config;
+ }
+
+ int Session::runInternal() {
+ if( m_startupExceptions )
+ return 1;
+
+ if (m_configData.showHelp || m_configData.libIdentify) {
+ return 0;
+ }
+
+ CATCH_TRY {
+ config(); // Force config to be constructed
+
+ seedRng( *m_config );
+
+ if( m_configData.filenamesAsTags )
+ applyFilenamesAsTags( *m_config );
+
+ // Handle list request
+ if( Option<std::size_t> listed = list( config() ) )
+ return static_cast<int>( *listed );
+
+ auto totals = runTests( m_config );
+ // Note that on unices only the lower 8 bits are usually used, clamping
+ // the return value to 255 prevents false negative when some multiple
+ // of 256 tests has failed
+ return (std::min) (MaxExitCode, (std::max) (totals.error, static_cast<int>(totals.assertions.failed)));
+ }
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+ catch( std::exception& ex ) {
+ Catch::cerr() << ex.what() << std::endl;
+ return MaxExitCode;
+ }
+#endif
+ }
+
+} // end namespace Catch
+// end catch_session.cpp
+// start catch_singletons.cpp
+
+#include <vector>
+
+namespace Catch {
+
+ namespace {
+ static auto getSingletons() -> std::vector<ISingleton*>*& {
+ static std::vector<ISingleton*>* g_singletons = nullptr;
+ if( !g_singletons )
+ g_singletons = new std::vector<ISingleton*>();
+ return g_singletons;
+ }
+ }
+
+ ISingleton::~ISingleton() {}
+
+ void addSingleton(ISingleton* singleton ) {
+ getSingletons()->push_back( singleton );
+ }
+ void cleanupSingletons() {
+ auto& singletons = getSingletons();
+ for( auto singleton : *singletons )
+ delete singleton;
+ delete singletons;
+ singletons = nullptr;
+ }
+
+} // namespace Catch
+// end catch_singletons.cpp
+// start catch_startup_exception_registry.cpp
+
+namespace Catch {
+void StartupExceptionRegistry::add( std::exception_ptr const& exception ) noexcept {
+ CATCH_TRY {
+ m_exceptions.push_back(exception);
+ } CATCH_CATCH_ALL {
+ // If we run out of memory during start-up there's really not a lot more we can do about it
+ std::terminate();
+ }
+ }
+
+ std::vector<std::exception_ptr> const& StartupExceptionRegistry::getExceptions() const noexcept {
+ return m_exceptions;
+ }
+
+} // end namespace Catch
+// end catch_startup_exception_registry.cpp
+// start catch_stream.cpp
+
+#include <cstdio>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+ Catch::IStream::~IStream() = default;
+
+ namespace detail { namespace {
+ template<typename WriterF, std::size_t bufferSize=256>
+ class StreamBufImpl : public std::streambuf {
+ char data[bufferSize];
+ WriterF m_writer;
+
+ public:
+ StreamBufImpl() {
+ setp( data, data + sizeof(data) );
+ }
+
+ ~StreamBufImpl() noexcept {
+ StreamBufImpl::sync();
+ }
+
+ private:
+ int overflow( int c ) override {
+ sync();
+
+ if( c != EOF ) {
+ if( pbase() == epptr() )
+ m_writer( std::string( 1, static_cast<char>( c ) ) );
+ else
+ sputc( static_cast<char>( c ) );
+ }
+ return 0;
+ }
+
+ int sync() override {
+ if( pbase() != pptr() ) {
+ m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
+ setp( pbase(), epptr() );
+ }
+ return 0;
+ }
+ };
+
+ ///////////////////////////////////////////////////////////////////////////
+
+ struct OutputDebugWriter {
+
+ void operator()( std::string const&str ) {
+ writeToDebugConsole( str );
+ }
+ };
+
+ ///////////////////////////////////////////////////////////////////////////
+
+ class FileStream : public IStream {
+ mutable std::ofstream m_ofs;
+ public:
+ FileStream( StringRef filename ) {
+ m_ofs.open( filename.c_str() );
+ CATCH_ENFORCE( !m_ofs.fail(), "Unable to open file: '" << filename << "'" );
+ }
+ ~FileStream() override = default;
+ public: // IStream
+ std::ostream& stream() const override {
+ return m_ofs;
+ }
+ };
+
+ ///////////////////////////////////////////////////////////////////////////
+
+ class CoutStream : public IStream {
+ mutable std::ostream m_os;
+ public:
+ // Store the streambuf from cout up-front because
+ // cout may get redirected when running tests
+ CoutStream() : m_os( Catch::cout().rdbuf() ) {}
+ ~CoutStream() override = default;
+
+ public: // IStream
+ std::ostream& stream() const override { return m_os; }
+ };
+
+ ///////////////////////////////////////////////////////////////////////////
+
+ class DebugOutStream : public IStream {
+ std::unique_ptr<StreamBufImpl<OutputDebugWriter>> m_streamBuf;
+ mutable std::ostream m_os;
+ public:
+ DebugOutStream()
+ : m_streamBuf( new StreamBufImpl<OutputDebugWriter>() ),
+ m_os( m_streamBuf.get() )
+ {}
+
+ ~DebugOutStream() override = default;
+
+ public: // IStream
+ std::ostream& stream() const override { return m_os; }
+ };
+
+ }} // namespace anon::detail
+
+ ///////////////////////////////////////////////////////////////////////////
+
+ auto makeStream( StringRef const &filename ) -> IStream const* {
+ if( filename.empty() )
+ return new detail::CoutStream();
+ else if( filename[0] == '%' ) {
+ if( filename == "%debug" )
+ return new detail::DebugOutStream();
+ else
+ CATCH_ERROR( "Unrecognised stream: '" << filename << "'" );
+ }
+ else
+ return new detail::FileStream( filename );
+ }
+
+ // This class encapsulates the idea of a pool of ostringstreams that can be reused.
+ struct StringStreams {
+ std::vector<std::unique_ptr<std::ostringstream>> m_streams;
+ std::vector<std::size_t> m_unused;
+ std::ostringstream m_referenceStream; // Used for copy state/ flags from
+
+ auto add() -> std::size_t {
+ if( m_unused.empty() ) {
+ m_streams.push_back( std::unique_ptr<std::ostringstream>( new std::ostringstream ) );
+ return m_streams.size()-1;
+ }
+ else {
+ auto index = m_unused.back();
+ m_unused.pop_back();
+ return index;
+ }
+ }
+
+ void release( std::size_t index ) {
+ m_streams[index]->copyfmt( m_referenceStream ); // Restore initial flags and other state
+ m_unused.push_back(index);
+ }
+ };
+
+ ReusableStringStream::ReusableStringStream()
+ : m_index( Singleton<StringStreams>::getMutable().add() ),
+ m_oss( Singleton<StringStreams>::getMutable().m_streams[m_index].get() )
+ {}
+
+ ReusableStringStream::~ReusableStringStream() {
+ static_cast<std::ostringstream*>( m_oss )->str("");
+ m_oss->clear();
+ Singleton<StringStreams>::getMutable().release( m_index );
+ }
+
+ auto ReusableStringStream::str() const -> std::string {
+ return static_cast<std::ostringstream*>( m_oss )->str();
+ }
+
+ ///////////////////////////////////////////////////////////////////////////
+
+#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
+ std::ostream& cout() { return std::cout; }
+ std::ostream& cerr() { return std::cerr; }
+ std::ostream& clog() { return std::clog; }
+#endif
+}
+// end catch_stream.cpp
+// start catch_string_manip.cpp
+
+#include <algorithm>
+#include <ostream>
+#include <cstring>
+#include <cctype>
+
+namespace Catch {
+
+ namespace {
+ char toLowerCh(char c) {
+ return static_cast<char>( std::tolower( c ) );
+ }
+ }
+
+ bool startsWith( std::string const& s, std::string const& prefix ) {
+ return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin());
+ }
+ bool startsWith( std::string const& s, char prefix ) {
+ return !s.empty() && s[0] == prefix;
+ }
+ bool endsWith( std::string const& s, std::string const& suffix ) {
+ return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
+ }
+ bool endsWith( std::string const& s, char suffix ) {
+ return !s.empty() && s[s.size()-1] == suffix;
+ }
+ bool contains( std::string const& s, std::string const& infix ) {
+ return s.find( infix ) != std::string::npos;
+ }
+ void toLowerInPlace( std::string& s ) {
+ std::transform( s.begin(), s.end(), s.begin(), toLowerCh );
+ }
+ std::string toLower( std::string const& s ) {
+ std::string lc = s;
+ toLowerInPlace( lc );
+ return lc;
+ }
+ std::string trim( std::string const& str ) {
+ static char const* whitespaceChars = "\n\r\t ";
+ std::string::size_type start = str.find_first_not_of( whitespaceChars );
+ std::string::size_type end = str.find_last_not_of( whitespaceChars );
+
+ return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string();
+ }
+
+ bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
+ bool replaced = false;
+ std::size_t i = str.find( replaceThis );
+ while( i != std::string::npos ) {
+ replaced = true;
+ str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() );
+ if( i < str.size()-withThis.size() )
+ i = str.find( replaceThis, i+withThis.size() );
+ else
+ i = std::string::npos;
+ }
+ return replaced;
+ }
+
+ pluralise::pluralise( std::size_t count, std::string const& label )
+ : m_count( count ),
+ m_label( label )
+ {}
+
+ std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
+ os << pluraliser.m_count << ' ' << pluraliser.m_label;
+ if( pluraliser.m_count != 1 )
+ os << 's';
+ return os;
+ }
+
+}
+// end catch_string_manip.cpp
+// start catch_stringref.cpp
+
+#if defined(__clang__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+#include <ostream>
+#include <cstring>
+#include <cstdint>
+
+namespace {
+ const uint32_t byte_2_lead = 0xC0;
+ const uint32_t byte_3_lead = 0xE0;
+ const uint32_t byte_4_lead = 0xF0;
+}
+
+namespace Catch {
+ StringRef::StringRef( char const* rawChars ) noexcept
+ : StringRef( rawChars, static_cast<StringRef::size_type>(std::strlen(rawChars) ) )
+ {}
+
+ StringRef::operator std::string() const {
+ return std::string( m_start, m_size );
+ }
+
+ void StringRef::swap( StringRef& other ) noexcept {
+ std::swap( m_start, other.m_start );
+ std::swap( m_size, other.m_size );
+ std::swap( m_data, other.m_data );
+ }
+
+ auto StringRef::c_str() const -> char const* {
+ if( isSubstring() )
+ const_cast<StringRef*>( this )->takeOwnership();
+ return m_start;
+ }
+ auto StringRef::currentData() const noexcept -> char const* {
+ return m_start;
+ }
+
+ auto StringRef::isOwned() const noexcept -> bool {
+ return m_data != nullptr;
+ }
+ auto StringRef::isSubstring() const noexcept -> bool {
+ return m_start[m_size] != '\0';
+ }
+
+ void StringRef::takeOwnership() {
+ if( !isOwned() ) {
+ m_data = new char[m_size+1];
+ memcpy( m_data, m_start, m_size );
+ m_data[m_size] = '\0';
+ m_start = m_data;
+ }
+ }
+ auto StringRef::substr( size_type start, size_type size ) const noexcept -> StringRef {
+ if( start < m_size )
+ return StringRef( m_start+start, size );
+ else
+ return StringRef();
+ }
+ auto StringRef::operator == ( StringRef const& other ) const noexcept -> bool {
+ return
+ size() == other.size() &&
+ (std::strncmp( m_start, other.m_start, size() ) == 0);
+ }
+ auto StringRef::operator != ( StringRef const& other ) const noexcept -> bool {
+ return !operator==( other );
+ }
+
+ auto StringRef::operator[](size_type index) const noexcept -> char {
+ return m_start[index];
+ }
+
+ auto StringRef::numberOfCharacters() const noexcept -> size_type {
+ size_type noChars = m_size;
+ // Make adjustments for uft encodings
+ for( size_type i=0; i < m_size; ++i ) {
+ char c = m_start[i];
+ if( ( c & byte_2_lead ) == byte_2_lead ) {
+ noChars--;
+ if (( c & byte_3_lead ) == byte_3_lead )
+ noChars--;
+ if( ( c & byte_4_lead ) == byte_4_lead )
+ noChars--;
+ }
+ }
+ return noChars;
+ }
+
+ auto operator + ( StringRef const& lhs, StringRef const& rhs ) -> std::string {
+ std::string str;
+ str.reserve( lhs.size() + rhs.size() );
+ str += lhs;
+ str += rhs;
+ return str;
+ }
+ auto operator + ( StringRef const& lhs, const char* rhs ) -> std::string {
+ return std::string( lhs ) + std::string( rhs );
+ }
+ auto operator + ( char const* lhs, StringRef const& rhs ) -> std::string {
+ return std::string( lhs ) + std::string( rhs );
+ }
+
+ auto operator << ( std::ostream& os, StringRef const& str ) -> std::ostream& {
+ return os.write(str.currentData(), str.size());
+ }
+
+ auto operator+=( std::string& lhs, StringRef const& rhs ) -> std::string& {
+ lhs.append(rhs.currentData(), rhs.size());
+ return lhs;
+ }
+
+} // namespace Catch
+
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#endif
+// end catch_stringref.cpp
+// start catch_tag_alias.cpp
+
+namespace Catch {
+ TagAlias::TagAlias(std::string const & _tag, SourceLineInfo _lineInfo): tag(_tag), lineInfo(_lineInfo) {}
+}
+// end catch_tag_alias.cpp
+// start catch_tag_alias_autoregistrar.cpp
+
+namespace Catch {
+
+ RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) {
+ CATCH_TRY {
+ getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
+ } CATCH_CATCH_ALL {
+ // Do not throw when constructing global objects, instead register the exception to be processed later
+ getMutableRegistryHub().registerStartupException();
+ }
+ }
+
+}
+// end catch_tag_alias_autoregistrar.cpp
+// start catch_tag_alias_registry.cpp
+
+#include <sstream>
+
+namespace Catch {
+
+ TagAliasRegistry::~TagAliasRegistry() {}
+
+ TagAlias const* TagAliasRegistry::find( std::string const& alias ) const {
+ auto it = m_registry.find( alias );
+ if( it != m_registry.end() )
+ return &(it->second);
+ else
+ return nullptr;
+ }
+
+ std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const {
+ std::string expandedTestSpec = unexpandedTestSpec;
+ for( auto const& registryKvp : m_registry ) {
+ std::size_t pos = expandedTestSpec.find( registryKvp.first );
+ if( pos != std::string::npos ) {
+ expandedTestSpec = expandedTestSpec.substr( 0, pos ) +
+ registryKvp.second.tag +
+ expandedTestSpec.substr( pos + registryKvp.first.size() );
+ }
+ }
+ return expandedTestSpec;
+ }
+
+ void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) {
+ CATCH_ENFORCE( startsWith(alias, "[@") && endsWith(alias, ']'),
+ "error: tag alias, '" << alias << "' is not of the form [@alias name].\n" << lineInfo );
+
+ CATCH_ENFORCE( m_registry.insert(std::make_pair(alias, TagAlias(tag, lineInfo))).second,
+ "error: tag alias, '" << alias << "' already registered.\n"
+ << "\tFirst seen at: " << find(alias)->lineInfo << "\n"
+ << "\tRedefined at: " << lineInfo );
+ }
+
+ ITagAliasRegistry::~ITagAliasRegistry() {}
+
+ ITagAliasRegistry const& ITagAliasRegistry::get() {
+ return getRegistryHub().getTagAliasRegistry();
+ }
+
+} // end namespace Catch
+// end catch_tag_alias_registry.cpp
+// start catch_test_case_info.cpp
+
+#include <cctype>
+#include <exception>
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+ namespace {
+ TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
+ if( startsWith( tag, '.' ) ||
+ tag == "!hide" )
+ return TestCaseInfo::IsHidden;
+ else if( tag == "!throws" )
+ return TestCaseInfo::Throws;
+ else if( tag == "!shouldfail" )
+ return TestCaseInfo::ShouldFail;
+ else if( tag == "!mayfail" )
+ return TestCaseInfo::MayFail;
+ else if( tag == "!nonportable" )
+ return TestCaseInfo::NonPortable;
+ else if( tag == "!benchmark" )
+ return static_cast<TestCaseInfo::SpecialProperties>( TestCaseInfo::Benchmark | TestCaseInfo::IsHidden );
+ else
+ return TestCaseInfo::None;
+ }
+ bool isReservedTag( std::string const& tag ) {
+ return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( static_cast<unsigned char>(tag[0]) );
+ }
+ void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
+ CATCH_ENFORCE( !isReservedTag(tag),
+ "Tag name: [" << tag << "] is not allowed.\n"
+ << "Tag names starting with non alpha-numeric characters are reserved\n"
+ << _lineInfo );
+ }
+ }
+
+ TestCase makeTestCase( ITestInvoker* _testCase,
+ std::string const& _className,
+ NameAndTags const& nameAndTags,
+ SourceLineInfo const& _lineInfo )
+ {
+ bool isHidden = false;
+
+ // Parse out tags
+ std::vector<std::string> tags;
+ std::string desc, tag;
+ bool inTag = false;
+ std::string _descOrTags = nameAndTags.tags;
+ for (char c : _descOrTags) {
+ if( !inTag ) {
+ if( c == '[' )
+ inTag = true;
+ else
+ desc += c;
+ }
+ else {
+ if( c == ']' ) {
+ TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag );
+ if( ( prop & TestCaseInfo::IsHidden ) != 0 )
+ isHidden = true;
+ else if( prop == TestCaseInfo::None )
+ enforceNotReservedTag( tag, _lineInfo );
+
+ tags.push_back( tag );
+ tag.clear();
+ inTag = false;
+ }
+ else
+ tag += c;
+ }
+ }
+ if( isHidden ) {
+ tags.push_back( "." );
+ }
+
+ TestCaseInfo info( nameAndTags.name, _className, desc, tags, _lineInfo );
+ return TestCase( _testCase, std::move(info) );
+ }
+
+ void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags ) {
+ std::sort(begin(tags), end(tags));
+ tags.erase(std::unique(begin(tags), end(tags)), end(tags));
+ testCaseInfo.lcaseTags.clear();
+
+ for( auto const& tag : tags ) {
+ std::string lcaseTag = toLower( tag );
+ testCaseInfo.properties = static_cast<TestCaseInfo::SpecialProperties>( testCaseInfo.properties | parseSpecialTag( lcaseTag ) );
+ testCaseInfo.lcaseTags.push_back( lcaseTag );
+ }
+ testCaseInfo.tags = std::move(tags);
+ }
+
+ TestCaseInfo::TestCaseInfo( std::string const& _name,
+ std::string const& _className,
+ std::string const& _description,
+ std::vector<std::string> const& _tags,
+ SourceLineInfo const& _lineInfo )
+ : name( _name ),
+ className( _className ),
+ description( _description ),
+ lineInfo( _lineInfo ),
+ properties( None )
+ {
+ setTags( *this, _tags );
+ }
+
+ bool TestCaseInfo::isHidden() const {
+ return ( properties & IsHidden ) != 0;
+ }
+ bool TestCaseInfo::throws() const {
+ return ( properties & Throws ) != 0;
+ }
+ bool TestCaseInfo::okToFail() const {
+ return ( properties & (ShouldFail | MayFail ) ) != 0;
+ }
+ bool TestCaseInfo::expectedToFail() const {
+ return ( properties & (ShouldFail ) ) != 0;
+ }
+
+ std::string TestCaseInfo::tagsAsString() const {
+ std::string ret;
+ // '[' and ']' per tag
+ std::size_t full_size = 2 * tags.size();
+ for (const auto& tag : tags) {
+ full_size += tag.size();
+ }
+ ret.reserve(full_size);
+ for (const auto& tag : tags) {
+ ret.push_back('[');
+ ret.append(tag);
+ ret.push_back(']');
+ }
+
+ return ret;
+ }
+
+ TestCase::TestCase( ITestInvoker* testCase, TestCaseInfo&& info ) : TestCaseInfo( std::move(info) ), test( testCase ) {}
+
+ TestCase TestCase::withName( std::string const& _newName ) const {
+ TestCase other( *this );
+ other.name = _newName;
+ return other;
+ }
+
+ void TestCase::invoke() const {
+ test->invoke();
+ }
+
+ bool TestCase::operator == ( TestCase const& other ) const {
+ return test.get() == other.test.get() &&
+ name == other.name &&
+ className == other.className;
+ }
+
+ bool TestCase::operator < ( TestCase const& other ) const {
+ return name < other.name;
+ }
+
+ TestCaseInfo const& TestCase::getTestCaseInfo() const
+ {
+ return *this;
+ }
+
+} // end namespace Catch
+// end catch_test_case_info.cpp
+// start catch_test_case_registry_impl.cpp
+
+#include <sstream>
+
+namespace Catch {
+
+ std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
+
+ std::vector<TestCase> sorted = unsortedTestCases;
+
+ switch( config.runOrder() ) {
+ case RunTests::InLexicographicalOrder:
+ std::sort( sorted.begin(), sorted.end() );
+ break;
+ case RunTests::InRandomOrder:
+ seedRng( config );
+ std::shuffle( sorted.begin(), sorted.end(), rng() );
+ break;
+ case RunTests::InDeclarationOrder:
+ // already in declaration order
+ break;
+ }
+ return sorted;
+ }
+ bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
+ return testSpec.matches( testCase ) && ( config.allowThrows() || !testCase.throws() );
+ }
+
+ void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
+ std::set<TestCase> seenFunctions;
+ for( auto const& function : functions ) {
+ auto prev = seenFunctions.insert( function );
+ CATCH_ENFORCE( prev.second,
+ "error: TEST_CASE( \"" << function.name << "\" ) already defined.\n"
+ << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n"
+ << "\tRedefined at " << function.getTestCaseInfo().lineInfo );
+ }
+ }
+
+ std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
+ std::vector<TestCase> filtered;
+ filtered.reserve( testCases.size() );
+ for( auto const& testCase : testCases )
+ if( matchTest( testCase, testSpec, config ) )
+ filtered.push_back( testCase );
+ return filtered;
+ }
+ std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
+ return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
+ }
+
+ void TestRegistry::registerTest( TestCase const& testCase ) {
+ std::string name = testCase.getTestCaseInfo().name;
+ if( name.empty() ) {
+ ReusableStringStream rss;
+ rss << "Anonymous test case " << ++m_unnamedCount;
+ return registerTest( testCase.withName( rss.str() ) );
+ }
+ m_functions.push_back( testCase );
+ }
+
+ std::vector<TestCase> const& TestRegistry::getAllTests() const {
+ return m_functions;
+ }
+ std::vector<TestCase> const& TestRegistry::getAllTestsSorted( IConfig const& config ) const {
+ if( m_sortedFunctions.empty() )
+ enforceNoDuplicateTestCases( m_functions );
+
+ if( m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
+ m_sortedFunctions = sortTests( config, m_functions );
+ m_currentSortOrder = config.runOrder();
+ }
+ return m_sortedFunctions;
+ }
+
+ ///////////////////////////////////////////////////////////////////////////
+ TestInvokerAsFunction::TestInvokerAsFunction( void(*testAsFunction)() ) noexcept : m_testAsFunction( testAsFunction ) {}
+
+ void TestInvokerAsFunction::invoke() const {
+ m_testAsFunction();
+ }
+
+ std::string extractClassName( StringRef const& classOrQualifiedMethodName ) {
+ std::string className = classOrQualifiedMethodName;
+ if( startsWith( className, '&' ) )
+ {
+ std::size_t lastColons = className.rfind( "::" );
+ std::size_t penultimateColons = className.rfind( "::", lastColons-1 );
+ if( penultimateColons == std::string::npos )
+ penultimateColons = 1;
+ className = className.substr( penultimateColons, lastColons-penultimateColons );
+ }
+ return className;
+ }
+
+} // end namespace Catch
+// end catch_test_case_registry_impl.cpp
+// start catch_test_case_tracker.cpp
+
+#include <algorithm>
+#include <cassert>
+#include <stdexcept>
+#include <memory>
+#include <sstream>
+
+#if defined(__clang__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+namespace Catch {
+namespace TestCaseTracking {
+
+ NameAndLocation::NameAndLocation( std::string const& _name, SourceLineInfo const& _location )
+ : name( _name ),
+ location( _location )
+ {}
+
+ ITracker::~ITracker() = default;
+
+ TrackerContext& TrackerContext::instance() {
+ static TrackerContext s_instance;
+ return s_instance;
+ }
+
+ ITracker& TrackerContext::startRun() {
+ m_rootTracker = std::make_shared<SectionTracker>( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, nullptr );
+ m_currentTracker = nullptr;
+ m_runState = Executing;
+ return *m_rootTracker;
+ }
+
+ void TrackerContext::endRun() {
+ m_rootTracker.reset();
+ m_currentTracker = nullptr;
+ m_runState = NotStarted;
+ }
+
+ void TrackerContext::startCycle() {
+ m_currentTracker = m_rootTracker.get();
+ m_runState = Executing;
+ }
+ void TrackerContext::completeCycle() {
+ m_runState = CompletedCycle;
+ }
+
+ bool TrackerContext::completedCycle() const {
+ return m_runState == CompletedCycle;
+ }
+ ITracker& TrackerContext::currentTracker() {
+ return *m_currentTracker;
+ }
+ void TrackerContext::setCurrentTracker( ITracker* tracker ) {
+ m_currentTracker = tracker;
+ }
+
+ TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+ : m_nameAndLocation( nameAndLocation ),
+ m_ctx( ctx ),
+ m_parent( parent )
+ {}
+
+ NameAndLocation const& TrackerBase::nameAndLocation() const {
+ return m_nameAndLocation;
+ }
+ bool TrackerBase::isComplete() const {
+ return m_runState == CompletedSuccessfully || m_runState == Failed;
+ }
+ bool TrackerBase::isSuccessfullyCompleted() const {
+ return m_runState == CompletedSuccessfully;
+ }
+ bool TrackerBase::isOpen() const {
+ return m_runState != NotStarted && !isComplete();
+ }
+ bool TrackerBase::hasChildren() const {
+ return !m_children.empty();
+ }
+
+ void TrackerBase::addChild( ITrackerPtr const& child ) {
+ m_children.push_back( child );
+ }
+
+ ITrackerPtr TrackerBase::findChild( NameAndLocation const& nameAndLocation ) {
+ auto it = std::find_if( m_children.begin(), m_children.end(),
+ [&nameAndLocation]( ITrackerPtr const& tracker ){
+ return
+ tracker->nameAndLocation().location == nameAndLocation.location &&
+ tracker->nameAndLocation().name == nameAndLocation.name;
+ } );
+ return( it != m_children.end() )
+ ? *it
+ : nullptr;
+ }
+ ITracker& TrackerBase::parent() {
+ assert( m_parent ); // Should always be non-null except for root
+ return *m_parent;
+ }
+
+ void TrackerBase::openChild() {
+ if( m_runState != ExecutingChildren ) {
+ m_runState = ExecutingChildren;
+ if( m_parent )
+ m_parent->openChild();
+ }
+ }
+
+ bool TrackerBase::isSectionTracker() const { return false; }
+ bool TrackerBase::isGeneratorTracker() const { return false; }
+
+ void TrackerBase::open() {
+ m_runState = Executing;
+ moveToThis();
+ if( m_parent )
+ m_parent->openChild();
+ }
+
+ void TrackerBase::close() {
+
+ // Close any still open children (e.g. generators)
+ while( &m_ctx.currentTracker() != this )
+ m_ctx.currentTracker().close();
+
+ switch( m_runState ) {
+ case NeedsAnotherRun:
+ break;
+
+ case Executing:
+ m_runState = CompletedSuccessfully;
+ break;
+ case ExecutingChildren:
+ if( m_children.empty() || m_children.back()->isComplete() )
+ m_runState = CompletedSuccessfully;
+ break;
+
+ case NotStarted:
+ case CompletedSuccessfully:
+ case Failed:
+ CATCH_INTERNAL_ERROR( "Illogical state: " << m_runState );
+
+ default:
+ CATCH_INTERNAL_ERROR( "Unknown state: " << m_runState );
+ }
+ moveToParent();
+ m_ctx.completeCycle();
+ }
+ void TrackerBase::fail() {
+ m_runState = Failed;
+ if( m_parent )
+ m_parent->markAsNeedingAnotherRun();
+ moveToParent();
+ m_ctx.completeCycle();
+ }
+ void TrackerBase::markAsNeedingAnotherRun() {
+ m_runState = NeedsAnotherRun;
+ }
+
+ void TrackerBase::moveToParent() {
+ assert( m_parent );
+ m_ctx.setCurrentTracker( m_parent );
+ }
+ void TrackerBase::moveToThis() {
+ m_ctx.setCurrentTracker( this );
+ }
+
+ SectionTracker::SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+ : TrackerBase( nameAndLocation, ctx, parent )
+ {
+ if( parent ) {
+ while( !parent->isSectionTracker() )
+ parent = &parent->parent();
+
+ SectionTracker& parentSection = static_cast<SectionTracker&>( *parent );
+ addNextFilters( parentSection.m_filters );
+ }
+ }
+
+ bool SectionTracker::isComplete() const {
+ bool complete = true;
+
+ if ((m_filters.empty() || m_filters[0] == "") ||
+ std::find(m_filters.begin(), m_filters.end(),
+ m_nameAndLocation.name) != m_filters.end())
+ complete = TrackerBase::isComplete();
+ return complete;
+
+ }
+
+ bool SectionTracker::isSectionTracker() const { return true; }
+
+ SectionTracker& SectionTracker::acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) {
+ std::shared_ptr<SectionTracker> section;
+
+ ITracker& currentTracker = ctx.currentTracker();
+ if( ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
+ assert( childTracker );
+ assert( childTracker->isSectionTracker() );
+ section = std::static_pointer_cast<SectionTracker>( childTracker );
+ }
+ else {
+ section = std::make_shared<SectionTracker>( nameAndLocation, ctx, ¤tTracker );
+ currentTracker.addChild( section );
+ }
+ if( !ctx.completedCycle() )
+ section->tryOpen();
+ return *section;
+ }
+
+ void SectionTracker::tryOpen() {
+ if( !isComplete() && (m_filters.empty() || m_filters[0].empty() || m_filters[0] == m_nameAndLocation.name ) )
+ open();
+ }
+
+ void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) {
+ if( !filters.empty() ) {
+ m_filters.push_back(""); // Root - should never be consulted
+ m_filters.push_back(""); // Test Case - not a section filter
+ m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
+ }
+ }
+ void SectionTracker::addNextFilters( std::vector<std::string> const& filters ) {
+ if( filters.size() > 1 )
+ m_filters.insert( m_filters.end(), ++filters.begin(), filters.end() );
+ }
+
+} // namespace TestCaseTracking
+
+using TestCaseTracking::ITracker;
+using TestCaseTracking::TrackerContext;
+using TestCaseTracking::SectionTracker;
+
+} // namespace Catch
+
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#endif
+// end catch_test_case_tracker.cpp
+// start catch_test_registry.cpp
+
+namespace Catch {
+
+ auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker* {
+ return new(std::nothrow) TestInvokerAsFunction( testAsFunction );
+ }
+
+ NameAndTags::NameAndTags( StringRef const& name_ , StringRef const& tags_ ) noexcept : name( name_ ), tags( tags_ ) {}
+
+ AutoReg::AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept {
+ CATCH_TRY {
+ getMutableRegistryHub()
+ .registerTest(
+ makeTestCase(
+ invoker,
+ extractClassName( classOrMethod ),
+ nameAndTags,
+ lineInfo));
+ } CATCH_CATCH_ALL {
+ // Do not throw when constructing global objects, instead register the exception to be processed later
+ getMutableRegistryHub().registerStartupException();
+ }
+ }
+
+ AutoReg::~AutoReg() = default;
+}
+// end catch_test_registry.cpp
+// start catch_test_spec.cpp
+
+#include <algorithm>
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+ TestSpec::Pattern::~Pattern() = default;
+ TestSpec::NamePattern::~NamePattern() = default;
+ TestSpec::TagPattern::~TagPattern() = default;
+ TestSpec::ExcludedPattern::~ExcludedPattern() = default;
+
+ TestSpec::NamePattern::NamePattern( std::string const& name )
+ : m_wildcardPattern( toLower( name ), CaseSensitive::No )
+ {}
+ bool TestSpec::NamePattern::matches( TestCaseInfo const& testCase ) const {
+ return m_wildcardPattern.matches( toLower( testCase.name ) );
+ }
+
+ TestSpec::TagPattern::TagPattern( std::string const& tag ) : m_tag( toLower( tag ) ) {}
+ bool TestSpec::TagPattern::matches( TestCaseInfo const& testCase ) const {
+ return std::find(begin(testCase.lcaseTags),
+ end(testCase.lcaseTags),
+ m_tag) != end(testCase.lcaseTags);
+ }
+
+ TestSpec::ExcludedPattern::ExcludedPattern( PatternPtr const& underlyingPattern ) : m_underlyingPattern( underlyingPattern ) {}
+ bool TestSpec::ExcludedPattern::matches( TestCaseInfo const& testCase ) const { return !m_underlyingPattern->matches( testCase ); }
+
+ bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const {
+ // All patterns in a filter must match for the filter to be a match
+ for( auto const& pattern : m_patterns ) {
+ if( !pattern->matches( testCase ) )
+ return false;
+ }
+ return true;
+ }
+
+ bool TestSpec::hasFilters() const {
+ return !m_filters.empty();
+ }
+ bool TestSpec::matches( TestCaseInfo const& testCase ) const {
+ // A TestSpec matches if any filter matches
+ for( auto const& filter : m_filters )
+ if( filter.matches( testCase ) )
+ return true;
+ return false;
+ }
+}
+// end catch_test_spec.cpp
+// start catch_test_spec_parser.cpp
+
+namespace Catch {
+
+ TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
+
+ TestSpecParser& TestSpecParser::parse( std::string const& arg ) {
+ m_mode = None;
+ m_exclusion = false;
+ m_start = std::string::npos;
+ m_arg = m_tagAliases->expandAliases( arg );
+ m_escapeChars.clear();
+ for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
+ visitChar( m_arg[m_pos] );
+ if( m_mode == Name )
+ addPattern<TestSpec::NamePattern>();
+ return *this;
+ }
+ TestSpec TestSpecParser::testSpec() {
+ addFilter();
+ return m_testSpec;
+ }
+
+ void TestSpecParser::visitChar( char c ) {
+ if( m_mode == None ) {
+ switch( c ) {
+ case ' ': return;
+ case '~': m_exclusion = true; return;
+ case '[': return startNewMode( Tag, ++m_pos );
+ case '"': return startNewMode( QuotedName, ++m_pos );
+ case '\\': return escape();
+ default: startNewMode( Name, m_pos ); break;
+ }
+ }
+ if( m_mode == Name ) {
+ if( c == ',' ) {
+ addPattern<TestSpec::NamePattern>();
+ addFilter();
+ }
+ else if( c == '[' ) {
+ if( subString() == "exclude:" )
+ m_exclusion = true;
+ else
+ addPattern<TestSpec::NamePattern>();
+ startNewMode( Tag, ++m_pos );
+ }
+ else if( c == '\\' )
+ escape();
+ }
+ else if( m_mode == EscapedName )
+ m_mode = Name;
+ else if( m_mode == QuotedName && c == '"' )
+ addPattern<TestSpec::NamePattern>();
+ else if( m_mode == Tag && c == ']' )
+ addPattern<TestSpec::TagPattern>();
+ }
+ void TestSpecParser::startNewMode( Mode mode, std::size_t start ) {
+ m_mode = mode;
+ m_start = start;
+ }
+ void TestSpecParser::escape() {
+ if( m_mode == None )
+ m_start = m_pos;
+ m_mode = EscapedName;
+ m_escapeChars.push_back( m_pos );
+ }
+ std::string TestSpecParser::subString() const { return m_arg.substr( m_start, m_pos - m_start ); }
+
+ void TestSpecParser::addFilter() {
+ if( !m_currentFilter.m_patterns.empty() ) {
+ m_testSpec.m_filters.push_back( m_currentFilter );
+ m_currentFilter = TestSpec::Filter();
+ }
+ }
+
+ TestSpec parseTestSpec( std::string const& arg ) {
+ return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
+ }
+
+} // namespace Catch
+// end catch_test_spec_parser.cpp
+// start catch_timer.cpp
+
+#include <chrono>
+
+static const uint64_t nanosecondsInSecond = 1000000000;
+
+namespace Catch {
+
+ auto getCurrentNanosecondsSinceEpoch() -> uint64_t {
+ return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count();
+ }
+
+ namespace {
+ auto estimateClockResolution() -> uint64_t {
+ uint64_t sum = 0;
+ static const uint64_t iterations = 1000000;
+
+ auto startTime = getCurrentNanosecondsSinceEpoch();
+
+ for( std::size_t i = 0; i < iterations; ++i ) {
+
+ uint64_t ticks;
+ uint64_t baseTicks = getCurrentNanosecondsSinceEpoch();
+ do {
+ ticks = getCurrentNanosecondsSinceEpoch();
+ } while( ticks == baseTicks );
+
+ auto delta = ticks - baseTicks;
+ sum += delta;
+
+ // If we have been calibrating for over 3 seconds -- the clock
+ // is terrible and we should move on.
+ // TBD: How to signal that the measured resolution is probably wrong?
+ if (ticks > startTime + 3 * nanosecondsInSecond) {
+ return sum / ( i + 1u );
+ }
+ }
+
+ // We're just taking the mean, here. To do better we could take the std. dev and exclude outliers
+ // - and potentially do more iterations if there's a high variance.
+ return sum/iterations;
+ }
+ }
+ auto getEstimatedClockResolution() -> uint64_t {
+ static auto s_resolution = estimateClockResolution();
+ return s_resolution;
+ }
+
+ void Timer::start() {
+ m_nanoseconds = getCurrentNanosecondsSinceEpoch();
+ }
+ auto Timer::getElapsedNanoseconds() const -> uint64_t {
+ return getCurrentNanosecondsSinceEpoch() - m_nanoseconds;
+ }
+ auto Timer::getElapsedMicroseconds() const -> uint64_t {
+ return getElapsedNanoseconds()/1000;
+ }
+ auto Timer::getElapsedMilliseconds() const -> unsigned int {
+ return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
+ }
+ auto Timer::getElapsedSeconds() const -> double {
+ return getElapsedMicroseconds()/1000000.0;
+ }
+
+} // namespace Catch
+// end catch_timer.cpp
+// start catch_tostring.cpp
+
+#if defined(__clang__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wexit-time-destructors"
+# pragma clang diagnostic ignored "-Wglobal-constructors"
+#endif
+
+// Enable specific decls locally
+#if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#endif
+
+#include <cmath>
+#include <iomanip>
+
+namespace Catch {
+
+namespace Detail {
+
+ const std::string unprintableString = "{?}";
+
+ namespace {
+ const int hexThreshold = 255;
+
+ struct Endianness {
+ enum Arch { Big, Little };
+
+ static Arch which() {
+ union _{
+ int asInt;
+ char asChar[sizeof (int)];
+ } u;
+
+ u.asInt = 1;
+ return ( u.asChar[sizeof(int)-1] == 1 ) ? Big : Little;
+ }
+ };
+ }
+
+ std::string rawMemoryToString( const void *object, std::size_t size ) {
+ // Reverse order for little endian architectures
+ int i = 0, end = static_cast<int>( size ), inc = 1;
+ if( Endianness::which() == Endianness::Little ) {
+ i = end-1;
+ end = inc = -1;
+ }
+
+ unsigned char const *bytes = static_cast<unsigned char const *>(object);
+ ReusableStringStream rss;
+ rss << "0x" << std::setfill('0') << std::hex;
+ for( ; i != end; i += inc )
+ rss << std::setw(2) << static_cast<unsigned>(bytes[i]);
+ return rss.str();
+ }
+}
+
+template<typename T>
+std::string fpToString( T value, int precision ) {
+ if (Catch::isnan(value)) {
+ return "nan";
+ }
+
+ ReusableStringStream rss;
+ rss << std::setprecision( precision )
+ << std::fixed
+ << value;
+ std::string d = rss.str();
+ std::size_t i = d.find_last_not_of( '0' );
+ if( i != std::string::npos && i != d.size()-1 ) {
+ if( d[i] == '.' )
+ i++;
+ d = d.substr( 0, i+1 );
+ }
+ return d;
+}
+
+//// ======================================================= ////
+//
+// Out-of-line defs for full specialization of StringMaker
+//
+//// ======================================================= ////
+
+std::string StringMaker<std::string>::convert(const std::string& str) {
+ if (!getCurrentContext().getConfig()->showInvisibles()) {
+ return '"' + str + '"';
+ }
+
+ std::string s("\"");
+ for (char c : str) {
+ switch (c) {
+ case '\n':
+ s.append("\\n");
+ break;
+ case '\t':
+ s.append("\\t");
+ break;
+ default:
+ s.push_back(c);
+ break;
+ }
+ }
+ s.append("\"");
+ return s;
+}
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+std::string StringMaker<std::string_view>::convert(std::string_view str) {
+ return ::Catch::Detail::stringify(std::string{ str });
+}
+#endif
+
+std::string StringMaker<char const*>::convert(char const* str) {
+ if (str) {
+ return ::Catch::Detail::stringify(std::string{ str });
+ } else {
+ return{ "{null string}" };
+ }
+}
+std::string StringMaker<char*>::convert(char* str) {
+ if (str) {
+ return ::Catch::Detail::stringify(std::string{ str });
+ } else {
+ return{ "{null string}" };
+ }
+}
+
+#ifdef CATCH_CONFIG_WCHAR
+std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
+ std::string s;
+ s.reserve(wstr.size());
+ for (auto c : wstr) {
+ s += (c <= 0xff) ? static_cast<char>(c) : '?';
+ }
+ return ::Catch::Detail::stringify(s);
+}
+
+# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+std::string StringMaker<std::wstring_view>::convert(std::wstring_view str) {
+ return StringMaker<std::wstring>::convert(std::wstring(str));
+}
+# endif
+
+std::string StringMaker<wchar_t const*>::convert(wchar_t const * str) {
+ if (str) {
+ return ::Catch::Detail::stringify(std::wstring{ str });
+ } else {
+ return{ "{null string}" };
+ }
+}
+std::string StringMaker<wchar_t *>::convert(wchar_t * str) {
+ if (str) {
+ return ::Catch::Detail::stringify(std::wstring{ str });
+ } else {
+ return{ "{null string}" };
+ }
+}
+#endif
+
+std::string StringMaker<int>::convert(int value) {
+ return ::Catch::Detail::stringify(static_cast<long long>(value));
+}
+std::string StringMaker<long>::convert(long value) {
+ return ::Catch::Detail::stringify(static_cast<long long>(value));
+}
+std::string StringMaker<long long>::convert(long long value) {
+ ReusableStringStream rss;
+ rss << value;
+ if (value > Detail::hexThreshold) {
+ rss << " (0x" << std::hex << value << ')';
+ }
+ return rss.str();
+}
+
+std::string StringMaker<unsigned int>::convert(unsigned int value) {
+ return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
+}
+std::string StringMaker<unsigned long>::convert(unsigned long value) {
+ return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
+}
+std::string StringMaker<unsigned long long>::convert(unsigned long long value) {
+ ReusableStringStream rss;
+ rss << value;
+ if (value > Detail::hexThreshold) {
+ rss << " (0x" << std::hex << value << ')';
+ }
+ return rss.str();
+}
+
+std::string StringMaker<bool>::convert(bool b) {
+ return b ? "true" : "false";
+}
+
+std::string StringMaker<signed char>::convert(signed char value) {
+ if (value == '\r') {
+ return "'\\r'";
+ } else if (value == '\f') {
+ return "'\\f'";
+ } else if (value == '\n') {
+ return "'\\n'";
+ } else if (value == '\t') {
+ return "'\\t'";
+ } else if ('\0' <= value && value < ' ') {
+ return ::Catch::Detail::stringify(static_cast<unsigned int>(value));
+ } else {
+ char chstr[] = "' '";
+ chstr[1] = value;
+ return chstr;
+ }
+}
+std::string StringMaker<char>::convert(char c) {
+ return ::Catch::Detail::stringify(static_cast<signed char>(c));
+}
+std::string StringMaker<unsigned char>::convert(unsigned char c) {
+ return ::Catch::Detail::stringify(static_cast<char>(c));
+}
+
+std::string StringMaker<std::nullptr_t>::convert(std::nullptr_t) {
+ return "nullptr";
+}
+
+std::string StringMaker<float>::convert(float value) {
+ return fpToString(value, 5) + 'f';
+}
+std::string StringMaker<double>::convert(double value) {
+ return fpToString(value, 10);
+}
+
+std::string ratio_string<std::atto>::symbol() { return "a"; }
+std::string ratio_string<std::femto>::symbol() { return "f"; }
+std::string ratio_string<std::pico>::symbol() { return "p"; }
+std::string ratio_string<std::nano>::symbol() { return "n"; }
+std::string ratio_string<std::micro>::symbol() { return "u"; }
+std::string ratio_string<std::milli>::symbol() { return "m"; }
+
+} // end namespace Catch
+
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#endif
+
+// end catch_tostring.cpp
+// start catch_totals.cpp
+
+namespace Catch {
+
+ Counts Counts::operator - ( Counts const& other ) const {
+ Counts diff;
+ diff.passed = passed - other.passed;
+ diff.failed = failed - other.failed;
+ diff.failedButOk = failedButOk - other.failedButOk;
+ return diff;
+ }
+
+ Counts& Counts::operator += ( Counts const& other ) {
+ passed += other.passed;
+ failed += other.failed;
+ failedButOk += other.failedButOk;
+ return *this;
+ }
+
+ std::size_t Counts::total() const {
+ return passed + failed + failedButOk;
+ }
+ bool Counts::allPassed() const {
+ return failed == 0 && failedButOk == 0;
+ }
+ bool Counts::allOk() const {
+ return failed == 0;
+ }
+
+ Totals Totals::operator - ( Totals const& other ) const {
+ Totals diff;
+ diff.assertions = assertions - other.assertions;
+ diff.testCases = testCases - other.testCases;
+ return diff;
+ }
+
+ Totals& Totals::operator += ( Totals const& other ) {
+ assertions += other.assertions;
+ testCases += other.testCases;
+ return *this;
+ }
+
+ Totals Totals::delta( Totals const& prevTotals ) const {
+ Totals diff = *this - prevTotals;
+ if( diff.assertions.failed > 0 )
+ ++diff.testCases.failed;
+ else if( diff.assertions.failedButOk > 0 )
+ ++diff.testCases.failedButOk;
+ else
+ ++diff.testCases.passed;
+ return diff;
+ }
+
+}
+// end catch_totals.cpp
+// start catch_uncaught_exceptions.cpp
+
+#include <exception>
+
+namespace Catch {
+ bool uncaught_exceptions() {
+#if defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+ return std::uncaught_exceptions() > 0;
+#else
+ return std::uncaught_exception();
+#endif
+ }
+} // end namespace Catch
+// end catch_uncaught_exceptions.cpp
+// start catch_version.cpp
+
+#include <ostream>
+
+namespace Catch {
+
+ Version::Version
+ ( unsigned int _majorVersion,
+ unsigned int _minorVersion,
+ unsigned int _patchNumber,
+ char const * const _branchName,
+ unsigned int _buildNumber )
+ : majorVersion( _majorVersion ),
+ minorVersion( _minorVersion ),
+ patchNumber( _patchNumber ),
+ branchName( _branchName ),
+ buildNumber( _buildNumber )
+ {}
+
+ std::ostream& operator << ( std::ostream& os, Version const& version ) {
+ os << version.majorVersion << '.'
+ << version.minorVersion << '.'
+ << version.patchNumber;
+ // branchName is never null -> 0th char is \0 if it is empty
+ if (version.branchName[0]) {
+ os << '-' << version.branchName
+ << '.' << version.buildNumber;
+ }
+ return os;
+ }
+
+ Version const& libraryVersion() {
+ static Version version( 2, 6, 0, "", 0 );
+ return version;
+ }
+
+}
+// end catch_version.cpp
+// start catch_wildcard_pattern.cpp
+
+#include <sstream>
+
+namespace Catch {
+
+ WildcardPattern::WildcardPattern( std::string const& pattern,
+ CaseSensitive::Choice caseSensitivity )
+ : m_caseSensitivity( caseSensitivity ),
+ m_pattern( adjustCase( pattern ) )
+ {
+ if( startsWith( m_pattern, '*' ) ) {
+ m_pattern = m_pattern.substr( 1 );
+ m_wildcard = WildcardAtStart;
+ }
+ if( endsWith( m_pattern, '*' ) ) {
+ m_pattern = m_pattern.substr( 0, m_pattern.size()-1 );
+ m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd );
+ }
+ }
+
+ bool WildcardPattern::matches( std::string const& str ) const {
+ switch( m_wildcard ) {
+ case NoWildcard:
+ return m_pattern == adjustCase( str );
+ case WildcardAtStart:
+ return endsWith( adjustCase( str ), m_pattern );
+ case WildcardAtEnd:
+ return startsWith( adjustCase( str ), m_pattern );
+ case WildcardAtBothEnds:
+ return contains( adjustCase( str ), m_pattern );
+ default:
+ CATCH_INTERNAL_ERROR( "Unknown enum" );
+ }
+ }
+
+ std::string WildcardPattern::adjustCase( std::string const& str ) const {
+ return m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str;
+ }
+}
+// end catch_wildcard_pattern.cpp
+// start catch_xmlwriter.cpp
+
+#include <iomanip>
+
+using uchar = unsigned char;
+
+namespace Catch {
+
+namespace {
+
+ size_t trailingBytes(unsigned char c) {
+ if ((c & 0xE0) == 0xC0) {
+ return 2;
+ }
+ if ((c & 0xF0) == 0xE0) {
+ return 3;
+ }
+ if ((c & 0xF8) == 0xF0) {
+ return 4;
+ }
+ CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+ }
+
+ uint32_t headerValue(unsigned char c) {
+ if ((c & 0xE0) == 0xC0) {
+ return c & 0x1F;
+ }
+ if ((c & 0xF0) == 0xE0) {
+ return c & 0x0F;
+ }
+ if ((c & 0xF8) == 0xF0) {
+ return c & 0x07;
+ }
+ CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+ }
+
+ void hexEscapeChar(std::ostream& os, unsigned char c) {
+ std::ios_base::fmtflags f(os.flags());
+ os << "\\x"
+ << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
+ << static_cast<int>(c);
+ os.flags(f);
+ }
+
+} // anonymous namespace
+
+ XmlEncode::XmlEncode( std::string const& str, ForWhat forWhat )
+ : m_str( str ),
+ m_forWhat( forWhat )
+ {}
+
+ void XmlEncode::encodeTo( std::ostream& os ) const {
+ // Apostrophe escaping not necessary if we always use " to write attributes
+ // (see: http://www.w3.org/TR/xml/#syntax)
+
+ for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
+ uchar c = m_str[idx];
+ switch (c) {
+ case '<': os << "<"; break;
+ case '&': os << "&"; break;
+
+ case '>':
+ // See: http://www.w3.org/TR/xml/#syntax
+ if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']')
+ os << ">";
+ else
+ os << c;
+ break;
+
+ case '\"':
+ if (m_forWhat == ForAttributes)
+ os << """;
+ else
+ os << c;
+ break;
+
+ default:
+ // Check for control characters and invalid utf-8
+
+ // Escape control characters in standard ascii
+ // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
+ if (c < 0x09 || (c > 0x0D && c < 0x20) || c == 0x7F) {
+ hexEscapeChar(os, c);
+ break;
+ }
+
+ // Plain ASCII: Write it to stream
+ if (c < 0x7F) {
+ os << c;
+ break;
+ }
+
+ // UTF-8 territory
+ // Check if the encoding is valid and if it is not, hex escape bytes.
+ // Important: We do not check the exact decoded values for validity, only the encoding format
+ // First check that this bytes is a valid lead byte:
+ // This means that it is not encoded as 1111 1XXX
+ // Or as 10XX XXXX
+ if (c < 0xC0 ||
+ c >= 0xF8) {
+ hexEscapeChar(os, c);
+ break;
+ }
+
+ auto encBytes = trailingBytes(c);
+ // Are there enough bytes left to avoid accessing out-of-bounds memory?
+ if (idx + encBytes - 1 >= m_str.size()) {
+ hexEscapeChar(os, c);
+ break;
+ }
+ // The header is valid, check data
+ // The next encBytes bytes must together be a valid utf-8
+ // This means: bitpattern 10XX XXXX and the extracted value is sane (ish)
+ bool valid = true;
+ uint32_t value = headerValue(c);
+ for (std::size_t n = 1; n < encBytes; ++n) {
+ uchar nc = m_str[idx + n];
+ valid &= ((nc & 0xC0) == 0x80);
+ value = (value << 6) | (nc & 0x3F);
+ }
+
+ if (
+ // Wrong bit pattern of following bytes
+ (!valid) ||
+ // Overlong encodings
+ (value < 0x80) ||
+ (0x80 <= value && value < 0x800 && encBytes > 2) ||
+ (0x800 < value && value < 0x10000 && encBytes > 3) ||
+ // Encoded value out of range
+ (value >= 0x110000)
+ ) {
+ hexEscapeChar(os, c);
+ break;
+ }
+
+ // If we got here, this is in fact a valid(ish) utf-8 sequence
+ for (std::size_t n = 0; n < encBytes; ++n) {
+ os << m_str[idx + n];
+ }
+ idx += encBytes - 1;
+ break;
+ }
+ }
+ }
+
+ std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
+ xmlEncode.encodeTo( os );
+ return os;
+ }
+
+ XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer )
+ : m_writer( writer )
+ {}
+
+ XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) noexcept
+ : m_writer( other.m_writer ){
+ other.m_writer = nullptr;
+ }
+ XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) noexcept {
+ if ( m_writer ) {
+ m_writer->endElement();
+ }
+ m_writer = other.m_writer;
+ other.m_writer = nullptr;
+ return *this;
+ }
+
+ XmlWriter::ScopedElement::~ScopedElement() {
+ if( m_writer )
+ m_writer->endElement();
+ }
+
+ XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, bool indent ) {
+ m_writer->writeText( text, indent );
+ return *this;
+ }
+
+ XmlWriter::XmlWriter( std::ostream& os ) : m_os( os )
+ {
+ writeDeclaration();
+ }
+
+ XmlWriter::~XmlWriter() {
+ while( !m_tags.empty() )
+ endElement();
+ }
+
+ XmlWriter& XmlWriter::startElement( std::string const& name ) {
+ ensureTagClosed();
+ newlineIfNecessary();
+ m_os << m_indent << '<' << name;
+ m_tags.push_back( name );
+ m_indent += " ";
+ m_tagIsOpen = true;
+ return *this;
+ }
+
+ XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name ) {
+ ScopedElement scoped( this );
+ startElement( name );
+ return scoped;
+ }
+
+ XmlWriter& XmlWriter::endElement() {
+ newlineIfNecessary();
+ m_indent = m_indent.substr( 0, m_indent.size()-2 );
+ if( m_tagIsOpen ) {
+ m_os << "/>";
+ m_tagIsOpen = false;
+ }
+ else {
+ m_os << m_indent << "</" << m_tags.back() << ">";
+ }
+ m_os << std::endl;
+ m_tags.pop_back();
+ return *this;
+ }
+
+ XmlWriter& XmlWriter::writeAttribute( std::string const& name, std::string const& attribute ) {
+ if( !name.empty() && !attribute.empty() )
+ m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
+ return *this;
+ }
+
+ XmlWriter& XmlWriter::writeAttribute( std::string const& name, bool attribute ) {
+ m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"';
+ return *this;
+ }
+
+ XmlWriter& XmlWriter::writeText( std::string const& text, bool indent ) {
+ if( !text.empty() ){
+ bool tagWasOpen = m_tagIsOpen;
+ ensureTagClosed();
+ if( tagWasOpen && indent )
+ m_os << m_indent;
+ m_os << XmlEncode( text );
+ m_needsNewline = true;
+ }
+ return *this;
+ }
+
+ XmlWriter& XmlWriter::writeComment( std::string const& text ) {
+ ensureTagClosed();
+ m_os << m_indent << "<!--" << text << "-->";
+ m_needsNewline = true;
+ return *this;
+ }
+
+ void XmlWriter::writeStylesheetRef( std::string const& url ) {
+ m_os << "<?xml-stylesheet type=\"text/xsl\" href=\"" << url << "\"?>\n";
+ }
+
+ XmlWriter& XmlWriter::writeBlankLine() {
+ ensureTagClosed();
+ m_os << '\n';
+ return *this;
+ }
+
+ void XmlWriter::ensureTagClosed() {
+ if( m_tagIsOpen ) {
+ m_os << ">" << std::endl;
+ m_tagIsOpen = false;
+ }
+ }
+
+ void XmlWriter::writeDeclaration() {
+ m_os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+ }
+
+ void XmlWriter::newlineIfNecessary() {
+ if( m_needsNewline ) {
+ m_os << std::endl;
+ m_needsNewline = false;
+ }
+ }
+}
+// end catch_xmlwriter.cpp
+// start catch_reporter_bases.cpp
+
+#include <cstring>
+#include <cfloat>
+#include <cstdio>
+#include <cassert>
+#include <memory>
+
+namespace Catch {
+ void prepareExpandedExpression(AssertionResult& result) {
+ result.getExpandedExpression();
+ }
+
+ // Because formatting using c++ streams is stateful, drop down to C is required
+ // Alternatively we could use stringstream, but its performance is... not good.
+ std::string getFormattedDuration( double duration ) {
+ // Max exponent + 1 is required to represent the whole part
+ // + 1 for decimal point
+ // + 3 for the 3 decimal places
+ // + 1 for null terminator
+ const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1;
+ char buffer[maxDoubleSize];
+
+ // Save previous errno, to prevent sprintf from overwriting it
+ ErrnoGuard guard;
+#ifdef _MSC_VER
+ sprintf_s(buffer, "%.3f", duration);
+#else
+ sprintf(buffer, "%.3f", duration);
+#endif
+ return std::string(buffer);
+ }
+
+ TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config)
+ :StreamingReporterBase(_config) {}
+
+ std::set<Verbosity> TestEventListenerBase::getSupportedVerbosities() {
+ return { Verbosity::Quiet, Verbosity::Normal, Verbosity::High };
+ }
+
+ void TestEventListenerBase::assertionStarting(AssertionInfo const &) {}
+
+ bool TestEventListenerBase::assertionEnded(AssertionStats const &) {
+ return false;
+ }
+
+} // end namespace Catch
+// end catch_reporter_bases.cpp
+// start catch_reporter_compact.cpp
+
+namespace {
+
+#ifdef CATCH_PLATFORM_MAC
+ const char* failedString() { return "FAILED"; }
+ const char* passedString() { return "PASSED"; }
+#else
+ const char* failedString() { return "failed"; }
+ const char* passedString() { return "passed"; }
+#endif
+
+ // Colour::LightGrey
+ Catch::Colour::Code dimColour() { return Catch::Colour::FileName; }
+
+ std::string bothOrAll( std::size_t count ) {
+ return count == 1 ? std::string() :
+ count == 2 ? "both " : "all " ;
+ }
+
+} // anon namespace
+
+namespace Catch {
+namespace {
+// Colour, message variants:
+// - white: No tests ran.
+// - red: Failed [both/all] N test cases, failed [both/all] M assertions.
+// - white: Passed [both/all] N test cases (no assertions).
+// - red: Failed N tests cases, failed M assertions.
+// - green: Passed [both/all] N tests cases with M assertions.
+void printTotals(std::ostream& out, const Totals& totals) {
+ if (totals.testCases.total() == 0) {
+ out << "No tests ran.";
+ } else if (totals.testCases.failed == totals.testCases.total()) {
+ Colour colour(Colour::ResultError);
+ const std::string qualify_assertions_failed =
+ totals.assertions.failed == totals.assertions.total() ?
+ bothOrAll(totals.assertions.failed) : std::string();
+ out <<
+ "Failed " << bothOrAll(totals.testCases.failed)
+ << pluralise(totals.testCases.failed, "test case") << ", "
+ "failed " << qualify_assertions_failed <<
+ pluralise(totals.assertions.failed, "assertion") << '.';
+ } else if (totals.assertions.total() == 0) {
+ out <<
+ "Passed " << bothOrAll(totals.testCases.total())
+ << pluralise(totals.testCases.total(), "test case")
+ << " (no assertions).";
+ } else if (totals.assertions.failed) {
+ Colour colour(Colour::ResultError);
+ out <<
+ "Failed " << pluralise(totals.testCases.failed, "test case") << ", "
+ "failed " << pluralise(totals.assertions.failed, "assertion") << '.';
+ } else {
+ Colour colour(Colour::ResultSuccess);
+ out <<
+ "Passed " << bothOrAll(totals.testCases.passed)
+ << pluralise(totals.testCases.passed, "test case") <<
+ " with " << pluralise(totals.assertions.passed, "assertion") << '.';
+ }
+}
+
+// Implementation of CompactReporter formatting
+class AssertionPrinter {
+public:
+ AssertionPrinter& operator= (AssertionPrinter const&) = delete;
+ AssertionPrinter(AssertionPrinter const&) = delete;
+ AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
+ : stream(_stream)
+ , result(_stats.assertionResult)
+ , messages(_stats.infoMessages)
+ , itMessage(_stats.infoMessages.begin())
+ , printInfoMessages(_printInfoMessages) {}
+
+ void print() {
+ printSourceInfo();
+
+ itMessage = messages.begin();
+
+ switch (result.getResultType()) {
+ case ResultWas::Ok:
+ printResultType(Colour::ResultSuccess, passedString());
+ printOriginalExpression();
+ printReconstructedExpression();
+ if (!result.hasExpression())
+ printRemainingMessages(Colour::None);
+ else
+ printRemainingMessages();
+ break;
+ case ResultWas::ExpressionFailed:
+ if (result.isOk())
+ printResultType(Colour::ResultSuccess, failedString() + std::string(" - but was ok"));
+ else
+ printResultType(Colour::Error, failedString());
+ printOriginalExpression();
+ printReconstructedExpression();
+ printRemainingMessages();
+ break;
+ case ResultWas::ThrewException:
+ printResultType(Colour::Error, failedString());
+ printIssue("unexpected exception with message:");
+ printMessage();
+ printExpressionWas();
+ printRemainingMessages();
+ break;
+ case ResultWas::FatalErrorCondition:
+ printResultType(Colour::Error, failedString());
+ printIssue("fatal error condition with message:");
+ printMessage();
+ printExpressionWas();
+ printRemainingMessages();
+ break;
+ case ResultWas::DidntThrowException:
+ printResultType(Colour::Error, failedString());
+ printIssue("expected exception, got none");
+ printExpressionWas();
+ printRemainingMessages();
+ break;
+ case ResultWas::Info:
+ printResultType(Colour::None, "info");
+ printMessage();
+ printRemainingMessages();
+ break;
+ case ResultWas::Warning:
+ printResultType(Colour::None, "warning");
+ printMessage();
+ printRemainingMessages();
+ break;
+ case ResultWas::ExplicitFailure:
+ printResultType(Colour::Error, failedString());
+ printIssue("explicitly");
+ printRemainingMessages(Colour::None);
+ break;
+ // These cases are here to prevent compiler warnings
+ case ResultWas::Unknown:
+ case ResultWas::FailureBit:
+ case ResultWas::Exception:
+ printResultType(Colour::Error, "** internal error **");
+ break;
+ }
+ }
+
+private:
+ void printSourceInfo() const {
+ Colour colourGuard(Colour::FileName);
+ stream << result.getSourceInfo() << ':';
+ }
+
+ void printResultType(Colour::Code colour, std::string const& passOrFail) const {
+ if (!passOrFail.empty()) {
+ {
+ Colour colourGuard(colour);
+ stream << ' ' << passOrFail;
+ }
+ stream << ':';
+ }
+ }
+
+ void printIssue(std::string const& issue) const {
+ stream << ' ' << issue;
+ }
+
+ void printExpressionWas() {
+ if (result.hasExpression()) {
+ stream << ';';
+ {
+ Colour colour(dimColour());
+ stream << " expression was:";
+ }
+ printOriginalExpression();
+ }
+ }
+
+ void printOriginalExpression() const {
+ if (result.hasExpression()) {
+ stream << ' ' << result.getExpression();
+ }
+ }
+
+ void printReconstructedExpression() const {
+ if (result.hasExpandedExpression()) {
+ {
+ Colour colour(dimColour());
+ stream << " for: ";
+ }
+ stream << result.getExpandedExpression();
+ }
+ }
+
+ void printMessage() {
+ if (itMessage != messages.end()) {
+ stream << " '" << itMessage->message << '\'';
+ ++itMessage;
+ }
+ }
+
+ void printRemainingMessages(Colour::Code colour = dimColour()) {
+ if (itMessage == messages.end())
+ return;
+
+ // using messages.end() directly yields (or auto) compilation error:
+ std::vector<MessageInfo>::const_iterator itEnd = messages.end();
+ const std::size_t N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
+
+ {
+ Colour colourGuard(colour);
+ stream << " with " << pluralise(N, "message") << ':';
+ }
+
+ for (; itMessage != itEnd; ) {
+ // If this assertion is a warning ignore any INFO messages
+ if (printInfoMessages || itMessage->type != ResultWas::Info) {
+ stream << " '" << itMessage->message << '\'';
+ if (++itMessage != itEnd) {
+ Colour colourGuard(dimColour());
+ stream << " and";
+ }
+ }
+ }
+ }
+
+private:
+ std::ostream& stream;
+ AssertionResult const& result;
+ std::vector<MessageInfo> messages;
+ std::vector<MessageInfo>::const_iterator itMessage;
+ bool printInfoMessages;
+};
+
+} // anon namespace
+
+ std::string CompactReporter::getDescription() {
+ return "Reports test results on a single line, suitable for IDEs";
+ }
+
+ ReporterPreferences CompactReporter::getPreferences() const {
+ return m_reporterPrefs;
+ }
+
+ void CompactReporter::noMatchingTestCases( std::string const& spec ) {
+ stream << "No test cases matched '" << spec << '\'' << std::endl;
+ }
+
+ void CompactReporter::assertionStarting( AssertionInfo const& ) {}
+
+ bool CompactReporter::assertionEnded( AssertionStats const& _assertionStats ) {
+ AssertionResult const& result = _assertionStats.assertionResult;
+
+ bool printInfoMessages = true;
+
+ // Drop out if result was successful and we're not printing those
+ if( !m_config->includeSuccessfulResults() && result.isOk() ) {
+ if( result.getResultType() != ResultWas::Warning )
+ return false;
+ printInfoMessages = false;
+ }
+
+ AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
+ printer.print();
+
+ stream << std::endl;
+ return true;
+ }
+
+ void CompactReporter::sectionEnded(SectionStats const& _sectionStats) {
+ if (m_config->showDurations() == ShowDurations::Always) {
+ stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+ }
+ }
+
+ void CompactReporter::testRunEnded( TestRunStats const& _testRunStats ) {
+ printTotals( stream, _testRunStats.totals );
+ stream << '\n' << std::endl;
+ StreamingReporterBase::testRunEnded( _testRunStats );
+ }
+
+ CompactReporter::~CompactReporter() {}
+
+ CATCH_REGISTER_REPORTER( "compact", CompactReporter )
+
+} // end namespace Catch
+// end catch_reporter_compact.cpp
+// start catch_reporter_console.cpp
+
+#include <cfloat>
+#include <cstdio>
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+ // Note that 4062 (not all labels are handled
+ // and default is missing) is enabled
+#endif
+
+namespace Catch {
+
+namespace {
+
+// Formatter impl for ConsoleReporter
+class ConsoleAssertionPrinter {
+public:
+ ConsoleAssertionPrinter& operator= (ConsoleAssertionPrinter const&) = delete;
+ ConsoleAssertionPrinter(ConsoleAssertionPrinter const&) = delete;
+ ConsoleAssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
+ : stream(_stream),
+ stats(_stats),
+ result(_stats.assertionResult),
+ colour(Colour::None),
+ message(result.getMessage()),
+ messages(_stats.infoMessages),
+ printInfoMessages(_printInfoMessages) {
+ switch (result.getResultType()) {
+ case ResultWas::Ok:
+ colour = Colour::Success;
+ passOrFail = "PASSED";
+ //if( result.hasMessage() )
+ if (_stats.infoMessages.size() == 1)
+ messageLabel = "with message";
+ if (_stats.infoMessages.size() > 1)
+ messageLabel = "with messages";
+ break;
+ case ResultWas::ExpressionFailed:
+ if (result.isOk()) {
+ colour = Colour::Success;
+ passOrFail = "FAILED - but was ok";
+ } else {
+ colour = Colour::Error;
+ passOrFail = "FAILED";
+ }
+ if (_stats.infoMessages.size() == 1)
+ messageLabel = "with message";
+ if (_stats.infoMessages.size() > 1)
+ messageLabel = "with messages";
+ break;
+ case ResultWas::ThrewException:
+ colour = Colour::Error;
+ passOrFail = "FAILED";
+ messageLabel = "due to unexpected exception with ";
+ if (_stats.infoMessages.size() == 1)
+ messageLabel += "message";
+ if (_stats.infoMessages.size() > 1)
+ messageLabel += "messages";
+ break;
+ case ResultWas::FatalErrorCondition:
+ colour = Colour::Error;
+ passOrFail = "FAILED";
+ messageLabel = "due to a fatal error condition";
+ break;
+ case ResultWas::DidntThrowException:
+ colour = Colour::Error;
+ passOrFail = "FAILED";
+ messageLabel = "because no exception was thrown where one was expected";
+ break;
+ case ResultWas::Info:
+ messageLabel = "info";
+ break;
+ case ResultWas::Warning:
+ messageLabel = "warning";
+ break;
+ case ResultWas::ExplicitFailure:
+ passOrFail = "FAILED";
+ colour = Colour::Error;
+ if (_stats.infoMessages.size() == 1)
+ messageLabel = "explicitly with message";
+ if (_stats.infoMessages.size() > 1)
+ messageLabel = "explicitly with messages";
+ break;
+ // These cases are here to prevent compiler warnings
+ case ResultWas::Unknown:
+ case ResultWas::FailureBit:
+ case ResultWas::Exception:
+ passOrFail = "** internal error **";
+ colour = Colour::Error;
+ break;
+ }
+ }
+
+ void print() const {
+ printSourceInfo();
+ if (stats.totals.assertions.total() > 0) {
+ printResultType();
+ printOriginalExpression();
+ printReconstructedExpression();
+ } else {
+ stream << '\n';
+ }
+ printMessage();
+ }
+
+private:
+ void printResultType() const {
+ if (!passOrFail.empty()) {
+ Colour colourGuard(colour);
+ stream << passOrFail << ":\n";
+ }
+ }
+ void printOriginalExpression() const {
+ if (result.hasExpression()) {
+ Colour colourGuard(Colour::OriginalExpression);
+ stream << " ";
+ stream << result.getExpressionInMacro();
+ stream << '\n';
+ }
+ }
+ void printReconstructedExpression() const {
+ if (result.hasExpandedExpression()) {
+ stream << "with expansion:\n";
+ Colour colourGuard(Colour::ReconstructedExpression);
+ stream << Column(result.getExpandedExpression()).indent(2) << '\n';
+ }
+ }
+ void printMessage() const {
+ if (!messageLabel.empty())
+ stream << messageLabel << ':' << '\n';
+ for (auto const& msg : messages) {
+ // If this assertion is a warning ignore any INFO messages
+ if (printInfoMessages || msg.type != ResultWas::Info)
+ stream << Column(msg.message).indent(2) << '\n';
+ }
+ }
+ void printSourceInfo() const {
+ Colour colourGuard(Colour::FileName);
+ stream << result.getSourceInfo() << ": ";
+ }
+
+ std::ostream& stream;
+ AssertionStats const& stats;
+ AssertionResult const& result;
+ Colour::Code colour;
+ std::string passOrFail;
+ std::string messageLabel;
+ std::string message;
+ std::vector<MessageInfo> messages;
+ bool printInfoMessages;
+};
+
+std::size_t makeRatio(std::size_t number, std::size_t total) {
+ std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number / total : 0;
+ return (ratio == 0 && number > 0) ? 1 : ratio;
+}
+
+std::size_t& findMax(std::size_t& i, std::size_t& j, std::size_t& k) {
+ if (i > j && i > k)
+ return i;
+ else if (j > k)
+ return j;
+ else
+ return k;
+}
+
+struct ColumnInfo {
+ enum Justification { Left, Right };
+ std::string name;
+ int width;
+ Justification justification;
+};
+struct ColumnBreak {};
+struct RowBreak {};
+
+class Duration {
+ enum class Unit {
+ Auto,
+ Nanoseconds,
+ Microseconds,
+ Milliseconds,
+ Seconds,
+ Minutes
+ };
+ static const uint64_t s_nanosecondsInAMicrosecond = 1000;
+ static const uint64_t s_nanosecondsInAMillisecond = 1000 * s_nanosecondsInAMicrosecond;
+ static const uint64_t s_nanosecondsInASecond = 1000 * s_nanosecondsInAMillisecond;
+ static const uint64_t s_nanosecondsInAMinute = 60 * s_nanosecondsInASecond;
+
+ uint64_t m_inNanoseconds;
+ Unit m_units;
+
+public:
+ explicit Duration(uint64_t inNanoseconds, Unit units = Unit::Auto)
+ : m_inNanoseconds(inNanoseconds),
+ m_units(units) {
+ if (m_units == Unit::Auto) {
+ if (m_inNanoseconds < s_nanosecondsInAMicrosecond)
+ m_units = Unit::Nanoseconds;
+ else if (m_inNanoseconds < s_nanosecondsInAMillisecond)
+ m_units = Unit::Microseconds;
+ else if (m_inNanoseconds < s_nanosecondsInASecond)
+ m_units = Unit::Milliseconds;
+ else if (m_inNanoseconds < s_nanosecondsInAMinute)
+ m_units = Unit::Seconds;
+ else
+ m_units = Unit::Minutes;
+ }
+
+ }
+
+ auto value() const -> double {
+ switch (m_units) {
+ case Unit::Microseconds:
+ return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMicrosecond);
+ case Unit::Milliseconds:
+ return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMillisecond);
+ case Unit::Seconds:
+ return m_inNanoseconds / static_cast<double>(s_nanosecondsInASecond);
+ case Unit::Minutes:
+ return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMinute);
+ default:
+ return static_cast<double>(m_inNanoseconds);
+ }
+ }
+ auto unitsAsString() const -> std::string {
+ switch (m_units) {
+ case Unit::Nanoseconds:
+ return "ns";
+ case Unit::Microseconds:
+ return "µs";
+ case Unit::Milliseconds:
+ return "ms";
+ case Unit::Seconds:
+ return "s";
+ case Unit::Minutes:
+ return "m";
+ default:
+ return "** internal error **";
+ }
+
+ }
+ friend auto operator << (std::ostream& os, Duration const& duration) -> std::ostream& {
+ return os << duration.value() << " " << duration.unitsAsString();
+ }
+};
+} // end anon namespace
+
+class TablePrinter {
+ std::ostream& m_os;
+ std::vector<ColumnInfo> m_columnInfos;
+ std::ostringstream m_oss;
+ int m_currentColumn = -1;
+ bool m_isOpen = false;
+
+public:
+ TablePrinter( std::ostream& os, std::vector<ColumnInfo> columnInfos )
+ : m_os( os ),
+ m_columnInfos( std::move( columnInfos ) ) {}
+
+ auto columnInfos() const -> std::vector<ColumnInfo> const& {
+ return m_columnInfos;
+ }
+
+ void open() {
+ if (!m_isOpen) {
+ m_isOpen = true;
+ *this << RowBreak();
+ for (auto const& info : m_columnInfos)
+ *this << info.name << ColumnBreak();
+ *this << RowBreak();
+ m_os << Catch::getLineOfChars<'-'>() << "\n";
+ }
+ }
+ void close() {
+ if (m_isOpen) {
+ *this << RowBreak();
+ m_os << std::endl;
+ m_isOpen = false;
+ }
+ }
+
+ template<typename T>
+ friend TablePrinter& operator << (TablePrinter& tp, T const& value) {
+ tp.m_oss << value;
+ return tp;
+ }
+
+ friend TablePrinter& operator << (TablePrinter& tp, ColumnBreak) {
+ auto colStr = tp.m_oss.str();
+ // This takes account of utf8 encodings
+ auto strSize = Catch::StringRef(colStr).numberOfCharacters();
+ tp.m_oss.str("");
+ tp.open();
+ if (tp.m_currentColumn == static_cast<int>(tp.m_columnInfos.size() - 1)) {
+ tp.m_currentColumn = -1;
+ tp.m_os << "\n";
+ }
+ tp.m_currentColumn++;
+
+ auto colInfo = tp.m_columnInfos[tp.m_currentColumn];
+ auto padding = (strSize + 2 < static_cast<std::size_t>(colInfo.width))
+ ? std::string(colInfo.width - (strSize + 2), ' ')
+ : std::string();
+ if (colInfo.justification == ColumnInfo::Left)
+ tp.m_os << colStr << padding << " ";
+ else
+ tp.m_os << padding << colStr << " ";
+ return tp;
+ }
+
+ friend TablePrinter& operator << (TablePrinter& tp, RowBreak) {
+ if (tp.m_currentColumn > 0) {
+ tp.m_os << "\n";
+ tp.m_currentColumn = -1;
+ }
+ return tp;
+ }
+};
+
+ConsoleReporter::ConsoleReporter(ReporterConfig const& config)
+ : StreamingReporterBase(config),
+ m_tablePrinter(new TablePrinter(config.stream(),
+ {
+ { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 32, ColumnInfo::Left },
+ { "iters", 8, ColumnInfo::Right },
+ { "elapsed ns", 14, ColumnInfo::Right },
+ { "average", 14, ColumnInfo::Right }
+ })) {}
+ConsoleReporter::~ConsoleReporter() = default;
+
+std::string ConsoleReporter::getDescription() {
+ return "Reports test results as plain lines of text";
+}
+
+void ConsoleReporter::noMatchingTestCases(std::string const& spec) {
+ stream << "No test cases matched '" << spec << '\'' << std::endl;
+}
+
+void ConsoleReporter::assertionStarting(AssertionInfo const&) {}
+
+bool ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) {
+ AssertionResult const& result = _assertionStats.assertionResult;
+
+ bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+ // Drop out if result was successful but we're not printing them.
+ if (!includeResults && result.getResultType() != ResultWas::Warning)
+ return false;
+
+ lazyPrint();
+
+ ConsoleAssertionPrinter printer(stream, _assertionStats, includeResults);
+ printer.print();
+ stream << std::endl;
+ return true;
+}
+
+void ConsoleReporter::sectionStarting(SectionInfo const& _sectionInfo) {
+ m_headerPrinted = false;
+ StreamingReporterBase::sectionStarting(_sectionInfo);
+}
+void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) {
+ m_tablePrinter->close();
+ if (_sectionStats.missingAssertions) {
+ lazyPrint();
+ Colour colour(Colour::ResultError);
+ if (m_sectionStack.size() > 1)
+ stream << "\nNo assertions in section";
+ else
+ stream << "\nNo assertions in test case";
+ stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
+ }
+ if (m_config->showDurations() == ShowDurations::Always) {
+ stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+ }
+ if (m_headerPrinted) {
+ m_headerPrinted = false;
+ }
+ StreamingReporterBase::sectionEnded(_sectionStats);
+}
+
+void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
+ lazyPrintWithoutClosingBenchmarkTable();
+
+ auto nameCol = Column( info.name ).width( static_cast<std::size_t>( m_tablePrinter->columnInfos()[0].width - 2 ) );
+
+ bool firstLine = true;
+ for (auto line : nameCol) {
+ if (!firstLine)
+ (*m_tablePrinter) << ColumnBreak() << ColumnBreak() << ColumnBreak();
+ else
+ firstLine = false;
+
+ (*m_tablePrinter) << line << ColumnBreak();
+ }
+}
+void ConsoleReporter::benchmarkEnded(BenchmarkStats const& stats) {
+ Duration average(stats.elapsedTimeInNanoseconds / stats.iterations);
+ (*m_tablePrinter)
+ << stats.iterations << ColumnBreak()
+ << stats.elapsedTimeInNanoseconds << ColumnBreak()
+ << average << ColumnBreak();
+}
+
+void ConsoleReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
+ m_tablePrinter->close();
+ StreamingReporterBase::testCaseEnded(_testCaseStats);
+ m_headerPrinted = false;
+}
+void ConsoleReporter::testGroupEnded(TestGroupStats const& _testGroupStats) {
+ if (currentGroupInfo.used) {
+ printSummaryDivider();
+ stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n";
+ printTotals(_testGroupStats.totals);
+ stream << '\n' << std::endl;
+ }
+ StreamingReporterBase::testGroupEnded(_testGroupStats);
+}
+void ConsoleReporter::testRunEnded(TestRunStats const& _testRunStats) {
+ printTotalsDivider(_testRunStats.totals);
+ printTotals(_testRunStats.totals);
+ stream << std::endl;
+ StreamingReporterBase::testRunEnded(_testRunStats);
+}
+
+void ConsoleReporter::lazyPrint() {
+
+ m_tablePrinter->close();
+ lazyPrintWithoutClosingBenchmarkTable();
+}
+
+void ConsoleReporter::lazyPrintWithoutClosingBenchmarkTable() {
+
+ if (!currentTestRunInfo.used)
+ lazyPrintRunInfo();
+ if (!currentGroupInfo.used)
+ lazyPrintGroupInfo();
+
+ if (!m_headerPrinted) {
+ printTestCaseAndSectionHeader();
+ m_headerPrinted = true;
+ }
+}
+void ConsoleReporter::lazyPrintRunInfo() {
+ stream << '\n' << getLineOfChars<'~'>() << '\n';
+ Colour colour(Colour::SecondaryText);
+ stream << currentTestRunInfo->name
+ << " is a Catch v" << libraryVersion() << " host application.\n"
+ << "Run with -? for options\n\n";
+
+ if (m_config->rngSeed() != 0)
+ stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n";
+
+ currentTestRunInfo.used = true;
+}
+void ConsoleReporter::lazyPrintGroupInfo() {
+ if (!currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1) {
+ printClosedHeader("Group: " + currentGroupInfo->name);
+ currentGroupInfo.used = true;
+ }
+}
+void ConsoleReporter::printTestCaseAndSectionHeader() {
+ assert(!m_sectionStack.empty());
+ printOpenHeader(currentTestCaseInfo->name);
+
+ if (m_sectionStack.size() > 1) {
+ Colour colourGuard(Colour::Headers);
+
+ auto
+ it = m_sectionStack.begin() + 1, // Skip first section (test case)
+ itEnd = m_sectionStack.end();
+ for (; it != itEnd; ++it)
+ printHeaderString(it->name, 2);
+ }
+
+ SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;
+
+ if (!lineInfo.empty()) {
+ stream << getLineOfChars<'-'>() << '\n';
+ Colour colourGuard(Colour::FileName);
+ stream << lineInfo << '\n';
+ }
+ stream << getLineOfChars<'.'>() << '\n' << std::endl;
+}
+
+void ConsoleReporter::printClosedHeader(std::string const& _name) {
+ printOpenHeader(_name);
+ stream << getLineOfChars<'.'>() << '\n';
+}
+void ConsoleReporter::printOpenHeader(std::string const& _name) {
+ stream << getLineOfChars<'-'>() << '\n';
+ {
+ Colour colourGuard(Colour::Headers);
+ printHeaderString(_name);
+ }
+}
+
+// if string has a : in first line will set indent to follow it on
+// subsequent lines
+void ConsoleReporter::printHeaderString(std::string const& _string, std::size_t indent) {
+ std::size_t i = _string.find(": ");
+ if (i != std::string::npos)
+ i += 2;
+ else
+ i = 0;
+ stream << Column(_string).indent(indent + i).initialIndent(indent) << '\n';
+}
+
+struct SummaryColumn {
+
+ SummaryColumn( std::string _label, Colour::Code _colour )
+ : label( std::move( _label ) ),
+ colour( _colour ) {}
+ SummaryColumn addRow( std::size_t count ) {
+ ReusableStringStream rss;
+ rss << count;
+ std::string row = rss.str();
+ for (auto& oldRow : rows) {
+ while (oldRow.size() < row.size())
+ oldRow = ' ' + oldRow;
+ while (oldRow.size() > row.size())
+ row = ' ' + row;
+ }
+ rows.push_back(row);
+ return *this;
+ }
+
+ std::string label;
+ Colour::Code colour;
+ std::vector<std::string> rows;
+
+};
+
+void ConsoleReporter::printTotals( Totals const& totals ) {
+ if (totals.testCases.total() == 0) {
+ stream << Colour(Colour::Warning) << "No tests ran\n";
+ } else if (totals.assertions.total() > 0 && totals.testCases.allPassed()) {
+ stream << Colour(Colour::ResultSuccess) << "All tests passed";
+ stream << " ("
+ << pluralise(totals.assertions.passed, "assertion") << " in "
+ << pluralise(totals.testCases.passed, "test case") << ')'
+ << '\n';
+ } else {
+
+ std::vector<SummaryColumn> columns;
+ columns.push_back(SummaryColumn("", Colour::None)
+ .addRow(totals.testCases.total())
+ .addRow(totals.assertions.total()));
+ columns.push_back(SummaryColumn("passed", Colour::Success)
+ .addRow(totals.testCases.passed)
+ .addRow(totals.assertions.passed));
+ columns.push_back(SummaryColumn("failed", Colour::ResultError)
+ .addRow(totals.testCases.failed)
+ .addRow(totals.assertions.failed));
+ columns.push_back(SummaryColumn("failed as expected", Colour::ResultExpectedFailure)
+ .addRow(totals.testCases.failedButOk)
+ .addRow(totals.assertions.failedButOk));
+
+ printSummaryRow("test cases", columns, 0);
+ printSummaryRow("assertions", columns, 1);
+ }
+}
+void ConsoleReporter::printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row) {
+ for (auto col : cols) {
+ std::string value = col.rows[row];
+ if (col.label.empty()) {
+ stream << label << ": ";
+ if (value != "0")
+ stream << value;
+ else
+ stream << Colour(Colour::Warning) << "- none -";
+ } else if (value != "0") {
+ stream << Colour(Colour::LightGrey) << " | ";
+ stream << Colour(col.colour)
+ << value << ' ' << col.label;
+ }
+ }
+ stream << '\n';
+}
+
+void ConsoleReporter::printTotalsDivider(Totals const& totals) {
+ if (totals.testCases.total() > 0) {
+ std::size_t failedRatio = makeRatio(totals.testCases.failed, totals.testCases.total());
+ std::size_t failedButOkRatio = makeRatio(totals.testCases.failedButOk, totals.testCases.total());
+ std::size_t passedRatio = makeRatio(totals.testCases.passed, totals.testCases.total());
+ while (failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH - 1)
+ findMax(failedRatio, failedButOkRatio, passedRatio)++;
+ while (failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH - 1)
+ findMax(failedRatio, failedButOkRatio, passedRatio)--;
+
+ stream << Colour(Colour::Error) << std::string(failedRatio, '=');
+ stream << Colour(Colour::ResultExpectedFailure) << std::string(failedButOkRatio, '=');
+ if (totals.testCases.allPassed())
+ stream << Colour(Colour::ResultSuccess) << std::string(passedRatio, '=');
+ else
+ stream << Colour(Colour::Success) << std::string(passedRatio, '=');
+ } else {
+ stream << Colour(Colour::Warning) << std::string(CATCH_CONFIG_CONSOLE_WIDTH - 1, '=');
+ }
+ stream << '\n';
+}
+void ConsoleReporter::printSummaryDivider() {
+ stream << getLineOfChars<'-'>() << '\n';
+}
+
+CATCH_REGISTER_REPORTER("console", ConsoleReporter)
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+// end catch_reporter_console.cpp
+// start catch_reporter_junit.cpp
+
+#include <cassert>
+#include <sstream>
+#include <ctime>
+#include <algorithm>
+
+namespace Catch {
+
+ namespace {
+ std::string getCurrentTimestamp() {
+ // Beware, this is not reentrant because of backward compatibility issues
+ // Also, UTC only, again because of backward compatibility (%z is C++11)
+ time_t rawtime;
+ std::time(&rawtime);
+ auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
+
+#ifdef _MSC_VER
+ std::tm timeInfo = {};
+ gmtime_s(&timeInfo, &rawtime);
+#else
+ std::tm* timeInfo;
+ timeInfo = std::gmtime(&rawtime);
+#endif
+
+ char timeStamp[timeStampSize];
+ const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+#ifdef _MSC_VER
+ std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+#else
+ std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
+#endif
+ return std::string(timeStamp);
+ }
+
+ std::string fileNameTag(const std::vector<std::string> &tags) {
+ auto it = std::find_if(begin(tags),
+ end(tags),
+ [] (std::string const& tag) {return tag.front() == '#'; });
+ if (it != tags.end())
+ return it->substr(1);
+ return std::string();
+ }
+ } // anonymous namespace
+
+ JunitReporter::JunitReporter( ReporterConfig const& _config )
+ : CumulativeReporterBase( _config ),
+ xml( _config.stream() )
+ {
+ m_reporterPrefs.shouldRedirectStdOut = true;
+ m_reporterPrefs.shouldReportAllAssertions = true;
+ }
+
+ JunitReporter::~JunitReporter() {}
+
+ std::string JunitReporter::getDescription() {
+ return "Reports test results in an XML format that looks like Ant's junitreport target";
+ }
+
+ void JunitReporter::noMatchingTestCases( std::string const& /*spec*/ ) {}
+
+ void JunitReporter::testRunStarting( TestRunInfo const& runInfo ) {
+ CumulativeReporterBase::testRunStarting( runInfo );
+ xml.startElement( "testsuites" );
+ }
+
+ void JunitReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+ suiteTimer.start();
+ stdOutForSuite.clear();
+ stdErrForSuite.clear();
+ unexpectedExceptions = 0;
+ CumulativeReporterBase::testGroupStarting( groupInfo );
+ }
+
+ void JunitReporter::testCaseStarting( TestCaseInfo const& testCaseInfo ) {
+ m_okToFail = testCaseInfo.okToFail();
+ }
+
+ bool JunitReporter::assertionEnded( AssertionStats const& assertionStats ) {
+ if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail )
+ unexpectedExceptions++;
+ return CumulativeReporterBase::assertionEnded( assertionStats );
+ }
+
+ void JunitReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+ stdOutForSuite += testCaseStats.stdOut;
+ stdErrForSuite += testCaseStats.stdErr;
+ CumulativeReporterBase::testCaseEnded( testCaseStats );
+ }
+
+ void JunitReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+ double suiteTime = suiteTimer.getElapsedSeconds();
+ CumulativeReporterBase::testGroupEnded( testGroupStats );
+ writeGroup( *m_testGroups.back(), suiteTime );
+ }
+
+ void JunitReporter::testRunEndedCumulative() {
+ xml.endElement();
+ }
+
+ void JunitReporter::writeGroup( TestGroupNode const& groupNode, double suiteTime ) {
+ XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
+ TestGroupStats const& stats = groupNode.value;
+ xml.writeAttribute( "name", stats.groupInfo.name );
+ xml.writeAttribute( "errors", unexpectedExceptions );
+ xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions );
+ xml.writeAttribute( "tests", stats.totals.assertions.total() );
+ xml.writeAttribute( "hostname", "tbd" ); // !TBD
+ if( m_config->showDurations() == ShowDurations::Never )
+ xml.writeAttribute( "time", "" );
+ else
+ xml.writeAttribute( "time", suiteTime );
+ xml.writeAttribute( "timestamp", getCurrentTimestamp() );
+
+ // Write test cases
+ for( auto const& child : groupNode.children )
+ writeTestCase( *child );
+
+ xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite ), false );
+ xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite ), false );
+ }
+
+ void JunitReporter::writeTestCase( TestCaseNode const& testCaseNode ) {
+ TestCaseStats const& stats = testCaseNode.value;
+
+ // All test cases have exactly one section - which represents the
+ // test case itself. That section may have 0-n nested sections
+ assert( testCaseNode.children.size() == 1 );
+ SectionNode const& rootSection = *testCaseNode.children.front();
+
+ std::string className = stats.testInfo.className;
+
+ if( className.empty() ) {
+ className = fileNameTag(stats.testInfo.tags);
+ if ( className.empty() )
+ className = "global";
+ }
+
+ if ( !m_config->name().empty() )
+ className = m_config->name() + "." + className;
+
+ writeSection( className, "", rootSection );
+ }
+
+ void JunitReporter::writeSection( std::string const& className,
+ std::string const& rootName,
+ SectionNode const& sectionNode ) {
+ std::string name = trim( sectionNode.stats.sectionInfo.name );
+ if( !rootName.empty() )
+ name = rootName + '/' + name;
+
+ if( !sectionNode.assertions.empty() ||
+ !sectionNode.stdOut.empty() ||
+ !sectionNode.stdErr.empty() ) {
+ XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
+ if( className.empty() ) {
+ xml.writeAttribute( "classname", name );
+ xml.writeAttribute( "name", "root" );
+ }
+ else {
+ xml.writeAttribute( "classname", className );
+ xml.writeAttribute( "name", name );
+ }
+ xml.writeAttribute( "time", ::Catch::Detail::stringify( sectionNode.stats.durationInSeconds ) );
+
+ writeAssertions( sectionNode );
+
+ if( !sectionNode.stdOut.empty() )
+ xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), false );
+ if( !sectionNode.stdErr.empty() )
+ xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), false );
+ }
+ for( auto const& childNode : sectionNode.childSections )
+ if( className.empty() )
+ writeSection( name, "", *childNode );
+ else
+ writeSection( className, name, *childNode );
+ }
+
+ void JunitReporter::writeAssertions( SectionNode const& sectionNode ) {
+ for( auto const& assertion : sectionNode.assertions )
+ writeAssertion( assertion );
+ }
+
+ void JunitReporter::writeAssertion( AssertionStats const& stats ) {
+ AssertionResult const& result = stats.assertionResult;
+ if( !result.isOk() ) {
+ std::string elementName;
+ switch( result.getResultType() ) {
+ case ResultWas::ThrewException:
+ case ResultWas::FatalErrorCondition:
+ elementName = "error";
+ break;
+ case ResultWas::ExplicitFailure:
+ elementName = "failure";
+ break;
+ case ResultWas::ExpressionFailed:
+ elementName = "failure";
+ break;
+ case ResultWas::DidntThrowException:
+ elementName = "failure";
+ break;
+
+ // We should never see these here:
+ case ResultWas::Info:
+ case ResultWas::Warning:
+ case ResultWas::Ok:
+ case ResultWas::Unknown:
+ case ResultWas::FailureBit:
+ case ResultWas::Exception:
+ elementName = "internalError";
+ break;
+ }
+
+ XmlWriter::ScopedElement e = xml.scopedElement( elementName );
+
+ xml.writeAttribute( "message", result.getExpandedExpression() );
+ xml.writeAttribute( "type", result.getTestMacroName() );
+
+ ReusableStringStream rss;
+ if( !result.getMessage().empty() )
+ rss << result.getMessage() << '\n';
+ for( auto const& msg : stats.infoMessages )
+ if( msg.type == ResultWas::Info )
+ rss << msg.message << '\n';
+
+ rss << "at " << result.getSourceInfo();
+ xml.writeText( rss.str(), false );
+ }
+ }
+
+ CATCH_REGISTER_REPORTER( "junit", JunitReporter )
+
+} // end namespace Catch
+// end catch_reporter_junit.cpp
+// start catch_reporter_listening.cpp
+
+#include <cassert>
+
+namespace Catch {
+
+ ListeningReporter::ListeningReporter() {
+ // We will assume that listeners will always want all assertions
+ m_preferences.shouldReportAllAssertions = true;
+ }
+
+ void ListeningReporter::addListener( IStreamingReporterPtr&& listener ) {
+ m_listeners.push_back( std::move( listener ) );
+ }
+
+ void ListeningReporter::addReporter(IStreamingReporterPtr&& reporter) {
+ assert(!m_reporter && "Listening reporter can wrap only 1 real reporter");
+ m_reporter = std::move( reporter );
+ m_preferences.shouldRedirectStdOut = m_reporter->getPreferences().shouldRedirectStdOut;
+ }
+
+ ReporterPreferences ListeningReporter::getPreferences() const {
+ return m_preferences;
+ }
+
+ std::set<Verbosity> ListeningReporter::getSupportedVerbosities() {
+ return std::set<Verbosity>{ };
+ }
+
+ void ListeningReporter::noMatchingTestCases( std::string const& spec ) {
+ for ( auto const& listener : m_listeners ) {
+ listener->noMatchingTestCases( spec );
+ }
+ m_reporter->noMatchingTestCases( spec );
+ }
+
+ void ListeningReporter::benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) {
+ for ( auto const& listener : m_listeners ) {
+ listener->benchmarkStarting( benchmarkInfo );
+ }
+ m_reporter->benchmarkStarting( benchmarkInfo );
+ }
+ void ListeningReporter::benchmarkEnded( BenchmarkStats const& benchmarkStats ) {
+ for ( auto const& listener : m_listeners ) {
+ listener->benchmarkEnded( benchmarkStats );
+ }
+ m_reporter->benchmarkEnded( benchmarkStats );
+ }
+
+ void ListeningReporter::testRunStarting( TestRunInfo const& testRunInfo ) {
+ for ( auto const& listener : m_listeners ) {
+ listener->testRunStarting( testRunInfo );
+ }
+ m_reporter->testRunStarting( testRunInfo );
+ }
+
+ void ListeningReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+ for ( auto const& listener : m_listeners ) {
+ listener->testGroupStarting( groupInfo );
+ }
+ m_reporter->testGroupStarting( groupInfo );
+ }
+
+ void ListeningReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
+ for ( auto const& listener : m_listeners ) {
+ listener->testCaseStarting( testInfo );
+ }
+ m_reporter->testCaseStarting( testInfo );
+ }
+
+ void ListeningReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+ for ( auto const& listener : m_listeners ) {
+ listener->sectionStarting( sectionInfo );
+ }
+ m_reporter->sectionStarting( sectionInfo );
+ }
+
+ void ListeningReporter::assertionStarting( AssertionInfo const& assertionInfo ) {
+ for ( auto const& listener : m_listeners ) {
+ listener->assertionStarting( assertionInfo );
+ }
+ m_reporter->assertionStarting( assertionInfo );
+ }
+
+ // The return value indicates if the messages buffer should be cleared:
+ bool ListeningReporter::assertionEnded( AssertionStats const& assertionStats ) {
+ for( auto const& listener : m_listeners ) {
+ static_cast<void>( listener->assertionEnded( assertionStats ) );
+ }
+ return m_reporter->assertionEnded( assertionStats );
+ }
+
+ void ListeningReporter::sectionEnded( SectionStats const& sectionStats ) {
+ for ( auto const& listener : m_listeners ) {
+ listener->sectionEnded( sectionStats );
+ }
+ m_reporter->sectionEnded( sectionStats );
+ }
+
+ void ListeningReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+ for ( auto const& listener : m_listeners ) {
+ listener->testCaseEnded( testCaseStats );
+ }
+ m_reporter->testCaseEnded( testCaseStats );
+ }
+
+ void ListeningReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+ for ( auto const& listener : m_listeners ) {
+ listener->testGroupEnded( testGroupStats );
+ }
+ m_reporter->testGroupEnded( testGroupStats );
+ }
+
+ void ListeningReporter::testRunEnded( TestRunStats const& testRunStats ) {
+ for ( auto const& listener : m_listeners ) {
+ listener->testRunEnded( testRunStats );
+ }
+ m_reporter->testRunEnded( testRunStats );
+ }
+
+ void ListeningReporter::skipTest( TestCaseInfo const& testInfo ) {
+ for ( auto const& listener : m_listeners ) {
+ listener->skipTest( testInfo );
+ }
+ m_reporter->skipTest( testInfo );
+ }
+
+ bool ListeningReporter::isMulti() const {
+ return true;
+ }
+
+} // end namespace Catch
+// end catch_reporter_listening.cpp
+// start catch_reporter_xml.cpp
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+ // Note that 4062 (not all labels are handled
+ // and default is missing) is enabled
+#endif
+
+namespace Catch {
+ XmlReporter::XmlReporter( ReporterConfig const& _config )
+ : StreamingReporterBase( _config ),
+ m_xml(_config.stream())
+ {
+ m_reporterPrefs.shouldRedirectStdOut = true;
+ m_reporterPrefs.shouldReportAllAssertions = true;
+ }
+
+ XmlReporter::~XmlReporter() = default;
+
+ std::string XmlReporter::getDescription() {
+ return "Reports test results as an XML document";
+ }
+
+ std::string XmlReporter::getStylesheetRef() const {
+ return std::string();
+ }
+
+ void XmlReporter::writeSourceInfo( SourceLineInfo const& sourceInfo ) {
+ m_xml
+ .writeAttribute( "filename", sourceInfo.file )
+ .writeAttribute( "line", sourceInfo.line );
+ }
+
+ void XmlReporter::noMatchingTestCases( std::string const& s ) {
+ StreamingReporterBase::noMatchingTestCases( s );
+ }
+
+ void XmlReporter::testRunStarting( TestRunInfo const& testInfo ) {
+ StreamingReporterBase::testRunStarting( testInfo );
+ std::string stylesheetRef = getStylesheetRef();
+ if( !stylesheetRef.empty() )
+ m_xml.writeStylesheetRef( stylesheetRef );
+ m_xml.startElement( "Catch" );
+ if( !m_config->name().empty() )
+ m_xml.writeAttribute( "name", m_config->name() );
+ if( m_config->rngSeed() != 0 )
+ m_xml.scopedElement( "Randomness" )
+ .writeAttribute( "seed", m_config->rngSeed() );
+ }
+
+ void XmlReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+ StreamingReporterBase::testGroupStarting( groupInfo );
+ m_xml.startElement( "Group" )
+ .writeAttribute( "name", groupInfo.name );
+ }
+
+ void XmlReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
+ StreamingReporterBase::testCaseStarting(testInfo);
+ m_xml.startElement( "TestCase" )
+ .writeAttribute( "name", trim( testInfo.name ) )
+ .writeAttribute( "description", testInfo.description )
+ .writeAttribute( "tags", testInfo.tagsAsString() );
+
+ writeSourceInfo( testInfo.lineInfo );
+
+ if ( m_config->showDurations() == ShowDurations::Always )
+ m_testCaseTimer.start();
+ m_xml.ensureTagClosed();
+ }
+
+ void XmlReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+ StreamingReporterBase::sectionStarting( sectionInfo );
+ if( m_sectionDepth++ > 0 ) {
+ m_xml.startElement( "Section" )
+ .writeAttribute( "name", trim( sectionInfo.name ) );
+ writeSourceInfo( sectionInfo.lineInfo );
+ m_xml.ensureTagClosed();
+ }
+ }
+
+ void XmlReporter::assertionStarting( AssertionInfo const& ) { }
+
+ bool XmlReporter::assertionEnded( AssertionStats const& assertionStats ) {
+
+ AssertionResult const& result = assertionStats.assertionResult;
+
+ bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+ if( includeResults || result.getResultType() == ResultWas::Warning ) {
+ // Print any info messages in <Info> tags.
+ for( auto const& msg : assertionStats.infoMessages ) {
+ if( msg.type == ResultWas::Info && includeResults ) {
+ m_xml.scopedElement( "Info" )
+ .writeText( msg.message );
+ } else if ( msg.type == ResultWas::Warning ) {
+ m_xml.scopedElement( "Warning" )
+ .writeText( msg.message );
+ }
+ }
+ }
+
+ // Drop out if result was successful but we're not printing them.
+ if( !includeResults && result.getResultType() != ResultWas::Warning )
+ return true;
+
+ // Print the expression if there is one.
+ if( result.hasExpression() ) {
+ m_xml.startElement( "Expression" )
+ .writeAttribute( "success", result.succeeded() )
+ .writeAttribute( "type", result.getTestMacroName() );
+
+ writeSourceInfo( result.getSourceInfo() );
+
+ m_xml.scopedElement( "Original" )
+ .writeText( result.getExpression() );
+ m_xml.scopedElement( "Expanded" )
+ .writeText( result.getExpandedExpression() );
+ }
+
+ // And... Print a result applicable to each result type.
+ switch( result.getResultType() ) {
+ case ResultWas::ThrewException:
+ m_xml.startElement( "Exception" );
+ writeSourceInfo( result.getSourceInfo() );
+ m_xml.writeText( result.getMessage() );
+ m_xml.endElement();
+ break;
+ case ResultWas::FatalErrorCondition:
+ m_xml.startElement( "FatalErrorCondition" );
+ writeSourceInfo( result.getSourceInfo() );
+ m_xml.writeText( result.getMessage() );
+ m_xml.endElement();
+ break;
+ case ResultWas::Info:
+ m_xml.scopedElement( "Info" )
+ .writeText( result.getMessage() );
+ break;
+ case ResultWas::Warning:
+ // Warning will already have been written
+ break;
+ case ResultWas::ExplicitFailure:
+ m_xml.startElement( "Failure" );
+ writeSourceInfo( result.getSourceInfo() );
+ m_xml.writeText( result.getMessage() );
+ m_xml.endElement();
+ break;
+ default:
+ break;
+ }
+
+ if( result.hasExpression() )
+ m_xml.endElement();
+
+ return true;
+ }
+
+ void XmlReporter::sectionEnded( SectionStats const& sectionStats ) {
+ StreamingReporterBase::sectionEnded( sectionStats );
+ if( --m_sectionDepth > 0 ) {
+ XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" );
+ e.writeAttribute( "successes", sectionStats.assertions.passed );
+ e.writeAttribute( "failures", sectionStats.assertions.failed );
+ e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk );
+
+ if ( m_config->showDurations() == ShowDurations::Always )
+ e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds );
+
+ m_xml.endElement();
+ }
+ }
+
+ void XmlReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+ StreamingReporterBase::testCaseEnded( testCaseStats );
+ XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" );
+ e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() );
+
+ if ( m_config->showDurations() == ShowDurations::Always )
+ e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() );
+
+ if( !testCaseStats.stdOut.empty() )
+ m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), false );
+ if( !testCaseStats.stdErr.empty() )
+ m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), false );
+
+ m_xml.endElement();
+ }
+
+ void XmlReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+ StreamingReporterBase::testGroupEnded( testGroupStats );
+ // TODO: Check testGroupStats.aborting and act accordingly.
+ m_xml.scopedElement( "OverallResults" )
+ .writeAttribute( "successes", testGroupStats.totals.assertions.passed )
+ .writeAttribute( "failures", testGroupStats.totals.assertions.failed )
+ .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
+ m_xml.endElement();
+ }
+
+ void XmlReporter::testRunEnded( TestRunStats const& testRunStats ) {
+ StreamingReporterBase::testRunEnded( testRunStats );
+ m_xml.scopedElement( "OverallResults" )
+ .writeAttribute( "successes", testRunStats.totals.assertions.passed )
+ .writeAttribute( "failures", testRunStats.totals.assertions.failed )
+ .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk );
+ m_xml.endElement();
+ }
+
+ CATCH_REGISTER_REPORTER( "xml", XmlReporter )
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+// end catch_reporter_xml.cpp
+
+namespace Catch {
+ LeakDetector leakDetector;
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_impl.hpp
+#endif
+
+#ifdef CATCH_CONFIG_MAIN
+// start catch_default_main.hpp
+
+#ifndef __OBJC__
+
+#if defined(CATCH_CONFIG_WCHAR) && defined(WIN32) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
+// Standard C/C++ Win32 Unicode wmain entry point
+extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
+#else
+// Standard C/C++ main entry point
+int main (int argc, char * argv[]) {
+#endif
+
+ return Catch::Session().run( argc, argv );
+}
+
+#else // __OBJC__
+
+// Objective-C entry point
+int main (int argc, char * const argv[]) {
+#if !CATCH_ARC_ENABLED
+ NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+#endif
+
+ Catch::registerTestMethods();
+ int result = Catch::Session().run( argc, (char**)argv );
+
+#if !CATCH_ARC_ENABLED
+ [pool drain];
+#endif
+
+ return result;
+}
+
+#endif // __OBJC__
+
+// end catch_default_main.hpp
+#endif
+
+#if !defined(CATCH_CONFIG_IMPL_ONLY)
+
+#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
+# undef CLARA_CONFIG_MAIN
+#endif
+
+#if !defined(CATCH_CONFIG_DISABLE)
+//////
+// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
+#ifdef CATCH_CONFIG_PREFIX_ALL
+
+#define CATCH_REQUIRE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+
+#define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, "", __VA_ARGS__ )
+#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
+#endif// CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+#define CATCH_CHECK( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+#define CATCH_CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+
+#define CATCH_CHECK_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, "", __VA_ARGS__ )
+#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+
+#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
+#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+#define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE",__VA_ARGS__ )
+
+#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+#define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+#define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+#define CATCH_DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
+#define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#endif
+
+#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
+#define CATCH_STATIC_REQUIRE( ... ) static_assert( __VA_ARGS__ , #__VA_ARGS__ ); CATCH_SUCCEED( #__VA_ARGS__ )
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); CATCH_SUCCEED( #__VA_ARGS__ )
+#else
+#define CATCH_STATIC_REQUIRE( ... ) CATCH_REQUIRE( __VA_ARGS__ )
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) CATCH_REQUIRE_FALSE( __VA_ARGS__ )
+#endif
+
+// "BDD-style" convenience wrappers
+#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+#define CATCH_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " Given: " << desc )
+#define CATCH_AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
+#define CATCH_WHEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " When: " << desc )
+#define CATCH_AND_WHEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
+#define CATCH_THEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " Then: " << desc )
+#define CATCH_AND_THEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " And: " << desc )
+
+// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
+#else
+
+#define REQUIRE( ... ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+
+#define REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+#define CHECK( ... ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+#define CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+
+#define CHECK_THROWS( ... ) INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+
+#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
+#define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+#define CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CAPTURE",__VA_ARGS__ )
+
+#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+#define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+#define DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
+#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#endif
+
+#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
+#define STATIC_REQUIRE( ... ) static_assert( __VA_ARGS__, #__VA_ARGS__ ); SUCCEED( #__VA_ARGS__ )
+#define STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); SUCCEED( "!(" #__VA_ARGS__ ")" )
+#else
+#define STATIC_REQUIRE( ... ) REQUIRE( __VA_ARGS__ )
+#define STATIC_REQUIRE_FALSE( ... ) REQUIRE_FALSE( __VA_ARGS__ )
+#endif
+
+#endif
+
+#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
+
+// "BDD-style" convenience wrappers
+#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+
+#define GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " Given: " << desc )
+#define AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
+#define WHEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " When: " << desc )
+#define AND_WHEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
+#define THEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " Then: " << desc )
+#define AND_THEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " And: " << desc )
+
+using Catch::Detail::Approx;
+
+#else // CATCH_CONFIG_DISABLE
+
+//////
+// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
+#ifdef CATCH_CONFIG_PREFIX_ALL
+
+#define CATCH_REQUIRE( ... ) (void)(0)
+#define CATCH_REQUIRE_FALSE( ... ) (void)(0)
+
+#define CATCH_REQUIRE_THROWS( ... ) (void)(0)
+#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif// CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
+
+#define CATCH_CHECK( ... ) (void)(0)
+#define CATCH_CHECK_FALSE( ... ) (void)(0)
+#define CATCH_CHECKED_IF( ... ) if (__VA_ARGS__)
+#define CATCH_CHECKED_ELSE( ... ) if (!(__VA_ARGS__))
+#define CATCH_CHECK_NOFAIL( ... ) (void)(0)
+
+#define CATCH_CHECK_THROWS( ... ) (void)(0)
+#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CATCH_CHECK_THROWS_WITH( expr, matcher ) (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_CHECK_NOTHROW( ... ) (void)(0)
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THAT( arg, matcher ) (void)(0)
+
+#define CATCH_REQUIRE_THAT( arg, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define CATCH_INFO( msg ) (void)(0)
+#define CATCH_WARN( msg ) (void)(0)
+#define CATCH_CAPTURE( msg ) (void)(0)
+
+#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_METHOD_AS_TEST_CASE( method, ... )
+#define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
+#define CATCH_SECTION( ... )
+#define CATCH_DYNAMIC_SECTION( ... )
+#define CATCH_FAIL( ... ) (void)(0)
+#define CATCH_FAIL_CHECK( ... ) (void)(0)
+#define CATCH_SUCCEED( ... ) (void)(0)
+
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), className )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), className ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#endif
+
+// "BDD-style" convenience wrappers
+#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
+#define CATCH_GIVEN( desc )
+#define CATCH_AND_GIVEN( desc )
+#define CATCH_WHEN( desc )
+#define CATCH_AND_WHEN( desc )
+#define CATCH_THEN( desc )
+#define CATCH_AND_THEN( desc )
+
+#define CATCH_STATIC_REQUIRE( ... ) (void)(0)
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0)
+
+// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
+#else
+
+#define REQUIRE( ... ) (void)(0)
+#define REQUIRE_FALSE( ... ) (void)(0)
+
+#define REQUIRE_THROWS( ... ) (void)(0)
+#define REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
+#define REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define REQUIRE_NOTHROW( ... ) (void)(0)
+
+#define CHECK( ... ) (void)(0)
+#define CHECK_FALSE( ... ) (void)(0)
+#define CHECKED_IF( ... ) if (__VA_ARGS__)
+#define CHECKED_ELSE( ... ) if (!(__VA_ARGS__))
+#define CHECK_NOFAIL( ... ) (void)(0)
+
+#define CHECK_THROWS( ... ) (void)(0)
+#define CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CHECK_THROWS_WITH( expr, matcher ) (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CHECK_NOTHROW( ... ) (void)(0)
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THAT( arg, matcher ) (void)(0)
+
+#define REQUIRE_THAT( arg, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define INFO( msg ) (void)(0)
+#define WARN( msg ) (void)(0)
+#define CAPTURE( msg ) (void)(0)
+
+#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define METHOD_AS_TEST_CASE( method, ... )
+#define REGISTER_TEST_CASE( Function, ... ) (void)(0)
+#define SECTION( ... )
+#define DYNAMIC_SECTION( ... )
+#define FAIL( ... ) (void)(0)
+#define FAIL_CHECK( ... ) (void)(0)
+#define SUCCEED( ... ) (void)(0)
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), className )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) ) )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), className ) )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#endif
+
+#define STATIC_REQUIRE( ... ) (void)(0)
+#define STATIC_REQUIRE_FALSE( ... ) (void)(0)
+
+#endif
+
+#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+
+// "BDD-style" convenience wrappers
+#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ) )
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
+
+#define GIVEN( desc )
+#define AND_GIVEN( desc )
+#define WHEN( desc )
+#define AND_WHEN( desc )
+#define THEN( desc )
+#define AND_THEN( desc )
+
+using Catch::Detail::Approx;
+
+#endif
+
+#endif // ! CATCH_CONFIG_IMPL_ONLY
+
+// start catch_reenable_warnings.h
+
+
+#ifdef __clang__
+# ifdef __ICC // icpc defines the __clang__ macro
+# pragma warning(pop)
+# else
+# pragma clang diagnostic pop
+# endif
+#elif defined __GNUC__
+# pragma GCC diagnostic pop
+#endif
+
+// end catch_reenable_warnings.h
+// end catch.hpp
+#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+
diff --git a/third_party/seasocks/src/test/c/test_main.cpp b/third_party/seasocks/src/test/c/test_main.cpp
index 11624ac..391a894 100644
--- a/third_party/seasocks/src/test/c/test_main.cpp
+++ b/third_party/seasocks/src/test/c/test_main.cpp
@@ -1,31 +1,27 @@
-// Copyright (c) 2013, Matt Godbolt
+// Copyright (c) 2013-2017, Matt Godbolt
// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
+//
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
+//
+// Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
+//
+// Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
-#include <gmock/gmock.h>
-
-int main(int argc, char** argv) {
- ::testing::InitGoogleTest(&argc, argv);
- return RUN_ALL_TESTS();
-}
+#define CATCH_CONFIG_MAIN
+#include <catch2/catch.hpp>
diff --git a/third_party/seasocks/src/test/suppressions.txt b/third_party/seasocks/src/test/suppressions.txt
new file mode 100644
index 0000000..aa60a8c
--- /dev/null
+++ b/third_party/seasocks/src/test/suppressions.txt
@@ -0,0 +1,9 @@
+{
+ malloc - call_init
+ Memcheck:Leak
+ match-leak-kinds: reachable
+ fun:malloc
+ ...
+ fun:call_init
+ ...
+}
diff --git a/third_party/seasocks/src/ws_chatroom_web/app.js b/third_party/seasocks/src/ws_chatroom_web/app.js
new file mode 100644
index 0000000..2892c6f
--- /dev/null
+++ b/third_party/seasocks/src/ws_chatroom_web/app.js
@@ -0,0 +1,30 @@
+var ws;
+
+function add(text) {
+ var chat = $('#chat-area');
+ chat.text(chat.text() + "\n" + text);
+}
+
+$(function begin() {
+ $('#form').submit(function onSubmit(e) {
+ var ci = $('#chat-input');
+ ws.send(ci.val());
+ ci.val("");
+ e.preventDefault();
+ });
+ // Test the protocol support...
+ ws = new WebSocket('ws://' + document.location.host + '/chat', ['string', 'foo']);
+ ws.onopen = function () {
+ console.log('onopen');
+ };
+ ws.onclose = function () {
+ add('Lost connection.');
+ console.log('onclose');
+ };
+ ws.onmessage = function (message) {
+ add(message.data);
+ };
+ ws.onerror = function (error) {
+ add("ERROR: " + error);
+ };
+});
diff --git a/third_party/seasocks/src/ws_chatroom_web/index.html b/third_party/seasocks/src/ws_chatroom_web/index.html
new file mode 100644
index 0000000..ddcd6b3
--- /dev/null
+++ b/third_party/seasocks/src/ws_chatroom_web/index.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>Seasocks chatroom</title>
+ <script src='lib/jquery.min.js'></script>
+ <script src='app.js'></script>
+</head>
+<body>
+<h2>Chatroom</h2>
+<form id="form">
+ <input id="chat-input" type="text"><input id="submit" type="submit">
+</form>
+<pre id="chat-area" style="height:400px"></pre>
+</body>
+</html>
+
diff --git a/third_party/seasocks/src/ws_chatroom_web/lib/jquery.min.js b/third_party/seasocks/src/ws_chatroom_web/lib/jquery.min.js
new file mode 100644
index 0000000..f78f96a
--- /dev/null
+++ b/third_party/seasocks/src/ws_chatroom_web/lib/jquery.min.js
@@ -0,0 +1,16 @@
+/*!
+ * jQuery JavaScript Library v1.5.2
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu Mar 31 15:28:23 2011 -0400
+ */
+(function(a,b){function ci(a){return d.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cf(a){if(!b_[a]){var b=d("<"+a+">").appendTo("body"),c=b.css("display");b.remove();if(c==="none"||c==="")c="block";b_[a]=c}return b_[a]}function ce(a,b){var c={};d.each(cd.concat.apply([],cd.slice(0,b)),function(){c[this]=a});return c}function b$(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function bZ(){try{return new a.XMLHttpRequest}catch(b){}}function bY(){d(a).unload(function(){for(var a in bW)bW[a](0,1)})}function bS(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var e=a.dataTypes,f={},g,h,i=e.length,j,k=e[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h==="string"&&(f[h.toLowerCase()]=a.converters[h]);l=k,k=e[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=f[m]||f["* "+k];if(!n){p=b;for(o in f){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=f[j[1]+" "+k];if(p){o=f[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&d.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bR(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bQ(a,b,c,e){if(d.isArray(b)&&b.length)d.each(b,function(b,f){c||bs.test(a)?e(a,f):bQ(a+"["+(typeof f==="object"||d.isArray(f)?b:"")+"]",f,c,e)});else if(c||b==null||typeof b!=="object")e(a,b);else if(d.isArray(b)||d.isEmptyObject(b))e(a,"");else for(var f in b)bQ(a+"["+f+"]",b[f],c,e)}function bP(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bJ,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l==="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bP(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bP(a,c,d,e,"*",g));return l}function bO(a){return function(b,c){typeof b!=="string"&&(c=b,b="*");if(d.isFunction(c)){var e=b.toLowerCase().split(bD),f=0,g=e.length,h,i,j;for(;f<g;f++)h=e[f],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bq(a,b,c){var e=b==="width"?bk:bl,f=b==="width"?a.offsetWidth:a.offsetHeight;if(c==="border")return f;d.each(e,function(){c||(f-=parseFloat(d.css(a,"padding"+this))||0),c==="margin"?f+=parseFloat(d.css(a,"margin"+this))||0:f-=parseFloat(d.css(a,"border"+this+"Width"))||0});return f}function bc(a,b){b.src?d.ajax({url:b.src,async:!1,dataType:"script"}):d.globalEval(b.text||b.textContent||b.innerHTML||""),b.parentNode&&b.parentNode.removeChild(b)}function bb(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function ba(a,b){if(b.nodeType===1){var c=b.nodeName.toLowerCase();b.clearAttributes(),b.mergeAttributes(a);if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(d.expando)}}function _(a,b){if(b.nodeType===1&&d.hasData(a)){var c=d.expando,e=d.data(a),f=d.data(b,e);if(e=e[c]){var g=e.events;f=f[c]=d.extend({},e);if(g){delete f.handle,f.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)d.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function $(a,b){return d.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Q(a,b,c){if(d.isFunction(b))return d.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return d.grep(a,function(a,d){return a===b===c});if(typeof b==="string"){var e=d.grep(a,function(a){return a.nodeType===1});if(L.test(b))return d.filter(b,e,!c);b=d.filter(b,e)}return d.grep(a,function(a,e){return d.inArray(a,b)>=0===c})}function P(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function H(a,b){return(a&&a!=="*"?a+".":"")+b.replace(t,"`").replace(u,"&")}function G(a){var b,c,e,f,g,h,i,j,k,l,m,n,o,p=[],q=[],s=d._data(this,"events");if(a.liveFired!==this&&s&&s.live&&!a.target.disabled&&(!a.button||a.type!=="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var t=s.live.slice(0);for(i=0;i<t.length;i++)g=t[i],g.origType.replace(r,"")===a.type?q.push(g.selector):t.splice(i--,1);f=d(a.target).closest(q,a.currentTarget);for(j=0,k=f.length;j<k;j++){m=f[j];for(i=0;i<t.length;i++){g=t[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,e=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,e=d(a.relatedTarget).closest(g.selector)[0];(!e||e!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){f=p[j];if(c&&f.level>c)break;a.currentTarget=f.elem,a.data=f.handleObj.data,a.handleObj=f.handleObj,o=f.handleObj.origHandler.apply(f.elem,arguments);if(o===!1||a.isPropagationStopped()){c=f.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function E(a,c,e){var f=d.extend({},e[0]);f.type=a,f.originalEvent={},f.liveFired=b,d.event.handle.call(c,f),f.isDefaultPrevented()&&e[0].preventDefault()}function y(){return!0}function x(){return!1}function i(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function h(a,c,e){if(e===b&&a.nodeType===1){e=a.getAttribute("data-"+c);if(typeof e==="string"){try{e=e==="true"?!0:e==="false"?!1:e==="null"?null:d.isNaN(e)?g.test(e)?d.parseJSON(e):e:parseFloat(e)}catch(f){}d.data(a,c,e)}else e=b}return e}var c=a.document,d=function(){function G(){if(!d.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(G,1);return}d.ready()}}var d=function(a,b){return new d.fn.init(a,b,g)},e=a.jQuery,f=a.$,g,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,i=/\S/,j=/^\s+/,k=/\s+$/,l=/\d/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=navigator.userAgent,w,x,y,z=Object.prototype.toString,A=Object.prototype.hasOwnProperty,B=Array.prototype.push,C=Array.prototype.slice,D=String.prototype.trim,E=Array.prototype.indexOf,F={};d.fn=d.prototype={constructor:d,init:function(a,e,f){var g,i,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!e&&c.body){this.context=c,this[0]=c.body,this.selector="body",this.length=1;return this}if(typeof a==="string"){g=h.exec(a);if(!g||!g[1]&&e)return!e||e.jquery?(e||f).find(a):this.constructor(e).find(a);if(g[1]){e=e instanceof d?e[0]:e,k=e?e.ownerDocument||e:c,j=m.exec(a),j?d.isPlainObject(e)?(a=[c.createElement(j[1])],d.fn.attr.call(a,e,!0)):a=[k.createElement(j[1])]:(j=d.buildFragment([g[1]],[k]),a=(j.cacheable?d.clone(j.fragment):j.fragment).childNodes);return d.merge(this,a)}i=c.getElementById(g[2]);if(i&&i.parentNode){if(i.id!==g[2])return f.find(a);this.length=1,this[0]=i}this.context=c,this.selector=a;return this}if(d.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return d.makeArray(a,this)},selector:"",jquery:"1.5.2",length:0,size:function(){return this.length},toArray:function(){return C.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var e=this.constructor();d.isArray(a)?B.apply(e,a):d.merge(e,a),e.prevObject=this,e.context=this.context,b==="find"?e.selector=this.selector+(this.selector?" ":"")+c:b&&(e.selector=this.selector+"."+b+"("+c+")");return e},each:function(a,b){return d.each(this,a,b)},ready:function(a){d.bindReady(),x.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(C.apply(this,arguments),"slice",C.call(arguments).join(","))},map:function(a){return this.pushStack(d.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:B,sort:[].sort,splice:[].splice},d.fn.init.prototype=d.fn,d.extend=d.fn.extend=function(){var a,c,e,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i==="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!=="object"&&!d.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){e=i[c],f=a[c];if(i===f)continue;l&&f&&(d.isPlainObject(f)||(g=d.isArray(f)))?(g?(g=!1,h=e&&d.isArray(e)?e:[]):h=e&&d.isPlainObject(e)?e:{},i[c]=d.extend(l,h,f)):f!==b&&(i[c]=f)}return i},d.extend({noConflict:function(b){a.$=f,b&&(a.jQuery=e);return d},isReady:!1,readyWait:1,ready:function(a){a===!0&&d.readyWait--;if(!d.readyWait||a!==!0&&!d.isReady){if(!c.body)return setTimeout(d.ready,1);d.isReady=!0;if(a!==!0&&--d.readyWait>0)return;x.resolveWith(c,[d]),d.fn.trigger&&d(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!x){x=d._Deferred();if(c.readyState==="complete")return setTimeout(d.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",y,!1),a.addEventListener("load",d.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",y),a.attachEvent("onload",d.ready);var b=!1;try{b=a.frameElement==null}catch(e){}c.documentElement.doScroll&&b&&G()}}},isFunction:function(a){return d.type(a)==="function"},isArray:Array.isArray||function(a){return d.type(a)==="array"},isWindow:function(a){return a&&typeof a==="object"&&"setInterval"in a},isNaN:function(a){return a==null||!l.test(a)||isNaN(a)},type:function(a){return a==null?String(a):F[z.call(a)]||"object"},isPlainObject:function(a){if(!a||d.type(a)!=="object"||a.nodeType||d.isWindow(a))return!1;if(a.constructor&&!A.call(a,"constructor")&&!A.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a){}return c===b||A.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!=="string"||!b)return null;b=d.trim(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return a.JSON&&a.JSON.parse?a.JSON.parse(b):(new Function("return "+b))();d.error("Invalid JSON: "+b)},parseXML:function(b,c,e){a.DOMParser?(e=new DOMParser,c=e.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),e=c.documentElement,(!e||!e.nodeName||e.nodeName==="parsererror")&&d.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(a){if(a&&i.test(a)){var b=c.head||c.getElementsByTagName("head")[0]||c.documentElement,e=c.createElement("script");d.support.scriptEval()?e.appendChild(c.createTextNode(a)):e.text=a,b.insertBefore(e,b.firstChild),b.removeChild(e)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,e){var f,g=0,h=a.length,i=h===b||d.isFunction(a);if(e){if(i){for(f in a)if(c.apply(a[f],e)===!1)break}else for(;g<h;)if(c.apply(a[g++],e)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(var j=a[0];g<h&&c.call(j,g,j)!==!1;j=a[++g]){}return a},trim:D?function(a){return a==null?"":D.call(a)}:function(a){return a==null?"":(a+"").replace(j,"").replace(k,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var e=d.type(a);a.length==null||e==="string"||e==="function"||e==="regexp"||d.isWindow(a)?B.call(c,a):d.merge(c,a)}return c},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length==="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,b,c){var d=[],e;for(var f=0,g=a.length;f<g;f++)e=b(a[f],f,c),e!=null&&(d[d.length]=e);return d.concat.apply([],d)},guid:1,proxy:function(a,c,e){arguments.length===2&&(typeof c==="string"?(e=a,a=e[c],c=b):c&&!d.isFunction(c)&&(e=c,c=b)),!c&&a&&(c=function(){return a.apply(e||this,arguments)}),a&&(c.guid=a.guid=a.guid||c.guid||d.guid++);return c},access:function(a,c,e,f,g,h){var i=a.length;if(typeof c==="object"){for(var j in c)d.access(a,j,c[j],f,g,e);return a}if(e!==b){f=!h&&f&&d.isFunction(e);for(var k=0;k<i;k++)g(a[k],c,f?e.call(a[k],k,g(a[k],c)):e,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}d.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.subclass=this.subclass,a.fn.init=function b(b,c){c&&c instanceof d&&!(c instanceof a)&&(c=a(c));return d.fn.init.call(this,b,c,e)},a.fn.init.prototype=a.fn;var e=a(c);return a},browser:{}}),d.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){F["[object "+b+"]"]=b.toLowerCase()}),w=d.uaMatch(v),w.browser&&(d.browser[w.browser]=!0,d.browser.version=w.version),d.browser.webkit&&(d.browser.safari=!0),E&&(d.inArray=function(a,b){return E.call(b,a)}),i.test(" ")&&(j=/^[\s\xA0]+/,k=/[\s\xA0]+$/),g=d(c),c.addEventListener?y=function(){c.removeEventListener("DOMContentLoaded",y,!1),d.ready()}:c.attachEvent&&(y=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",y),d.ready())});return d}(),e="then done fail isResolved isRejected promise".split(" "),f=[].slice;d.extend({_Deferred:function(){var a=[],b,c,e,f={done:function(){if(!e){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=d.type(i),j==="array"?f.done.apply(f,i):j==="function"&&a.push(i);k&&f.resolveWith(k[0],k[1])}return this},resolveWith:function(d,f){if(!e&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(d,f)}finally{b=[d,f],c=0}}return this},resolve:function(){f.resolveWith(this,arguments);return this},isResolved:function(){return c||b},cancel:function(){e=1,a=[];return this}};return f},Deferred:function(a){var b=d._Deferred(),c=d._Deferred(),f;d.extend(b,{then:function(a,c){b.done(a).fail(c);return this},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,promise:function(a){if(a==null){if(f)return f;f=a={}}var c=e.length;while(c--)a[e[c]]=b[e[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?f.call(arguments,0):c,--g||h.resolveWith(h,f.call(b,0))}}var b=arguments,c=0,e=b.length,g=e,h=e<=1&&a&&d.isFunction(a.promise)?a:d.Deferred();if(e>1){for(;c<e;c++)b[c]&&d.isFunction(b[c].promise)?b[c].promise().then(i(c),h.reject):--g;g||h.resolveWith(h,b)}else h!==a&&h.resolveWith(h,e?[a]:[]);return h.promise()}}),function(){d.support={};var b=c.createElement("div");b.style.display="none",b.innerHTML=" <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var e=b.getElementsByTagName("*"),f=b.getElementsByTagName("a")[0],g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=b.getElementsByTagName("input")[0];if(e&&e.length&&f){d.support={leadingWhitespace:b.firstChild.nodeType===3,tbody:!b.getElementsByTagName("tbody").length,htmlSerialize:!!b.getElementsByTagName("link").length,style:/red/.test(f.getAttribute("style")),hrefNormalized:f.getAttribute("href")==="/a",opacity:/^0.55$/.test(f.style.opacity),cssFloat:!!f.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,deleteExpando:!0,optDisabled:!1,checkClone:!1,noCloneEvent:!0,noCloneChecked:!0,boxModel:null,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableHiddenOffsets:!0,reliableMarginRight:!0},i.checked=!0,d.support.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,d.support.optDisabled=!h.disabled;var j=null;d.support.scriptEval=function(){if(j===null){var b=c.documentElement,e=c.createElement("script"),f="script"+d.now();try{e.appendChild(c.createTextNode("window."+f+"=1;"))}catch(g){}b.insertBefore(e,b.firstChild),a[f]?(j=!0,delete a[f]):j=!1,b.removeChild(e)}return j};try{delete b.test}catch(k){d.support.deleteExpando=!1}!b.addEventListener&&b.attachEvent&&b.fireEvent&&(b.attachEvent("onclick",function l(){d.support.noCloneEvent=!1,b.detachEvent("onclick",l)}),b.cloneNode(!0).fireEvent("onclick")),b=c.createElement("div"),b.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";var m=c.createDocumentFragment();m.appendChild(b.firstChild),d.support.checkClone=m.cloneNode(!0).cloneNode(!0).lastChild.checked,d(function(){var a=c.createElement("div"),b=c.getElementsByTagName("body")[0];if(b){a.style.width=a.style.paddingLeft="1px",b.appendChild(a),d.boxModel=d.support.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,d.support.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",d.support.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";var e=a.getElementsByTagName("td");d.support.reliableHiddenOffsets=e[0].offsetHeight===0,e[0].style.display="",e[1].style.display="none",d.support.reliableHiddenOffsets=d.support.reliableHiddenOffsets&&e[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(a.style.width="1px",a.style.marginRight="0",d.support.reliableMarginRight=(parseInt(c.defaultView.getComputedStyle(a,null).marginRight,10)||0)===0),b.removeChild(a).style.display="none",a=e=null}});var n=function(a){var b=c.createElement("div");a="on"+a;if(!b.attachEvent)return!0;var d=a in b;d||(b.setAttribute(a,"return;"),d=typeof b[a]==="function");return d};d.support.submitBubbles=n("submit"),d.support.changeBubbles=n("change"),b=e=f=null}}();var g=/^(?:\{.*\}|\[.*\])$/;d.extend({cache:{},uuid:0,expando:"jQuery"+(d.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?d.cache[a[d.expando]]:a[d.expando];return!!a&&!i(a)},data:function(a,c,e,f){if(d.acceptData(a)){var g=d.expando,h=typeof c==="string",i,j=a.nodeType,k=j?d.cache:a,l=j?a[d.expando]:a[d.expando]&&d.expando;if((!l||f&&l&&!k[l][g])&&h&&e===b)return;l||(j?a[d.expando]=l=++d.uuid:l=d.expando),k[l]||(k[l]={},j||(k[l].toJSON=d.noop));if(typeof c==="object"||typeof c==="function")f?k[l][g]=d.extend(k[l][g],c):k[l]=d.extend(k[l],c);i=k[l],f&&(i[g]||(i[g]={}),i=i[g]),e!==b&&(i[c]=e);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[c]:i}},removeData:function(b,c,e){if(d.acceptData(b)){var f=d.expando,g=b.nodeType,h=g?d.cache:b,j=g?b[d.expando]:d.expando;if(!h[j])return;if(c){var k=e?h[j][f]:h[j];if(k){delete k[c];if(!i(k))return}}if(e){delete h[j][f];if(!i(h[j]))return}var l=h[j][f];d.support.deleteExpando||h!=a?delete h[j]:h[j]=null,l?(h[j]={},g||(h[j].toJSON=d.noop),h[j][f]=l):g&&(d.support.deleteExpando?delete b[d.expando]:b.removeAttribute?b.removeAttribute(d.expando):b[d.expando]=null)}},_data:function(a,b,c){return d.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=d.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),d.fn.extend({data:function(a,c){var e=null;if(typeof a==="undefined"){if(this.length){e=d.data(this[0]);if(this[0].nodeType===1){var f=this[0].attributes,g;for(var i=0,j=f.length;i<j;i++)g=f[i].name,g.indexOf("data-")===0&&(g=g.substr(5),h(this[0],g,e[g]))}}return e}if(typeof a==="object")return this.each(function(){d.data(this,a)});var k=a.split(".");k[1]=k[1]?"."+k[1]:"";if(c===b){e=this.triggerHandler("getData"+k[1]+"!",[k[0]]),e===b&&this.length&&(e=d.data(this[0],a),e=h(this[0],a,e));return e===b&&k[1]?this.data(k[0]):e}return this.each(function(){var b=d(this),e=[k[0],c];b.triggerHandler("setData"+k[1]+"!",e),d.data(this,a,c),b.triggerHandler("changeData"+k[1]+"!",e)})},removeData:function(a){return this.each(function(){d.removeData(this,a)})}}),d.extend({queue:function(a,b,c){if(a){b=(b||"fx")+"queue";var e=d._data(a,b);if(!c)return e||[];!e||d.isArray(c)?e=d._data(a,b,d.makeArray(c)):e.push(c);return e}},dequeue:function(a,b){b=b||"fx";var c=d.queue(a,b),e=c.shift();e==="inprogress"&&(e=c.shift()),e&&(b==="fx"&&c.unshift("inprogress"),e.call(a,function(){d.dequeue(a,b)})),c.length||d.removeData(a,b+"queue",!0)}}),d.fn.extend({queue:function(a,c){typeof a!=="string"&&(c=a,a="fx");if(c===b)return d.queue(this[0],a);return this.each(function(b){var e=d.queue(this,a,c);a==="fx"&&e[0]!=="inprogress"&&d.dequeue(this,a)})},dequeue:function(a){return this.each(function(){d.dequeue(this,a)})},delay:function(a,b){a=d.fx?d.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){d.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var j=/[\n\t\r]/g,k=/\s+/,l=/\r/g,m=/^(?:href|src|style)$/,n=/^(?:button|input)$/i,o=/^(?:button|input|object|select|textarea)$/i,p=/^a(?:rea)?$/i,q=/^(?:radio|checkbox)$/i;d.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"},d.fn.extend({attr:function(a,b){return d.access(this,a,b,!0,d.attr)},removeAttr:function(a,b){return this.each(function(){d.attr(this,a,""),this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.addClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"){var b=(a||"").split(k);for(var c=0,e=this.length;c<e;c++){var f=this[c];if(f.nodeType===1)if(f.className){var g=" "+f.className+" ",h=f.className;for(var i=0,j=b.length;i<j;i++)g.indexOf(" "+b[i]+" ")<0&&(h+=" "+b[i]);f.className=d.trim(h)}else f.className=a}}return this},removeClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.removeClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"||a===b){var c=(a||"").split(k);for(var e=0,f=this.length;e<f;e++){var g=this[e];if(g.nodeType===1&&g.className)if(a){var h=(" "+g.className+" ").replace(j," ");for(var i=0,l=c.length;i<l;i++)h=h.replace(" "+c[i]+" "," ");g.className=d.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,e=typeof b==="boolean";if(d.isFunction(a))return this.each(function(c){var e=d(this);e.toggleClass(a.call(this,c,e.attr("class"),b),b)});return this.each(function(){if(c==="string"){var f,g=0,h=d(this),i=b,j=a.split(k);while(f=j[g++])i=e?i:!h.hasClass(f),h[i?"addClass":"removeClass"](f)}else if(c==="undefined"||c==="boolean")this.className&&d._data(this,"__className__",this.className),this.className=this.className||a===!1?"":d._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(j," ").indexOf(b)>-1)return!0;return!1},val:function(a){if(!arguments.length){var c=this[0];if(c){if(d.nodeName(c,"option")){var e=c.attributes.value;return!e||e.specified?c.value:c.text}if(d.nodeName(c,"select")){var f=c.selectedIndex,g=[],h=c.options,i=c.type==="select-one";if(f<0)return null;for(var j=i?f:0,k=i?f+1:h.length;j<k;j++){var m=h[j];if(m.selected&&(d.support.optDisabled?!m.disabled:m.getAttribute("disabled")===null)&&(!m.parentNode.disabled||!d.nodeName(m.parentNode,"optgroup"))){a=d(m).val();if(i)return a;g.push(a)}}if(i&&!g.length&&h.length)return d(h[f]).val();return g}if(q.test(c.type)&&!d.support.checkOn)return c.getAttribute("value")===null?"on":c.value;return(c.value||"").replace(l,"")}return b}var n=d.isFunction(a);return this.each(function(b){var c=d(this),e=a;if(this.nodeType===1){n&&(e=a.call(this,b,c.val())),e==null?e="":typeof e==="number"?e+="":d.isArray(e)&&(e=d.map(e,function(a){return a==null?"":a+""}));if(d.isArray(e)&&q.test(this.type))this.checked=d.inArray(c.val(),e)>=0;else if(d.nodeName(this,"select")){var f=d.makeArray(e);d("option",this).each(function(){this.selected=d.inArray(d(this).val(),f)>=0}),f.length||(this.selectedIndex=-1)}else this.value=e}})}}),d.extend({attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,e,f){if(!a||a.nodeType===3||a.nodeType===8||a.nodeType===2)return b;if(f&&c in d.attrFn)return d(a)[c](e);var g=a.nodeType!==1||!d.isXMLDoc(a),h=e!==b;c=g&&d.props[c]||c;if(a.nodeType===1){var i=m.test(c);if(c==="selected"&&!d.support.optSelected){var j=a.parentNode;j&&(j.selectedIndex,j.parentNode&&j.parentNode.selectedIndex)}if((c in a||a[c]!==b)&&g&&!i){h&&(c==="type"&&n.test(a.nodeName)&&a.parentNode&&d.error("type property can't be changed"),e===null?a.nodeType===1&&a.removeAttribute(c):a[c]=e);if(d.nodeName(a,"form")&&a.getAttributeNode(c))return a.getAttributeNode(c).nodeValue;if(c==="tabIndex"){var k=a.getAttributeNode("tabIndex");return k&&k.specified?k.value:o.test(a.nodeName)||p.test(a.nodeName)&&a.href?0:b}return a[c]}if(!d.support.style&&g&&c==="style"){h&&(a.style.cssText=""+e);return a.style.cssText}h&&a.setAttribute(c,""+e);if(!a.attributes[c]&&(a.hasAttribute&&!a.hasAttribute(c)))return b;var l=!d.support.hrefNormalized&&g&&i?a.getAttribute(c,2):a.getAttribute(c);return l===null?b:l}h&&(a[c]=e);return a[c]}});var r=/\.(.*)$/,s=/^(?:textarea|input|select)$/i,t=/\./g,u=/ /g,v=/[^\w\s.|`]/g,w=function(a){return a.replace(v,"\\$&")};d.event={add:function(c,e,f,g){if(c.nodeType!==3&&c.nodeType!==8){try{d.isWindow(c)&&(c!==a&&!c.frameElement)&&(c=a)}catch(h){}if(f===!1)f=x;else if(!f)return;var i,j;f.handler&&(i=f,f=i.handler),f.guid||(f.guid=d.guid++);var k=d._data(c);if(!k)return;var l=k.events,m=k.handle;l||(k.events=l={}),m||(k.handle=m=function(a){return typeof d!=="undefined"&&d.event.triggered!==a.type?d.event.handle.apply(m.elem,arguments):b}),m.elem=c,e=e.split(" ");var n,o=0,p;while(n=e[o++]){j=i?d.extend({},i):{handler:f,data:g},n.indexOf(".")>-1?(p=n.split("."),n=p.shift(),j.namespace=p.slice(0).sort().join(".")):(p=[],j.namespace=""),j.type=n,j.guid||(j.guid=f.guid);var q=l[n],r=d.event.special[n]||{};if(!q){q=l[n]=[];if(!r.setup||r.setup.call(c,g,p,m)===!1)c.addEventListener?c.addEventListener(n,m,!1):c.attachEvent&&c.attachEvent("on"+n,m)}r.add&&(r.add.call(c,j),j.handler.guid||(j.handler.guid=f.guid)),q.push(j),d.event.global[n]=!0}c=null}},global:{},remove:function(a,c,e,f){if(a.nodeType!==3&&a.nodeType!==8){e===!1&&(e=x);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=d.hasData(a)&&d._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(e=c.handler,c=c.type);if(!c||typeof c==="string"&&c.charAt(0)==="."){c=c||"";for(h in t)d.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+d.map(m.slice(0).sort(),w).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!e){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))d.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=d.event.special[h]||{};for(j=f||0;j<p.length;j++){q=p[j];if(e.guid===q.guid){if(l||n.test(q.namespace))f==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(f!=null)break}}if(p.length===0||f!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&d.removeEvent(a,h,s.handle),g=null,delete t[h]}if(d.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,d.isEmptyObject(s)&&d.removeData(a,b,!0)}}},trigger:function(a,c,e){var f=a.type||a,g=arguments[3];if(!g){a=typeof a==="object"?a[d.expando]?a:d.extend(d.Event(f),a):d.Event(f),f.indexOf("!")>=0&&(a.type=f=f.slice(0,-1),a.exclusive=!0),e||(a.stopPropagation(),d.event.global[f]&&d.each(d.cache,function(){var b=d.expando,e=this[b];e&&e.events&&e.events[f]&&d.event.trigger(a,c,e.handle.elem)}));if(!e||e.nodeType===3||e.nodeType===8)return b;a.result=b,a.target=e,c=d.makeArray(c),c.unshift(a)}a.currentTarget=e;var h=d._data(e,"handle");h&&h.apply(e,c);var i=e.parentNode||e.ownerDocument;try{e&&e.nodeName&&d.noData[e.nodeName.toLowerCase()]||e["on"+f]&&e["on"+f].apply(e,c)===!1&&(a.result=!1,a.preventDefault())}catch(j){}if(!a.isPropagationStopped()&&i)d.event.trigger(a,c,i,!0);else if(!a.isDefaultPrevented()){var k,l=a.target,m=f.replace(r,""),n=d.nodeName(l,"a")&&m==="click",o=d.event.special[m]||{};if((!o._default||o._default.call(e,a)===!1)&&!n&&!(l&&l.nodeName&&d.noData[l.nodeName.toLowerCase()])){try{l[m]&&(k=l["on"+m],k&&(l["on"+m]=null),d.event.triggered=a.type,l[m]())}catch(p){}k&&(l["on"+m]=k),d.event.triggered=b}}},handle:function(c){var e,f,g,h,i,j=[],k=d.makeArray(arguments);c=k[0]=d.event.fix(c||a.event),c.currentTarget=this,e=c.type.indexOf(".")<0&&!c.exclusive,e||(g=c.type.split("."),c.type=g.shift(),j=g.slice(0).sort(),h=new RegExp("(^|\\.)"+j.join("\\.(?:.*\\.)?")+"(\\.|$)")),c.namespace=c.namespace||j.join("."),i=d._data(this,"events"),f=(i||{})[c.type];if(i&&f){f=f.slice(0);for(var l=0,m=f.length;l<m;l++){var n=f[l];if(e||h.test(n.namespace)){c.handler=n.handler,c.data=n.data,c.handleObj=n;var o=n.handler.apply(this,k);o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[d.expando])return a;var e=a;a=d.Event(e);for(var f=this.props.length,g;f;)g=this.props[--f],a[g]=e[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=c.documentElement,i=c.body;a.pageX=a.clientX+(h&&h.scrollLeft||i&&i.scrollLeft||0)-(h&&h.clientLeft||i&&i.clientLeft||0),a.pageY=a.clientY+(h&&h.scrollTop||i&&i.scrollTop||0)-(h&&h.clientTop||i&&i.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:d.proxy,special:{ready:{setup:d.bindReady,teardown:d.noop},live:{add:function(a){d.event.add(this,H(a.origType,a.selector),d.extend({},a,{handler:G,guid:a.handler.guid}))},remove:function(a){d.event.remove(this,H(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){d.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},d.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},d.Event=function(a){if(!this.preventDefault)return new d.Event(a);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?y:x):this.type=a,this.timeStamp=d.now(),this[d.expando]=!0},d.Event.prototype={preventDefault:function(){this.isDefaultPrevented=y;var a=this.originalEvent;a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=y;var a=this.originalEvent;a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=y,this.stopPropagation()},isDefaultPrevented:x,isPropagationStopped:x,isImmediatePropagationStopped:x};var z=function(a){var b=a.relatedTarget;try{if(b&&b!==c&&!b.parentNode)return;while(b&&b!==this)b=b.parentNode;b!==this&&(a.type=a.data,d.event.handle.apply(this,arguments))}catch(e){}},A=function(a){a.type=a.data,d.event.handle.apply(this,arguments)};d.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){d.event.special[a]={setup:function(c){d.event.add(this,b,c&&c.selector?A:z,a)},teardown:function(a){d.event.remove(this,b,a&&a.selector?A:z)}}}),d.support.submitBubbles||(d.event.special.submit={setup:function(a,b){if(this.nodeName&&this.nodeName.toLowerCase()!=="form")d.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&d(b).closest("form").length&&E("submit",this,arguments)}),d.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&d(b).closest("form").length&&a.keyCode===13&&E("submit",this,arguments)});else return!1},teardown:function(a){d.event.remove(this,".specialSubmit")}});if(!d.support.changeBubbles){var B,C=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?d.map(a.options,function(a){return a.selected}).join("-"):"":a.nodeName.toLowerCase()==="select"&&(c=a.selectedIndex);return c},D=function D(a){var c=a.target,e,f;if(s.test(c.nodeName)&&!c.readOnly){e=d._data(c,"_change_data"),f=C(c),(a.type!=="focusout"||c.type!=="radio")&&d._data(c,"_change_data",f);if(e===b||f===e)return;if(e!=null||f)a.type="change",a.liveFired=b,d.event.trigger(a,arguments[1],c)}};d.event.special.change={filters:{focusout:D,beforedeactivate:D,click:function(a){var b=a.target,c=b.type;(c==="radio"||c==="checkbox"||b.nodeName.toLowerCase()==="select")&&D.call(this,a)},keydown:function(a){var b=a.target,c=b.type;(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&D.call(this,a)},beforeactivate:function(a){var b=a.target;d._data(b,"_change_data",C(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in B)d.event.add(this,c+".specialChange",B[c]);return s.test(this.nodeName)},teardown:function(a){d.event.remove(this,".specialChange");return s.test(this.nodeName)}},B=d.event.special.change.filters,B.focus=B.beforeactivate}c.addEventListener&&d.each({focus:"focusin",blur:"focusout"},function(a,b){function f(a){var c=d.event.fix(a);c.type=b,c.originalEvent={},d.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var e=0;d.event.special[b]={setup:function(){e++===0&&c.addEventListener(a,f,!0)},teardown:function(){--e===0&&c.removeEventListener(a,f,!0)}}}),d.each(["bind","one"],function(a,c){d.fn[c]=function(a,e,f){if(typeof a==="object"){for(var g in a)this[c](g,e,a[g],f);return this}if(d.isFunction(e)||e===!1)f=e,e=b;var h=c==="one"?d.proxy(f,function(a){d(this).unbind(a,h);return f.apply(this,arguments)}):f;if(a==="unload"&&c!=="one")this.one(a,e,f);else for(var i=0,j=this.length;i<j;i++)d.event.add(this[i],a,h,e);return this}}),d.fn.extend({unbind:function(a,b){if(typeof a!=="object"||a.preventDefault)for(var e=0,f=this.length;e<f;e++)d.event.remove(this[e],a,b);else for(var c in a)this.unbind(c,a[c]);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){d.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){var c=d.Event(a);c.preventDefault(),c.stopPropagation(),d.event.trigger(c,b,this[0]);return c.result}},toggle:function(a){var b=arguments,c=1;while(c<b.length)d.proxy(a,b[c++]);return this.click(d.proxy(a,function(e){var f=(d._data(this,"lastToggle"+a.guid)||0)%c;d._data(this,"lastToggle"+a.guid,f+1),e.preventDefault();return b[f].apply(this,arguments)||!1}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var F={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};d.each(["live","die"],function(a,c){d.fn[c]=function(a,e,f,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:d(this.context);if(typeof a==="object"&&!a.preventDefault){for(var o in a)n[c](o,e,a[o],m);return this}d.isFunction(e)&&(f=e,e=b),a=(a||"").split(" ");while((h=a[i++])!=null){j=r.exec(h),k="",j&&(k=j[0],h=h.replace(r,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,h==="focus"||h==="blur"?(a.push(F[h]+k),h=h+k):h=(F[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)d.event.add(n[p],"live."+H(h,m),{data:e,selector:m,handler:f,origType:h,origHandler:f,preType:l});else n.unbind("live."+H(h,m),f)}return this}}),d.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){d.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},d.attrFn&&(d.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!=="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,e,g){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!=="string")return e;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(f.call(n)==="[object Array]")if(u)if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&e.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&e.push(j[t]);else e.push.apply(e,n);else p(n,e);o&&(k(o,h,e,g),k.uniqueSort(e));return e};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!=="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(f){if(f===!0)continue}else g=o=!0}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b==="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1){}a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b==="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!=="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!=="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!=="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return"text"===c&&(b===c||b===null)},radio:function(a){return"radio"===a.type},checkbox:function(a){return"checkbox"===a.type},file:function(a){return"file"===a.type},password:function(a){return"password"===a.type},submit:function(a){return"submit"===a.type},image:function(a){return"image"===a.type},reset:function(a){return"reset"===a.type},button:function(a){return"button"===a.type||a.nodeName.toLowerCase()==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(f.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length==="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(a===b){g=!0;return 0}if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!=="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!=="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!=="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!=="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!=="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};d.find=k,d.expr=k.selectors,d.expr[":"]=d.expr.filters,d.unique=k.uniqueSort,d.text=k.getText,d.isXMLDoc=k.isXML,d.contains=k.contains}();var I=/Until$/,J=/^(?:parents|prevUntil|prevAll)/,K=/,/,L=/^.[^:#\[\.,]*$/,M=Array.prototype.slice,N=d.expr.match.POS,O={children:!0,contents:!0,next:!0,prev:!0};d.fn.extend({find:function(a){var b=this.pushStack("","find",a),c=0;for(var e=0,f=this.length;e<f;e++){c=b.length,d.find(a,this[e],b);if(e>0)for(var g=c;g<b.length;g++)for(var h=0;h<c;h++)if(b[h]===b[g]){b.splice(g--,1);break}}return b},has:function(a){var b=d(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(d.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(Q(this,a,!1),"not",a)},filter:function(a){return this.pushStack(Q(this,a,!0),"filter",a)},is:function(a){return!!a&&d.filter(a,this).length>0},closest:function(a,b){var c=[],e,f,g=this[0];if(d.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(e=0,f=a.length;e<f;e++)i=a[e],j[i]||(j[i]=d.expr.match.POS.test(i)?d(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:d(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=N.test(a)?d(a,b||this.context):null;for(e=0,f=this.length;e<f;e++){g=this[e];while(g){if(l?l.index(g)>-1:d.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b)break}}c=c.length>1?d.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a==="string")return d.inArray(this[0],a?d(a):this.parent().children());return d.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a==="string"?d(a,b):d.makeArray(a),e=d.merge(this.get(),c);return this.pushStack(P(c[0])||P(e[0])?e:d.unique(e))},andSelf:function(){return this.add(this.prevObject)}}),d.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return d.dir(a,"parentNode")},parentsUntil:function(a,b,c){return d.dir(a,"parentNode",c)},next:function(a){return d.nth(a,2,"nextSibling")},prev:function(a){return d.nth(a,2,"previousSibling")},nextAll:function(a){return d.dir(a,"nextSibling")},prevAll:function(a){return d.dir(a,"previousSibling")},nextUntil:function(a,b,c){return d.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return d.dir(a,"previousSibling",c)},siblings:function(a){return d.sibling(a.parentNode.firstChild,a)},children:function(a){return d.sibling(a.firstChild)},contents:function(a){return d.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:d.makeArray(a.childNodes)}},function(a,b){d.fn[a]=function(c,e){var f=d.map(this,b,c),g=M.call(arguments);I.test(a)||(e=c),e&&typeof e==="string"&&(f=d.filter(e,f)),f=this.length>1&&!O[a]?d.unique(f):f,(this.length>1||K.test(e))&&J.test(a)&&(f=f.reverse());return this.pushStack(f,a,g.join(","))}}),d.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?d.find.matchesSelector(b[0],a)?[b[0]]:[]:d.find.matches(a,b)},dir:function(a,c,e){var f=[],g=a[c];while(g&&g.nodeType!==9&&(e===b||g.nodeType!==1||!d(g).is(e)))g.nodeType===1&&f.push(g),g=g[c];return f},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var R=/ jQuery\d+="(?:\d+|null)"/g,S=/^\s+/,T=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,U=/<([\w:]+)/,V=/<tbody/i,W=/<|&#?\w+;/,X=/<(?:script|object|embed|option|style)/i,Y=/checked\s*(?:[^=]|=\s*.checked.)/i,Z={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};Z.optgroup=Z.option,Z.tbody=Z.tfoot=Z.colgroup=Z.caption=Z.thead,Z.th=Z.td,d.support.htmlSerialize||(Z._default=[1,"div<div>","</div>"]),d.fn.extend({text:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.text(a.call(this,b,c.text()))});if(typeof a!=="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return d.text(this)},wrapAll:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapAll(a.call(this,b))});if(this[0]){var b=d(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapInner(a.call(this,b))});return this.each(function(){var b=d(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){d(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){d.nodeName(this,"body")||d(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=d(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,d(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,e;(e=this[c])!=null;c++)if(!a||d.filter(a,[e]).length)!b&&e.nodeType===1&&(d.cleanData(e.getElementsByTagName("*")),d.cleanData([e])),e.parentNode&&e.parentNode.removeChild(e);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&d.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return d.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(R,""):null;if(typeof a!=="string"||X.test(a)||!d.support.leadingWhitespace&&S.test(a)||Z[(U.exec(a)||["",""])[1].toLowerCase()])d.isFunction(a)?this.each(function(b){var c=d(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);else{a=a.replace(T,"<$1></$2>");try{for(var c=0,e=this.length;c<e;c++)this[c].nodeType===1&&(d.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(f){this.empty().append(a)}}return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(d.isFunction(a))return this.each(function(b){var c=d(this),e=c.html();c.replaceWith(a.call(this,b,e))});typeof a!=="string"&&(a=d(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;d(this).remove(),b?d(b).before(a):d(c).append(a)})}return this.length?this.pushStack(d(d.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,e){var f,g,h,i,j=a[0],k=[];if(!d.support.checkClone&&arguments.length===3&&typeof j==="string"&&Y.test(j))return this.each(function(){d(this).domManip(a,c,e,!0)});if(d.isFunction(j))return this.each(function(f){var g=d(this);a[0]=j.call(this,f,c?g.html():b),g.domManip(a,c,e)});if(this[0]){i=j&&j.parentNode,d.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?f={fragment:i}:f=d.buildFragment(a,this,k),h=f.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&d.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)e.call(c?$(this[l],g):this[l],f.cacheable||m>1&&l<n?d.clone(h,!0,!0):h)}k.length&&d.each(k,bc)}return this}}),d.buildFragment=function(a,b,e){var f,g,h,i=b&&b[0]?b[0].ownerDocument||b[0]:c;a.length===1&&typeof a[0]==="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!X.test(a[0])&&(d.support.checkClone||!Y.test(a[0]))&&(g=!0,h=d.fragments[a[0]],h&&(h!==1&&(f=h))),f||(f=i.createDocumentFragment(),d.clean(a,i,f,e)),g&&(d.fragments[a[0]]=h?f:1);return{fragment:f,cacheable:g}},d.fragments={},d.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){d.fn[a]=function(c){var e=[],f=d(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&f.length===1){f[b](this[0]);return this}for(var h=0,i=f.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();d(f[h])[b](j),e=e.concat(j)}return this.pushStack(e,a,f.selector)}}),d.extend({clone:function(a,b,c){var e=a.cloneNode(!0),f,g,h;if((!d.support.noCloneEvent||!d.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!d.isXMLDoc(a)){ba(a,e),f=bb(a),g=bb(e);for(h=0;f[h];++h)ba(f[h],g[h])}if(b){_(a,e);if(c){f=bb(a),g=bb(e);for(h=0;f[h];++h)_(f[h],g[h])}}return e},clean:function(a,b,e,f){b=b||c,typeof b.createElement==="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var g=[];for(var h=0,i;(i=a[h])!=null;h++){typeof i==="number"&&(i+="");if(!i)continue;if(typeof i!=="string"||W.test(i)){if(typeof i==="string"){i=i.replace(T,"<$1></$2>");var j=(U.exec(i)||["",""])[1].toLowerCase(),k=Z[j]||Z._default,l=k[0],m=b.createElement("div");m.innerHTML=k[1]+i+k[2];while(l--)m=m.lastChild;if(!d.support.tbody){var n=V.test(i),o=j==="table"&&!n?m.firstChild&&m.firstChild.childNodes:k[1]==="<table>"&&!n?m.childNodes:[];for(var p=o.length-1;p>=0;--p)d.nodeName(o[p],"tbody")&&!o[p].childNodes.length&&o[p].parentNode.removeChild(o[p])}!d.support.leadingWhitespace&&S.test(i)&&m.insertBefore(b.createTextNode(S.exec(i)[0]),m.firstChild),i=m.childNodes}}else i=b.createTextNode(i);i.nodeType?g.push(i):g=d.merge(g,i)}if(e)for(h=0;g[h];h++)!f||!d.nodeName(g[h],"script")||g[h].type&&g[h].type.toLowerCase()!=="text/javascript"?(g[h].nodeType===1&&g.splice.apply(g,[h+1,0].concat(d.makeArray(g[h].getElementsByTagName("script")))),e.appendChild(g[h])):f.push(g[h].parentNode?g[h].parentNode.removeChild(g[h]):g[h]);return g},cleanData:function(a){var b,c,e=d.cache,f=d.expando,g=d.event.special,h=d.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&d.noData[j.nodeName.toLowerCase()])continue;c=j[d.expando];if(c){b=e[c]&&e[c][f];if(b&&b.events){for(var k in b.events)g[k]?d.event.remove(j,k):d.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[d.expando]:j.removeAttribute&&j.removeAttribute(d.expando),delete e[c]}}}});var bd=/alpha\([^)]*\)/i,be=/opacity=([^)]*)/,bf=/-([a-z])/ig,bg=/([A-Z]|^ms)/g,bh=/^-?\d+(?:px)?$/i,bi=/^-?\d/,bj={position:"absolute",visibility:"hidden",display:"block"},bk=["Left","Right"],bl=["Top","Bottom"],bm,bn,bo,bp=function(a,b){return b.toUpperCase()};d.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return d.access(this,a,c,!0,function(a,c,e){return e!==b?d.style(a,c,e):d.css(a,c)})},d.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bm(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{zIndex:!0,fontWeight:!0,opacity:!0,zoom:!0,lineHeight:!0},cssProps:{"float":d.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,e,f){if(a&&a.nodeType!==3&&a.nodeType!==8&&a.style){var g,h=d.camelCase(c),i=a.style,j=d.cssHooks[h];c=d.cssProps[h]||h;if(e===b){if(j&&"get"in j&&(g=j.get(a,!1,f))!==b)return g;return i[c]}if(typeof e==="number"&&isNaN(e)||e==null)return;typeof e==="number"&&!d.cssNumber[h]&&(e+="px");if(!j||!("set"in j)||(e=j.set(a,e))!==b)try{i[c]=e}catch(k){}}},css:function(a,c,e){var f,g=d.camelCase(c),h=d.cssHooks[g];c=d.cssProps[g]||g;if(h&&"get"in h&&(f=h.get(a,!0,e))!==b)return f;if(bm)return bm(a,c,g)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]},camelCase:function(a){return a.replace(bf,bp)}}),d.curCSS=d.css,d.each(["height","width"],function(a,b){d.cssHooks[b]={get:function(a,c,e){var f;if(c){a.offsetWidth!==0?f=bq(a,b,e):d.swap(a,bj,function(){f=bq(a,b,e)});if(f<=0){f=bm(a,b,b),f==="0px"&&bo&&(f=bo(a,b,b));if(f!=null)return f===""||f==="auto"?"0px":f}if(f<0||f==null){f=a.style[b];return f===""||f==="auto"?"0px":f}return typeof f==="string"?f:f+"px"}},set:function(a,b){if(!bh.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),d.support.opacity||(d.cssHooks.opacity={get:function(a,b){return be.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style;c.zoom=1;var e=d.isNaN(b)?"":"alpha(opacity="+b*100+")",f=c.filter||"";c.filter=bd.test(f)?f.replace(bd,e):c.filter+" "+e}}),d(function(){d.support.reliableMarginRight||(d.cssHooks.marginRight={get:function(a,b){var c;d.swap(a,{display:"inline-block"},function(){b?c=bm(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bn=function(a,c,e){var f,g,h;e=e.replace(bg,"-$1").toLowerCase();if(!(g=a.ownerDocument.defaultView))return b;if(h=g.getComputedStyle(a,null))f=h.getPropertyValue(e),f===""&&!d.contains(a.ownerDocument.documentElement,a)&&(f=d.style(a,e));return f}),c.documentElement.currentStyle&&(bo=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bh.test(d)&&bi.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bm=bn||bo,d.expr&&d.expr.filters&&(d.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!d.support.reliableHiddenOffsets&&(a.style.display||d.css(a,"display"))==="none"},d.expr.filters.visible=function(a){return!d.expr.filters.hidden(a)});var br=/%20/g,bs=/\[\]$/,bt=/\r?\n/g,bu=/#.*$/,bv=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bw=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bx=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,by=/^(?:GET|HEAD)$/,bz=/^\/\//,bA=/\?/,bB=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bC=/^(?:select|textarea)/i,bD=/\s+/,bE=/([?&])_=[^&]*/,bF=/(^|\-)([a-z])/g,bG=function(a,b,c){return b+c.toUpperCase()},bH=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bI=d.fn.load,bJ={},bK={},bL,bM;try{bL=c.location.href}catch(bN){bL=c.createElement("a"),bL.href="",bL=bL.href}bM=bH.exec(bL.toLowerCase())||[],d.fn.extend({load:function(a,c,e){if(typeof a!=="string"&&bI)return bI.apply(this,arguments);if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var g=a.slice(f,a.length);a=a.slice(0,f)}var h="GET";c&&(d.isFunction(c)?(e=c,c=b):typeof c==="object"&&(c=d.param(c,d.ajaxSettings.traditional),h="POST"));var i=this;d.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?d("<div>").append(c.replace(bB,"")).find(g):c)),e&&i.each(e,[c,b,a])}});return this},serialize:function(){return d.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?d.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bC.test(this.nodeName)||bw.test(this.type))}).map(function(a,b){var c=d(this).val();return c==null?null:d.isArray(c)?d.map(c,function(a,c){return{name:b.name,value:a.replace(bt,"\r\n")}}):{name:b.name,value:c.replace(bt,"\r\n")}}).get()}}),d.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){d.fn[b]=function(a){return this.bind(b,a)}}),d.each(["get","post"],function(a,c){d[c]=function(a,e,f,g){d.isFunction(e)&&(g=g||f,f=e,e=b);return d.ajax({type:c,url:a,data:e,success:f,dataType:g})}}),d.extend({getScript:function(a,c){return d.get(a,b,c,"script")},getJSON:function(a,b,c){return d.get(a,b,c,"json")},ajaxSetup:function(a,b){b?d.extend(!0,a,d.ajaxSettings,b):(b=a,a=d.extend(!0,d.ajaxSettings,b));for(var c in {context:1,url:1})c in b?a[c]=b[c]:c in d.ajaxSettings&&(a[c]=d.ajaxSettings[c]);return a},ajaxSettings:{url:bL,isLocal:bx.test(bM[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":d.parseJSON,"text xml":d.parseXML}},ajaxPrefilter:bO(bJ),ajaxTransport:bO(bK),ajax:function(a,c){function v(a,c,l,n){if(r!==2){r=2,p&&clearTimeout(p),o=b,m=n||"",u.readyState=a?4:0;var q,t,v,w=l?bR(e,u,l):b,x,y;if(a>=200&&a<300||a===304){if(e.ifModified){if(x=u.getResponseHeader("Last-Modified"))d.lastModified[k]=x;if(y=u.getResponseHeader("Etag"))d.etag[k]=y}if(a===304)c="notmodified",q=!0;else try{t=bS(e,w),c="success",q=!0}catch(z){c="parsererror",v=z}}else{v=c;if(!c||a)c="error",a<0&&(a=0)}u.status=a,u.statusText=c,q?h.resolveWith(f,[t,c,u]):h.rejectWith(f,[u,c,v]),u.statusCode(j),j=b,s&&g.trigger("ajax"+(q?"Success":"Error"),[u,e,q?t:v]),i.resolveWith(f,[u,c]),s&&(g.trigger("ajaxComplete",[u,e]),--d.active||d.event.trigger("ajaxStop"))}}typeof a==="object"&&(c=a,a=b),c=c||{};var e=d.ajaxSetup({},c),f=e.context||e,g=f!==e&&(f.nodeType||f instanceof d)?d(f):d.event,h=d.Deferred(),i=d._Deferred(),j=e.statusCode||{},k,l={},m,n,o,p,q,r=0,s,t,u={readyState:0,setRequestHeader:function(a,b){r||(l[a.toLowerCase().replace(bF,bG)]=b);return this},getAllResponseHeaders:function(){return r===2?m:null},getResponseHeader:function(a){var c;if(r===2){if(!n){n={};while(c=bv.exec(m))n[c[1].toLowerCase()]=c[2]}c=n[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){r||(e.mimeType=a);return this},abort:function(a){a=a||"abort",o&&o.abort(a),v(0,a);return this}};h.promise(u),u.success=u.done,u.error=u.fail,u.complete=i.done,u.statusCode=function(a){if(a){var b;if(r<2)for(b in a)j[b]=[j[b],a[b]];else b=a[u.status],u.then(b,b)}return this},e.url=((a||e.url)+"").replace(bu,"").replace(bz,bM[1]+"//"),e.dataTypes=d.trim(e.dataType||"*").toLowerCase().split(bD),e.crossDomain==null&&(q=bH.exec(e.url.toLowerCase()),e.crossDomain=q&&(q[1]!=bM[1]||q[2]!=bM[2]||(q[3]||(q[1]==="http:"?80:443))!=(bM[3]||(bM[1]==="http:"?80:443)))),e.data&&e.processData&&typeof e.data!=="string"&&(e.data=d.param(e.data,e.traditional)),bP(bJ,e,c,u);if(r===2)return!1;s=e.global,e.type=e.type.toUpperCase(),e.hasContent=!by.test(e.type),s&&d.active++===0&&d.event.trigger("ajaxStart");if(!e.hasContent){e.data&&(e.url+=(bA.test(e.url)?"&":"?")+e.data),k=e.url;if(e.cache===!1){var w=d.now(),x=e.url.replace(bE,"$1_="+w);e.url=x+(x===e.url?(bA.test(e.url)?"&":"?")+"_="+w:"")}}if(e.data&&e.hasContent&&e.contentType!==!1||c.contentType)l["Content-Type"]=e.contentType;e.ifModified&&(k=k||e.url,d.lastModified[k]&&(l["If-Modified-Since"]=d.lastModified[k]),d.etag[k]&&(l["If-None-Match"]=d.etag[k])),l.Accept=e.dataTypes[0]&&e.accepts[e.dataTypes[0]]?e.accepts[e.dataTypes[0]]+(e.dataTypes[0]!=="*"?", */*; q=0.01":""):e.accepts["*"];for(t in e.headers)u.setRequestHeader(t,e.headers[t]);if(e.beforeSend&&(e.beforeSend.call(f,u,e)===!1||r===2)){u.abort();return!1}for(t in {success:1,error:1,complete:1})u[t](e[t]);o=bP(bK,e,c,u);if(o){u.readyState=1,s&&g.trigger("ajaxSend",[u,e]),e.async&&e.timeout>0&&(p=setTimeout(function(){u.abort("timeout")},e.timeout));try{r=1,o.send(l,v)}catch(y){status<2?v(-1,y):d.error(y)}}else v(-1,"No Transport");return u},param:function(a,c){var e=[],f=function(a,b){b=d.isFunction(b)?b():b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=d.ajaxSettings.traditional);if(d.isArray(a)||a.jquery&&!d.isPlainObject(a))d.each(a,function(){f(this.name,this.value)});else for(var g in a)bQ(g,a[g],c,f);return e.join("&").replace(br,"+")}}),d.extend({active:0,lastModified:{},etag:{}});var bT=d.now(),bU=/(\=)\?(&|$)|\?\?/i;d.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return d.expando+"_"+bT++}}),d.ajaxPrefilter("json jsonp",function(b,c,e){var f=typeof b.data==="string";if(b.dataTypes[0]==="jsonp"||c.jsonpCallback||c.jsonp!=null||b.jsonp!==!1&&(bU.test(b.url)||f&&bU.test(b.data))){var g,h=b.jsonpCallback=d.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2",m=function(){a[h]=i,g&&d.isFunction(i)&&a[h](g[0])};b.jsonp!==!1&&(j=j.replace(bU,l),b.url===j&&(f&&(k=k.replace(bU,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},e.then(m,m),b.converters["script json"]=function(){g||d.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),d.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){d.globalEval(a);return a}}}),d.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),d.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var bV=d.now(),bW,bX;d.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&bZ()||b$()}:bZ,bX=d.ajaxSettings.xhr(),d.support.ajax=!!bX,d.support.cors=bX&&"withCredentials"in bX,bX=b,d.support.ajax&&d.ajaxTransport(function(a){if(!a.crossDomain||d.support.cors){var c;return{send:function(e,f){var g=a.xhr(),h,i;a.username?g.open(a.type,a.url,a.async,a.username,a.password):g.open(a.type,a.url,a.async);if(a.xhrFields)for(i in a.xhrFields)g[i]=a.xhrFields[i];a.mimeType&&g.overrideMimeType&&g.overrideMimeType(a.mimeType),!a.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(i in e)g.setRequestHeader(i,e[i])}catch(j){}g.send(a.hasContent&&a.data||null),c=function(e,i){var j,k,l,m,n;try{if(c&&(i||g.readyState===4)){c=b,h&&(g.onreadystatechange=d.noop,delete bW[h]);if(i)g.readyState!==4&&g.abort();else{j=g.status,l=g.getAllResponseHeaders(),m={},n=g.responseXML,n&&n.documentElement&&(m.xml=n),m.text=g.responseText;try{k=g.statusText}catch(o){k=""}j||!a.isLocal||a.crossDomain?j===1223&&(j=204):j=m.text?200:404}}}catch(p){i||f(-1,p)}m&&f(j,k,m,l)},a.async&&g.readyState!==4?(bW||(bW={},bY()),h=bV++,g.onreadystatechange=bW[h]=c):c()},abort:function(){c&&c(0,1)}}}});var b_={},ca=/^(?:toggle|show|hide)$/,cb=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cc,cd=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];d.fn.extend({show:function(a,b,c){var e,f;if(a||a===0)return this.animate(ce("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)e=this[g],f=e.style.display,!d._data(e,"olddisplay")&&f==="none"&&(f=e.style.display=""),f===""&&d.css(e,"display")==="none"&&d._data(e,"olddisplay",cf(e.nodeName));for(g=0;g<h;g++){e=this[g],f=e.style.display;if(f===""||f==="none")e.style.display=d._data(e,"olddisplay")||""}return this},hide:function(a,b,c){if(a||a===0)return this.animate(ce("hide",3),a,b,c);for(var e=0,f=this.length;e<f;e++){var g=d.css(this[e],"display");g!=="none"&&!d._data(this[e],"olddisplay")&&d._data(this[e],"olddisplay",g)}for(e=0;e<f;e++)this[e].style.display="none";return this},_toggle:d.fn.toggle,toggle:function(a,b,c){var e=typeof a==="boolean";d.isFunction(a)&&d.isFunction(b)?this._toggle.apply(this,arguments):a==null||e?this.each(function(){var b=e?a:d(this).is(":hidden");d(this)[b?"show":"hide"]()}):this.animate(ce("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,e){var f=d.speed(b,c,e);if(d.isEmptyObject(a))return this.each(f.complete);return this[f.queue===!1?"each":"queue"](function(){var b=d.extend({},f),c,e=this.nodeType===1,g=e&&d(this).is(":hidden"),h=this;for(c in a){var i=d.camelCase(c);c!==i&&(a[i]=a[c],delete a[c],c=i);if(a[c]==="hide"&&g||a[c]==="show"&&!g)return b.complete.call(this);if(e&&(c==="height"||c==="width")){b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY];if(d.css(this,"display")==="inline"&&d.css(this,"float")==="none")if(d.support.inlineBlockNeedsLayout){var j=cf(this.nodeName);j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)}else this.style.display="inline-block"}d.isArray(a[c])&&((b.specialEasing=b.specialEasing||{})[c]=a[c][1],a[c]=a[c][0])}b.overflow!=null&&(this.style.overflow="hidden"),b.curAnim=d.extend({},a),d.each(a,function(c,e){var f=new d.fx(h,b,c);if(ca.test(e))f[e==="toggle"?g?"show":"hide":e](a);else{var i=cb.exec(e),j=f.cur();if(i){var k=parseFloat(i[2]),l=i[3]||(d.cssNumber[c]?"":"px");l!=="px"&&(d.style(h,c,(k||1)+l),j=(k||1)/f.cur()*j,d.style(h,c,j+l)),i[1]&&(k=(i[1]==="-="?-1:1)*k+j),f.custom(j,k,l)}else f.custom(j,e,"")}});return!0})},stop:function(a,b){var c=d.timers;a&&this.queue([]),this.each(function(){for(var a=c.length-1;a>=0;a--)c[a].elem===this&&(b&&c[a](!0),c.splice(a,1))}),b||this.dequeue();return this}}),d.each({slideDown:ce("show",1),slideUp:ce("hide",1),slideToggle:ce("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){d.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),d.extend({speed:function(a,b,c){var e=a&&typeof a==="object"?d.extend({},a):{complete:c||!c&&b||d.isFunction(a)&&a,duration:a,easing:c&&b||b&&!d.isFunction(b)&&b};e.duration=d.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in d.fx.speeds?d.fx.speeds[e.duration]:d.fx.speeds._default,e.old=e.complete,e.complete=function(){e.queue!==!1&&d(this).dequeue(),d.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig||(b.orig={})}}),d.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(d.fx.step[this.prop]||d.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=d.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function g(a){return e.step(a)}var e=this,f=d.fx;this.startTime=d.now(),this.start=a,this.end=b,this.unit=c||this.unit||(d.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,g.elem=this.elem,g()&&d.timers.push(g)&&!cc&&(cc=setInterval(f.tick,f.interval))},show:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),d(this.elem).show()},hide:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=d.now(),c=!0;if(a||b>=this.options.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),this.options.curAnim[this.prop]=!0;for(var e in this.options.curAnim)this.options.curAnim[e]!==!0&&(c=!1);if(c){if(this.options.overflow!=null&&!d.support.shrinkWrapBlocks){var f=this.elem,g=this.options;d.each(["","X","Y"],function(a,b){f.style["overflow"+b]=g.overflow[a]})}this.options.hide&&d(this.elem).hide();if(this.options.hide||this.options.show)for(var h in this.options.curAnim)d.style(this.elem,h,this.options.orig[h]);this.options.complete.call(this.elem)}return!1}var i=b-this.startTime;this.state=i/this.options.duration;var j=this.options.specialEasing&&this.options.specialEasing[this.prop],k=this.options.easing||(d.easing.swing?"swing":"linear");this.pos=d.easing[j||k](this.state,i,0,1,this.options.duration),this.now=this.start+(this.end-this.start)*this.pos,this.update();return!0}},d.extend(d.fx,{tick:function(){var a=d.timers;for(var b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||d.fx.stop()},interval:13,stop:function(){clearInterval(cc),cc=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){d.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),d.expr&&d.expr.filters&&(d.expr.filters.animated=function(a){return d.grep(d.timers,function(b){return a===b.elem}).length});var cg=/^t(?:able|d|h)$/i,ch=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?d.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(e){}var f=b.ownerDocument,g=f.documentElement;if(!c||!d.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=f.body,i=ci(f),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||d.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||d.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:d.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);d.offset.initialize();var c,e=b.offsetParent,f=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(d.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===e&&(l+=b.offsetTop,m+=b.offsetLeft,d.offset.doesNotAddBorder&&(!d.offset.doesAddBorderForTableAndCells||!cg.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),f=e,e=b.offsetParent),d.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;d.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},d.offset={initialize:function(){var a=c.body,b=c.createElement("div"),e,f,g,h,i=parseFloat(d.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";d.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),e=b.firstChild,f=e.firstChild,h=e.nextSibling.firstChild.firstChild,this.doesNotAddBorder=f.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,f.style.position="fixed",f.style.top="20px",this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15,f.style.position=f.style.top="",e.style.overflow="hidden",e.style.position="relative",this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),d.offset.initialize=d.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;d.offset.initialize(),d.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(d.css(a,"marginTop"))||0,c+=parseFloat(d.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var e=d.css(a,"position");e==="static"&&(a.style.position="relative");var f=d(a),g=f.offset(),h=d.css(a,"top"),i=d.css(a,"left"),j=(e==="absolute"||e==="fixed")&&d.inArray("auto",[h,i])>-1,k={},l={},m,n;j&&(l=f.position()),m=j?l.top:parseInt(h,10)||0,n=j?l.left:parseInt(i,10)||0,d.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):f.css(k)}},d.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),e=ch.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(d.css(a,"marginTop"))||0,c.left-=parseFloat(d.css(a,"marginLeft"))||0,e.top+=parseFloat(d.css(b[0],"borderTopWidth"))||0,e.left+=parseFloat(d.css(b[0],"borderLeftWidth"))||0;return{top:c.top-e.top,left:c.left-e.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&(!ch.test(a.nodeName)&&d.css(a,"position")==="static"))a=a.offsetParent;return a})}}),d.each(["Left","Top"],function(a,c){var e="scroll"+c;d.fn[e]=function(c){var f=this[0],g;if(!f)return null;if(c!==b)return this.each(function(){g=ci(this),g?g.scrollTo(a?d(g).scrollLeft():c,a?c:d(g).scrollTop()):this[e]=c});g=ci(f);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:d.support.boxModel&&g.document.documentElement[e]||g.document.body[e]:f[e]}}),d.each(["Height","Width"],function(a,c){var e=c.toLowerCase();d.fn["inner"+c]=function(){return this[0]?parseFloat(d.css(this[0],e,"padding")):null},d.fn["outer"+c]=function(a){return this[0]?parseFloat(d.css(this[0],e,a?"margin":"border")):null},d.fn[e]=function(a){var f=this[0];if(!f)return a==null?null:this;if(d.isFunction(a))return this.each(function(b){var c=d(this);c[e](a.call(this,b,c[e]()))});if(d.isWindow(f)){var g=f.document.documentElement["client"+c];return f.document.compatMode==="CSS1Compat"&&g||f.document.body["client"+c]||g}if(f.nodeType===9)return Math.max(f.documentElement["client"+c],f.body["scroll"+c],f.documentElement["scroll"+c],f.body["offset"+c],f.documentElement["offset"+c]);if(a===b){var h=d.css(f,e),i=parseFloat(h);return d.isNaN(i)?h:i}return this.css(e,typeof a==="string"?a:a+"px")}}),a.jQuery=a.$=d})(window);
\ No newline at end of file
diff --git a/third_party/seasocks/src/ws_test_web/index.html b/third_party/seasocks/src/ws_test_web/index.html
index 455b827..263efef 100644
--- a/third_party/seasocks/src/ws_test_web/index.html
+++ b/third_party/seasocks/src/ws_test_web/index.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Hello, world</title>
- <script src='lib/jquery-1.4.4.js'></script>
+ <script src='lib/jquery.min.js'></script>
<script src='app.js'></script>
</head>
<body>
diff --git a/third_party/seasocks/src/ws_test_web/lib/jquery-1.4.4.js b/third_party/seasocks/src/ws_test_web/lib/jquery-1.4.4.js
deleted file mode 100644
index a4f1145..0000000
--- a/third_party/seasocks/src/ws_test_web/lib/jquery-1.4.4.js
+++ /dev/null
@@ -1,7179 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.4.4
- * http://jquery.com/
- *
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Thu Nov 11 19:04:53 2010 -0500
- */
-(function( window, undefined ) {
-
-// Use the correct document accordingly with window argument (sandbox)
-var document = window.document;
-var jQuery = (function() {
-
-// Define a local copy of jQuery
-var jQuery = function( selector, context ) {
- // The jQuery object is actually just the init constructor 'enhanced'
- return new jQuery.fn.init( selector, context );
- },
-
- // Map over jQuery in case of overwrite
- _jQuery = window.jQuery,
-
- // Map over the $ in case of overwrite
- _$ = window.$,
-
- // A central reference to the root jQuery(document)
- rootjQuery,
-
- // A simple way to check for HTML strings or ID strings
- // (both of which we optimize for)
- quickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,
-
- // Is it a simple selector
- isSimple = /^.[^:#\[\.,]*$/,
-
- // Check if a string has a non-whitespace character in it
- rnotwhite = /\S/,
- rwhite = /\s/,
-
- // Used for trimming whitespace
- trimLeft = /^\s+/,
- trimRight = /\s+$/,
-
- // Check for non-word characters
- rnonword = /\W/,
-
- // Check for digits
- rdigit = /\d/,
-
- // Match a standalone tag
- rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
-
- // JSON RegExp
- rvalidchars = /^[\],:{}\s]*$/,
- rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
- rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
- rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-
- // Useragent RegExp
- rwebkit = /(webkit)[ \/]([\w.]+)/,
- ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
- rmsie = /(msie) ([\w.]+)/,
- rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
-
- // Keep a UserAgent string for use with jQuery.browser
- userAgent = navigator.userAgent,
-
- // For matching the engine and version of the browser
- browserMatch,
-
- // Has the ready events already been bound?
- readyBound = false,
-
- // The functions to execute on DOM ready
- readyList = [],
-
- // The ready event handler
- DOMContentLoaded,
-
- // Save a reference to some core methods
- toString = Object.prototype.toString,
- hasOwn = Object.prototype.hasOwnProperty,
- push = Array.prototype.push,
- slice = Array.prototype.slice,
- trim = String.prototype.trim,
- indexOf = Array.prototype.indexOf,
-
- // [[Class]] -> type pairs
- class2type = {};
-
-jQuery.fn = jQuery.prototype = {
- init: function( selector, context ) {
- var match, elem, ret, doc;
-
- // Handle $(""), $(null), or $(undefined)
- if ( !selector ) {
- return this;
- }
-
- // Handle $(DOMElement)
- if ( selector.nodeType ) {
- this.context = this[0] = selector;
- this.length = 1;
- return this;
- }
-
- // The body element only exists once, optimize finding it
- if ( selector === "body" && !context && document.body ) {
- this.context = document;
- this[0] = document.body;
- this.selector = "body";
- this.length = 1;
- return this;
- }
-
- // Handle HTML strings
- if ( typeof selector === "string" ) {
- // Are we dealing with HTML string or an ID?
- match = quickExpr.exec( selector );
-
- // Verify a match, and that no context was specified for #id
- if ( match && (match[1] || !context) ) {
-
- // HANDLE: $(html) -> $(array)
- if ( match[1] ) {
- doc = (context ? context.ownerDocument || context : document);
-
- // If a single string is passed in and it's a single tag
- // just do a createElement and skip the rest
- ret = rsingleTag.exec( selector );
-
- if ( ret ) {
- if ( jQuery.isPlainObject( context ) ) {
- selector = [ document.createElement( ret[1] ) ];
- jQuery.fn.attr.call( selector, context, true );
-
- } else {
- selector = [ doc.createElement( ret[1] ) ];
- }
-
- } else {
- ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
- selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
- }
-
- return jQuery.merge( this, selector );
-
- // HANDLE: $("#id")
- } else {
- elem = document.getElementById( match[2] );
-
- // Check parentNode to catch when Blackberry 4.6 returns
- // nodes that are no longer in the document #6963
- if ( elem && elem.parentNode ) {
- // Handle the case where IE and Opera return items
- // by name instead of ID
- if ( elem.id !== match[2] ) {
- return rootjQuery.find( selector );
- }
-
- // Otherwise, we inject the element directly into the jQuery object
- this.length = 1;
- this[0] = elem;
- }
-
- this.context = document;
- this.selector = selector;
- return this;
- }
-
- // HANDLE: $("TAG")
- } else if ( !context && !rnonword.test( selector ) ) {
- this.selector = selector;
- this.context = document;
- selector = document.getElementsByTagName( selector );
- return jQuery.merge( this, selector );
-
- // HANDLE: $(expr, $(...))
- } else if ( !context || context.jquery ) {
- return (context || rootjQuery).find( selector );
-
- // HANDLE: $(expr, context)
- // (which is just equivalent to: $(context).find(expr)
- } else {
- return jQuery( context ).find( selector );
- }
-
- // HANDLE: $(function)
- // Shortcut for document ready
- } else if ( jQuery.isFunction( selector ) ) {
- return rootjQuery.ready( selector );
- }
-
- if (selector.selector !== undefined) {
- this.selector = selector.selector;
- this.context = selector.context;
- }
-
- return jQuery.makeArray( selector, this );
- },
-
- // Start with an empty selector
- selector: "",
-
- // The current version of jQuery being used
- jquery: "1.4.4",
-
- // The default length of a jQuery object is 0
- length: 0,
-
- // The number of elements contained in the matched element set
- size: function() {
- return this.length;
- },
-
- toArray: function() {
- return slice.call( this, 0 );
- },
-
- // Get the Nth element in the matched element set OR
- // Get the whole matched element set as a clean array
- get: function( num ) {
- return num == null ?
-
- // Return a 'clean' array
- this.toArray() :
-
- // Return just the object
- ( num < 0 ? this.slice(num)[ 0 ] : this[ num ] );
- },
-
- // Take an array of elements and push it onto the stack
- // (returning the new matched element set)
- pushStack: function( elems, name, selector ) {
- // Build a new jQuery matched element set
- var ret = jQuery();
-
- if ( jQuery.isArray( elems ) ) {
- push.apply( ret, elems );
-
- } else {
- jQuery.merge( ret, elems );
- }
-
- // Add the old object onto the stack (as a reference)
- ret.prevObject = this;
-
- ret.context = this.context;
-
- if ( name === "find" ) {
- ret.selector = this.selector + (this.selector ? " " : "") + selector;
- } else if ( name ) {
- ret.selector = this.selector + "." + name + "(" + selector + ")";
- }
-
- // Return the newly-formed element set
- return ret;
- },
-
- // Execute a callback for every element in the matched set.
- // (You can seed the arguments with an array of args, but this is
- // only used internally.)
- each: function( callback, args ) {
- return jQuery.each( this, callback, args );
- },
-
- ready: function( fn ) {
- // Attach the listeners
- jQuery.bindReady();
-
- // If the DOM is already ready
- if ( jQuery.isReady ) {
- // Execute the function immediately
- fn.call( document, jQuery );
-
- // Otherwise, remember the function for later
- } else if ( readyList ) {
- // Add the function to the wait list
- readyList.push( fn );
- }
-
- return this;
- },
-
- eq: function( i ) {
- return i === -1 ?
- this.slice( i ) :
- this.slice( i, +i + 1 );
- },
-
- first: function() {
- return this.eq( 0 );
- },
-
- last: function() {
- return this.eq( -1 );
- },
-
- slice: function() {
- return this.pushStack( slice.apply( this, arguments ),
- "slice", slice.call(arguments).join(",") );
- },
-
- map: function( callback ) {
- return this.pushStack( jQuery.map(this, function( elem, i ) {
- return callback.call( elem, i, elem );
- }));
- },
-
- end: function() {
- return this.prevObject || jQuery(null);
- },
-
- // For internal use only.
- // Behaves like an Array's method, not like a jQuery method.
- push: push,
- sort: [].sort,
- splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
- var options, name, src, copy, copyIsArray, clone,
- target = arguments[0] || {},
- i = 1,
- length = arguments.length,
- deep = false;
-
- // Handle a deep copy situation
- if ( typeof target === "boolean" ) {
- deep = target;
- target = arguments[1] || {};
- // skip the boolean and the target
- i = 2;
- }
-
- // Handle case when target is a string or something (possible in deep copy)
- if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
- target = {};
- }
-
- // extend jQuery itself if only one argument is passed
- if ( length === i ) {
- target = this;
- --i;
- }
-
- for ( ; i < length; i++ ) {
- // Only deal with non-null/undefined values
- if ( (options = arguments[ i ]) != null ) {
- // Extend the base object
- for ( name in options ) {
- src = target[ name ];
- copy = options[ name ];
-
- // Prevent never-ending loop
- if ( target === copy ) {
- continue;
- }
-
- // Recurse if we're merging plain objects or arrays
- if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
- if ( copyIsArray ) {
- copyIsArray = false;
- clone = src && jQuery.isArray(src) ? src : [];
-
- } else {
- clone = src && jQuery.isPlainObject(src) ? src : {};
- }
-
- // Never move original objects, clone them
- target[ name ] = jQuery.extend( deep, clone, copy );
-
- // Don't bring in undefined values
- } else if ( copy !== undefined ) {
- target[ name ] = copy;
- }
- }
- }
- }
-
- // Return the modified object
- return target;
-};
-
-jQuery.extend({
- noConflict: function( deep ) {
- window.$ = _$;
-
- if ( deep ) {
- window.jQuery = _jQuery;
- }
-
- return jQuery;
- },
-
- // Is the DOM ready to be used? Set to true once it occurs.
- isReady: false,
-
- // A counter to track how many items to wait for before
- // the ready event fires. See #6781
- readyWait: 1,
-
- // Handle when the DOM is ready
- ready: function( wait ) {
- // A third-party is pushing the ready event forwards
- if ( wait === true ) {
- jQuery.readyWait--;
- }
-
- // Make sure that the DOM is not already loaded
- if ( !jQuery.readyWait || (wait !== true && !jQuery.isReady) ) {
- // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
- if ( !document.body ) {
- return setTimeout( jQuery.ready, 1 );
- }
-
- // Remember that the DOM is ready
- jQuery.isReady = true;
-
- // If a normal DOM Ready event fired, decrement, and wait if need be
- if ( wait !== true && --jQuery.readyWait > 0 ) {
- return;
- }
-
- // If there are functions bound, to execute
- if ( readyList ) {
- // Execute all of them
- var fn,
- i = 0,
- ready = readyList;
-
- // Reset the list of functions
- readyList = null;
-
- while ( (fn = ready[ i++ ]) ) {
- fn.call( document, jQuery );
- }
-
- // Trigger any bound ready events
- if ( jQuery.fn.trigger ) {
- jQuery( document ).trigger( "ready" ).unbind( "ready" );
- }
- }
- }
- },
-
- bindReady: function() {
- if ( readyBound ) {
- return;
- }
-
- readyBound = true;
-
- // Catch cases where $(document).ready() is called after the
- // browser event has already occurred.
- if ( document.readyState === "complete" ) {
- // Handle it asynchronously to allow scripts the opportunity to delay ready
- return setTimeout( jQuery.ready, 1 );
- }
-
- // Mozilla, Opera and webkit nightlies currently support this event
- if ( document.addEventListener ) {
- // Use the handy event callback
- document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-
- // A fallback to window.onload, that will always work
- window.addEventListener( "load", jQuery.ready, false );
-
- // If IE event model is used
- } else if ( document.attachEvent ) {
- // ensure firing before onload,
- // maybe late but safe also for iframes
- document.attachEvent("onreadystatechange", DOMContentLoaded);
-
- // A fallback to window.onload, that will always work
- window.attachEvent( "onload", jQuery.ready );
-
- // If IE and not a frame
- // continually check to see if the document is ready
- var toplevel = false;
-
- try {
- toplevel = window.frameElement == null;
- } catch(e) {}
-
- if ( document.documentElement.doScroll && toplevel ) {
- doScrollCheck();
- }
- }
- },
-
- // See test/unit/core.js for details concerning isFunction.
- // Since version 1.3, DOM methods and functions like alert
- // aren't supported. They return false on IE (#2968).
- isFunction: function( obj ) {
- return jQuery.type(obj) === "function";
- },
-
- isArray: Array.isArray || function( obj ) {
- return jQuery.type(obj) === "array";
- },
-
- // A crude way of determining if an object is a window
- isWindow: function( obj ) {
- return obj && typeof obj === "object" && "setInterval" in obj;
- },
-
- isNaN: function( obj ) {
- return obj == null || !rdigit.test( obj ) || isNaN( obj );
- },
-
- type: function( obj ) {
- return obj == null ?
- String( obj ) :
- class2type[ toString.call(obj) ] || "object";
- },
-
- isPlainObject: function( obj ) {
- // Must be an Object.
- // Because of IE, we also have to check the presence of the constructor property.
- // Make sure that DOM nodes and window objects don't pass through, as well
- if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
- return false;
- }
-
- // Not own constructor property must be Object
- if ( obj.constructor &&
- !hasOwn.call(obj, "constructor") &&
- !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
- return false;
- }
-
- // Own properties are enumerated firstly, so to speed up,
- // if last one is own, then all properties are own.
-
- var key;
- for ( key in obj ) {}
-
- return key === undefined || hasOwn.call( obj, key );
- },
-
- isEmptyObject: function( obj ) {
- for ( var name in obj ) {
- return false;
- }
- return true;
- },
-
- error: function( msg ) {
- throw msg;
- },
-
- parseJSON: function( data ) {
- if ( typeof data !== "string" || !data ) {
- return null;
- }
-
- // Make sure leading/trailing whitespace is removed (IE can't handle it)
- data = jQuery.trim( data );
-
- // Make sure the incoming data is actual JSON
- // Logic borrowed from http://json.org/json2.js
- if ( rvalidchars.test(data.replace(rvalidescape, "@")
- .replace(rvalidtokens, "]")
- .replace(rvalidbraces, "")) ) {
-
- // Try to use the native JSON parser first
- return window.JSON && window.JSON.parse ?
- window.JSON.parse( data ) :
- (new Function("return " + data))();
-
- } else {
- jQuery.error( "Invalid JSON: " + data );
- }
- },
-
- noop: function() {},
-
- // Evalulates a script in a global context
- globalEval: function( data ) {
- if ( data && rnotwhite.test(data) ) {
- // Inspired by code by Andrea Giammarchi
- // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
- var head = document.getElementsByTagName("head")[0] || document.documentElement,
- script = document.createElement("script");
-
- script.type = "text/javascript";
-
- if ( jQuery.support.scriptEval ) {
- script.appendChild( document.createTextNode( data ) );
- } else {
- script.text = data;
- }
-
- // Use insertBefore instead of appendChild to circumvent an IE6 bug.
- // This arises when a base node is used (#2709).
- head.insertBefore( script, head.firstChild );
- head.removeChild( script );
- }
- },
-
- nodeName: function( elem, name ) {
- return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
- },
-
- // args is for internal usage only
- each: function( object, callback, args ) {
- var name, i = 0,
- length = object.length,
- isObj = length === undefined || jQuery.isFunction(object);
-
- if ( args ) {
- if ( isObj ) {
- for ( name in object ) {
- if ( callback.apply( object[ name ], args ) === false ) {
- break;
- }
- }
- } else {
- for ( ; i < length; ) {
- if ( callback.apply( object[ i++ ], args ) === false ) {
- break;
- }
- }
- }
-
- // A special, fast, case for the most common use of each
- } else {
- if ( isObj ) {
- for ( name in object ) {
- if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
- break;
- }
- }
- } else {
- for ( var value = object[0];
- i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {}
- }
- }
-
- return object;
- },
-
- // Use native String.trim function wherever possible
- trim: trim ?
- function( text ) {
- return text == null ?
- "" :
- trim.call( text );
- } :
-
- // Otherwise use our own trimming functionality
- function( text ) {
- return text == null ?
- "" :
- text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
- },
-
- // results is for internal usage only
- makeArray: function( array, results ) {
- var ret = results || [];
-
- if ( array != null ) {
- // The window, strings (and functions) also have 'length'
- // The extra typeof function check is to prevent crashes
- // in Safari 2 (See: #3039)
- // Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
- var type = jQuery.type(array);
-
- if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
- push.call( ret, array );
- } else {
- jQuery.merge( ret, array );
- }
- }
-
- return ret;
- },
-
- inArray: function( elem, array ) {
- if ( array.indexOf ) {
- return array.indexOf( elem );
- }
-
- for ( var i = 0, length = array.length; i < length; i++ ) {
- if ( array[ i ] === elem ) {
- return i;
- }
- }
-
- return -1;
- },
-
- merge: function( first, second ) {
- var i = first.length,
- j = 0;
-
- if ( typeof second.length === "number" ) {
- for ( var l = second.length; j < l; j++ ) {
- first[ i++ ] = second[ j ];
- }
-
- } else {
- while ( second[j] !== undefined ) {
- first[ i++ ] = second[ j++ ];
- }
- }
-
- first.length = i;
-
- return first;
- },
-
- grep: function( elems, callback, inv ) {
- var ret = [], retVal;
- inv = !!inv;
-
- // Go through the array, only saving the items
- // that pass the validator function
- for ( var i = 0, length = elems.length; i < length; i++ ) {
- retVal = !!callback( elems[ i ], i );
- if ( inv !== retVal ) {
- ret.push( elems[ i ] );
- }
- }
-
- return ret;
- },
-
- // arg is for internal usage only
- map: function( elems, callback, arg ) {
- var ret = [], value;
-
- // Go through the array, translating each of the items to their
- // new value (or values).
- for ( var i = 0, length = elems.length; i < length; i++ ) {
- value = callback( elems[ i ], i, arg );
-
- if ( value != null ) {
- ret[ ret.length ] = value;
- }
- }
-
- return ret.concat.apply( [], ret );
- },
-
- // A global GUID counter for objects
- guid: 1,
-
- proxy: function( fn, proxy, thisObject ) {
- if ( arguments.length === 2 ) {
- if ( typeof proxy === "string" ) {
- thisObject = fn;
- fn = thisObject[ proxy ];
- proxy = undefined;
-
- } else if ( proxy && !jQuery.isFunction( proxy ) ) {
- thisObject = proxy;
- proxy = undefined;
- }
- }
-
- if ( !proxy && fn ) {
- proxy = function() {
- return fn.apply( thisObject || this, arguments );
- };
- }
-
- // Set the guid of unique handler to the same of original handler, so it can be removed
- if ( fn ) {
- proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
- }
-
- // So proxy can be declared as an argument
- return proxy;
- },
-
- // Mutifunctional method to get and set values to a collection
- // The value/s can be optionally by executed if its a function
- access: function( elems, key, value, exec, fn, pass ) {
- var length = elems.length;
-
- // Setting many attributes
- if ( typeof key === "object" ) {
- for ( var k in key ) {
- jQuery.access( elems, k, key[k], exec, fn, value );
- }
- return elems;
- }
-
- // Setting one attribute
- if ( value !== undefined ) {
- // Optionally, function values get executed if exec is true
- exec = !pass && exec && jQuery.isFunction(value);
-
- for ( var i = 0; i < length; i++ ) {
- fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
- }
-
- return elems;
- }
-
- // Getting an attribute
- return length ? fn( elems[0], key ) : undefined;
- },
-
- now: function() {
- return (new Date()).getTime();
- },
-
- // Use of jQuery.browser is frowned upon.
- // More details: http://docs.jquery.com/Utilities/jQuery.browser
- uaMatch: function( ua ) {
- ua = ua.toLowerCase();
-
- var match = rwebkit.exec( ua ) ||
- ropera.exec( ua ) ||
- rmsie.exec( ua ) ||
- ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
- [];
-
- return { browser: match[1] || "", version: match[2] || "0" };
- },
-
- browser: {}
-});
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
- class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-browserMatch = jQuery.uaMatch( userAgent );
-if ( browserMatch.browser ) {
- jQuery.browser[ browserMatch.browser ] = true;
- jQuery.browser.version = browserMatch.version;
-}
-
-// Deprecated, use jQuery.browser.webkit instead
-if ( jQuery.browser.webkit ) {
- jQuery.browser.safari = true;
-}
-
-if ( indexOf ) {
- jQuery.inArray = function( elem, array ) {
- return indexOf.call( array, elem );
- };
-}
-
-// Verify that \s matches non-breaking spaces
-// (IE fails on this test)
-if ( !rwhite.test( "\xA0" ) ) {
- trimLeft = /^[\s\xA0]+/;
- trimRight = /[\s\xA0]+$/;
-}
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-
-// Cleanup functions for the document ready method
-if ( document.addEventListener ) {
- DOMContentLoaded = function() {
- document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
- jQuery.ready();
- };
-
-} else if ( document.attachEvent ) {
- DOMContentLoaded = function() {
- // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
- if ( document.readyState === "complete" ) {
- document.detachEvent( "onreadystatechange", DOMContentLoaded );
- jQuery.ready();
- }
- };
-}
-
-// The DOM ready check for Internet Explorer
-function doScrollCheck() {
- if ( jQuery.isReady ) {
- return;
- }
-
- try {
- // If IE is used, use the trick by Diego Perini
- // http://javascript.nwbox.com/IEContentLoaded/
- document.documentElement.doScroll("left");
- } catch(e) {
- setTimeout( doScrollCheck, 1 );
- return;
- }
-
- // and execute any waiting functions
- jQuery.ready();
-}
-
-// Expose jQuery to the global object
-return (window.jQuery = window.$ = jQuery);
-
-})();
-
-
-(function() {
-
- jQuery.support = {};
-
- var root = document.documentElement,
- script = document.createElement("script"),
- div = document.createElement("div"),
- id = "script" + jQuery.now();
-
- div.style.display = "none";
- div.innerHTML = " <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-
- var all = div.getElementsByTagName("*"),
- a = div.getElementsByTagName("a")[0],
- select = document.createElement("select"),
- opt = select.appendChild( document.createElement("option") );
-
- // Can't get basic test support
- if ( !all || !all.length || !a ) {
- return;
- }
-
- jQuery.support = {
- // IE strips leading whitespace when .innerHTML is used
- leadingWhitespace: div.firstChild.nodeType === 3,
-
- // Make sure that tbody elements aren't automatically inserted
- // IE will insert them into empty tables
- tbody: !div.getElementsByTagName("tbody").length,
-
- // Make sure that link elements get serialized correctly by innerHTML
- // This requires a wrapper element in IE
- htmlSerialize: !!div.getElementsByTagName("link").length,
-
- // Get the style information from getAttribute
- // (IE uses .cssText insted)
- style: /red/.test( a.getAttribute("style") ),
-
- // Make sure that URLs aren't manipulated
- // (IE normalizes it by default)
- hrefNormalized: a.getAttribute("href") === "/a",
-
- // Make sure that element opacity exists
- // (IE uses filter instead)
- // Use a regex to work around a WebKit issue. See #5145
- opacity: /^0.55$/.test( a.style.opacity ),
-
- // Verify style float existence
- // (IE uses styleFloat instead of cssFloat)
- cssFloat: !!a.style.cssFloat,
-
- // Make sure that if no value is specified for a checkbox
- // that it defaults to "on".
- // (WebKit defaults to "" instead)
- checkOn: div.getElementsByTagName("input")[0].value === "on",
-
- // Make sure that a selected-by-default option has a working selected property.
- // (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
- optSelected: opt.selected,
-
- // Will be defined later
- deleteExpando: true,
- optDisabled: false,
- checkClone: false,
- scriptEval: false,
- noCloneEvent: true,
- boxModel: null,
- inlineBlockNeedsLayout: false,
- shrinkWrapBlocks: false,
- reliableHiddenOffsets: true
- };
-
- // Make sure that the options inside disabled selects aren't marked as disabled
- // (WebKit marks them as diabled)
- select.disabled = true;
- jQuery.support.optDisabled = !opt.disabled;
-
- script.type = "text/javascript";
- try {
- script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
- } catch(e) {}
-
- root.insertBefore( script, root.firstChild );
-
- // Make sure that the execution of code works by injecting a script
- // tag with appendChild/createTextNode
- // (IE doesn't support this, fails, and uses .text instead)
- if ( window[ id ] ) {
- jQuery.support.scriptEval = true;
- delete window[ id ];
- }
-
- // Test to see if it's possible to delete an expando from an element
- // Fails in Internet Explorer
- try {
- delete script.test;
-
- } catch(e) {
- jQuery.support.deleteExpando = false;
- }
-
- root.removeChild( script );
-
- if ( div.attachEvent && div.fireEvent ) {
- div.attachEvent("onclick", function click() {
- // Cloning a node shouldn't copy over any
- // bound event handlers (IE does this)
- jQuery.support.noCloneEvent = false;
- div.detachEvent("onclick", click);
- });
- div.cloneNode(true).fireEvent("onclick");
- }
-
- div = document.createElement("div");
- div.innerHTML = "<input type='radio' name='radiotest' checked='checked'/>";
-
- var fragment = document.createDocumentFragment();
- fragment.appendChild( div.firstChild );
-
- // WebKit doesn't clone checked state correctly in fragments
- jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked;
-
- // Figure out if the W3C box model works as expected
- // document.body must exist before we can do this
- jQuery(function() {
- var div = document.createElement("div");
- div.style.width = div.style.paddingLeft = "1px";
-
- document.body.appendChild( div );
- jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
-
- if ( "zoom" in div.style ) {
- // Check if natively block-level elements act like inline-block
- // elements when setting their display to 'inline' and giving
- // them layout
- // (IE < 8 does this)
- div.style.display = "inline";
- div.style.zoom = 1;
- jQuery.support.inlineBlockNeedsLayout = div.offsetWidth === 2;
-
- // Check if elements with layout shrink-wrap their children
- // (IE 6 does this)
- div.style.display = "";
- div.innerHTML = "<div style='width:4px;'></div>";
- jQuery.support.shrinkWrapBlocks = div.offsetWidth !== 2;
- }
-
- div.innerHTML = "<table><tr><td style='padding:0;display:none'></td><td>t</td></tr></table>";
- var tds = div.getElementsByTagName("td");
-
- // Check if table cells still have offsetWidth/Height when they are set
- // to display:none and there are still other visible table cells in a
- // table row; if so, offsetWidth/Height are not reliable for use when
- // determining if an element has been hidden directly using
- // display:none (it is still safe to use offsets if a parent element is
- // hidden; don safety goggles and see bug #4512 for more information).
- // (only IE 8 fails this test)
- jQuery.support.reliableHiddenOffsets = tds[0].offsetHeight === 0;
-
- tds[0].style.display = "";
- tds[1].style.display = "none";
-
- // Check if empty table cells still have offsetWidth/Height
- // (IE < 8 fail this test)
- jQuery.support.reliableHiddenOffsets = jQuery.support.reliableHiddenOffsets && tds[0].offsetHeight === 0;
- div.innerHTML = "";
-
- document.body.removeChild( div ).style.display = "none";
- div = tds = null;
- });
-
- // Technique from Juriy Zaytsev
- // http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
- var eventSupported = function( eventName ) {
- var el = document.createElement("div");
- eventName = "on" + eventName;
-
- var isSupported = (eventName in el);
- if ( !isSupported ) {
- el.setAttribute(eventName, "return;");
- isSupported = typeof el[eventName] === "function";
- }
- el = null;
-
- return isSupported;
- };
-
- jQuery.support.submitBubbles = eventSupported("submit");
- jQuery.support.changeBubbles = eventSupported("change");
-
- // release memory in IE
- root = script = div = all = a = null;
-})();
-
-
-
-var windowData = {},
- rbrace = /^(?:\{.*\}|\[.*\])$/;
-
-jQuery.extend({
- cache: {},
-
- // Please use with caution
- uuid: 0,
-
- // Unique for each copy of jQuery on the page
- expando: "jQuery" + jQuery.now(),
-
- // The following elements throw uncatchable exceptions if you
- // attempt to add expando properties to them.
- noData: {
- "embed": true,
- // Ban all objects except for Flash (which handle expandos)
- "object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
- "applet": true
- },
-
- data: function( elem, name, data ) {
- if ( !jQuery.acceptData( elem ) ) {
- return;
- }
-
- elem = elem == window ?
- windowData :
- elem;
-
- var isNode = elem.nodeType,
- id = isNode ? elem[ jQuery.expando ] : null,
- cache = jQuery.cache, thisCache;
-
- if ( isNode && !id && typeof name === "string" && data === undefined ) {
- return;
- }
-
- // Get the data from the object directly
- if ( !isNode ) {
- cache = elem;
-
- // Compute a unique ID for the element
- } else if ( !id ) {
- elem[ jQuery.expando ] = id = ++jQuery.uuid;
- }
-
- // Avoid generating a new cache unless none exists and we
- // want to manipulate it.
- if ( typeof name === "object" ) {
- if ( isNode ) {
- cache[ id ] = jQuery.extend(cache[ id ], name);
-
- } else {
- jQuery.extend( cache, name );
- }
-
- } else if ( isNode && !cache[ id ] ) {
- cache[ id ] = {};
- }
-
- thisCache = isNode ? cache[ id ] : cache;
-
- // Prevent overriding the named cache with undefined values
- if ( data !== undefined ) {
- thisCache[ name ] = data;
- }
-
- return typeof name === "string" ? thisCache[ name ] : thisCache;
- },
-
- removeData: function( elem, name ) {
- if ( !jQuery.acceptData( elem ) ) {
- return;
- }
-
- elem = elem == window ?
- windowData :
- elem;
-
- var isNode = elem.nodeType,
- id = isNode ? elem[ jQuery.expando ] : elem,
- cache = jQuery.cache,
- thisCache = isNode ? cache[ id ] : id;
-
- // If we want to remove a specific section of the element's data
- if ( name ) {
- if ( thisCache ) {
- // Remove the section of cache data
- delete thisCache[ name ];
-
- // If we've removed all the data, remove the element's cache
- if ( isNode && jQuery.isEmptyObject(thisCache) ) {
- jQuery.removeData( elem );
- }
- }
-
- // Otherwise, we want to remove all of the element's data
- } else {
- if ( isNode && jQuery.support.deleteExpando ) {
- delete elem[ jQuery.expando ];
-
- } else if ( elem.removeAttribute ) {
- elem.removeAttribute( jQuery.expando );
-
- // Completely remove the data cache
- } else if ( isNode ) {
- delete cache[ id ];
-
- // Remove all fields from the object
- } else {
- for ( var n in elem ) {
- delete elem[ n ];
- }
- }
- }
- },
-
- // A method for determining if a DOM node can handle the data expando
- acceptData: function( elem ) {
- if ( elem.nodeName ) {
- var match = jQuery.noData[ elem.nodeName.toLowerCase() ];
-
- if ( match ) {
- return !(match === true || elem.getAttribute("classid") !== match);
- }
- }
-
- return true;
- }
-});
-
-jQuery.fn.extend({
- data: function( key, value ) {
- var data = null;
-
- if ( typeof key === "undefined" ) {
- if ( this.length ) {
- var attr = this[0].attributes, name;
- data = jQuery.data( this[0] );
-
- for ( var i = 0, l = attr.length; i < l; i++ ) {
- name = attr[i].name;
-
- if ( name.indexOf( "data-" ) === 0 ) {
- name = name.substr( 5 );
- dataAttr( this[0], name, data[ name ] );
- }
- }
- }
-
- return data;
-
- } else if ( typeof key === "object" ) {
- return this.each(function() {
- jQuery.data( this, key );
- });
- }
-
- var parts = key.split(".");
- parts[1] = parts[1] ? "." + parts[1] : "";
-
- if ( value === undefined ) {
- data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
-
- // Try to fetch any internally stored data first
- if ( data === undefined && this.length ) {
- data = jQuery.data( this[0], key );
- data = dataAttr( this[0], key, data );
- }
-
- return data === undefined && parts[1] ?
- this.data( parts[0] ) :
- data;
-
- } else {
- return this.each(function() {
- var $this = jQuery( this ),
- args = [ parts[0], value ];
-
- $this.triggerHandler( "setData" + parts[1] + "!", args );
- jQuery.data( this, key, value );
- $this.triggerHandler( "changeData" + parts[1] + "!", args );
- });
- }
- },
-
- removeData: function( key ) {
- return this.each(function() {
- jQuery.removeData( this, key );
- });
- }
-});
-
-function dataAttr( elem, key, data ) {
- // If nothing was found internally, try to fetch any
- // data from the HTML5 data-* attribute
- if ( data === undefined && elem.nodeType === 1 ) {
- data = elem.getAttribute( "data-" + key );
-
- if ( typeof data === "string" ) {
- try {
- data = data === "true" ? true :
- data === "false" ? false :
- data === "null" ? null :
- !jQuery.isNaN( data ) ? parseFloat( data ) :
- rbrace.test( data ) ? jQuery.parseJSON( data ) :
- data;
- } catch( e ) {}
-
- // Make sure we set the data so it isn't changed later
- jQuery.data( elem, key, data );
-
- } else {
- data = undefined;
- }
- }
-
- return data;
-}
-
-
-
-
-jQuery.extend({
- queue: function( elem, type, data ) {
- if ( !elem ) {
- return;
- }
-
- type = (type || "fx") + "queue";
- var q = jQuery.data( elem, type );
-
- // Speed up dequeue by getting out quickly if this is just a lookup
- if ( !data ) {
- return q || [];
- }
-
- if ( !q || jQuery.isArray(data) ) {
- q = jQuery.data( elem, type, jQuery.makeArray(data) );
-
- } else {
- q.push( data );
- }
-
- return q;
- },
-
- dequeue: function( elem, type ) {
- type = type || "fx";
-
- var queue = jQuery.queue( elem, type ),
- fn = queue.shift();
-
- // If the fx queue is dequeued, always remove the progress sentinel
- if ( fn === "inprogress" ) {
- fn = queue.shift();
- }
-
- if ( fn ) {
- // Add a progress sentinel to prevent the fx queue from being
- // automatically dequeued
- if ( type === "fx" ) {
- queue.unshift("inprogress");
- }
-
- fn.call(elem, function() {
- jQuery.dequeue(elem, type);
- });
- }
- }
-});
-
-jQuery.fn.extend({
- queue: function( type, data ) {
- if ( typeof type !== "string" ) {
- data = type;
- type = "fx";
- }
-
- if ( data === undefined ) {
- return jQuery.queue( this[0], type );
- }
- return this.each(function( i ) {
- var queue = jQuery.queue( this, type, data );
-
- if ( type === "fx" && queue[0] !== "inprogress" ) {
- jQuery.dequeue( this, type );
- }
- });
- },
- dequeue: function( type ) {
- return this.each(function() {
- jQuery.dequeue( this, type );
- });
- },
-
- // Based off of the plugin by Clint Helfers, with permission.
- // http://blindsignals.com/index.php/2009/07/jquery-delay/
- delay: function( time, type ) {
- time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
- type = type || "fx";
-
- return this.queue( type, function() {
- var elem = this;
- setTimeout(function() {
- jQuery.dequeue( elem, type );
- }, time );
- });
- },
-
- clearQueue: function( type ) {
- return this.queue( type || "fx", [] );
- }
-});
-
-
-
-
-var rclass = /[\n\t]/g,
- rspaces = /\s+/,
- rreturn = /\r/g,
- rspecialurl = /^(?:href|src|style)$/,
- rtype = /^(?:button|input)$/i,
- rfocusable = /^(?:button|input|object|select|textarea)$/i,
- rclickable = /^a(?:rea)?$/i,
- rradiocheck = /^(?:radio|checkbox)$/i;
-
-jQuery.props = {
- "for": "htmlFor",
- "class": "className",
- readonly: "readOnly",
- maxlength: "maxLength",
- cellspacing: "cellSpacing",
- rowspan: "rowSpan",
- colspan: "colSpan",
- tabindex: "tabIndex",
- usemap: "useMap",
- frameborder: "frameBorder"
-};
-
-jQuery.fn.extend({
- attr: function( name, value ) {
- return jQuery.access( this, name, value, true, jQuery.attr );
- },
-
- removeAttr: function( name, fn ) {
- return this.each(function(){
- jQuery.attr( this, name, "" );
- if ( this.nodeType === 1 ) {
- this.removeAttribute( name );
- }
- });
- },
-
- addClass: function( value ) {
- if ( jQuery.isFunction(value) ) {
- return this.each(function(i) {
- var self = jQuery(this);
- self.addClass( value.call(this, i, self.attr("class")) );
- });
- }
-
- if ( value && typeof value === "string" ) {
- var classNames = (value || "").split( rspaces );
-
- for ( var i = 0, l = this.length; i < l; i++ ) {
- var elem = this[i];
-
- if ( elem.nodeType === 1 ) {
- if ( !elem.className ) {
- elem.className = value;
-
- } else {
- var className = " " + elem.className + " ",
- setClass = elem.className;
-
- for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
- if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
- setClass += " " + classNames[c];
- }
- }
- elem.className = jQuery.trim( setClass );
- }
- }
- }
- }
-
- return this;
- },
-
- removeClass: function( value ) {
- if ( jQuery.isFunction(value) ) {
- return this.each(function(i) {
- var self = jQuery(this);
- self.removeClass( value.call(this, i, self.attr("class")) );
- });
- }
-
- if ( (value && typeof value === "string") || value === undefined ) {
- var classNames = (value || "").split( rspaces );
-
- for ( var i = 0, l = this.length; i < l; i++ ) {
- var elem = this[i];
-
- if ( elem.nodeType === 1 && elem.className ) {
- if ( value ) {
- var className = (" " + elem.className + " ").replace(rclass, " ");
- for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
- className = className.replace(" " + classNames[c] + " ", " ");
- }
- elem.className = jQuery.trim( className );
-
- } else {
- elem.className = "";
- }
- }
- }
- }
-
- return this;
- },
-
- toggleClass: function( value, stateVal ) {
- var type = typeof value,
- isBool = typeof stateVal === "boolean";
-
- if ( jQuery.isFunction( value ) ) {
- return this.each(function(i) {
- var self = jQuery(this);
- self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
- });
- }
-
- return this.each(function() {
- if ( type === "string" ) {
- // toggle individual class names
- var className,
- i = 0,
- self = jQuery( this ),
- state = stateVal,
- classNames = value.split( rspaces );
-
- while ( (className = classNames[ i++ ]) ) {
- // check each className given, space seperated list
- state = isBool ? state : !self.hasClass( className );
- self[ state ? "addClass" : "removeClass" ]( className );
- }
-
- } else if ( type === "undefined" || type === "boolean" ) {
- if ( this.className ) {
- // store className if set
- jQuery.data( this, "__className__", this.className );
- }
-
- // toggle whole className
- this.className = this.className || value === false ? "" : jQuery.data( this, "__className__" ) || "";
- }
- });
- },
-
- hasClass: function( selector ) {
- var className = " " + selector + " ";
- for ( var i = 0, l = this.length; i < l; i++ ) {
- if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
- return true;
- }
- }
-
- return false;
- },
-
- val: function( value ) {
- if ( !arguments.length ) {
- var elem = this[0];
-
- if ( elem ) {
- if ( jQuery.nodeName( elem, "option" ) ) {
- // attributes.value is undefined in Blackberry 4.7 but
- // uses .value. See #6932
- var val = elem.attributes.value;
- return !val || val.specified ? elem.value : elem.text;
- }
-
- // We need to handle select boxes special
- if ( jQuery.nodeName( elem, "select" ) ) {
- var index = elem.selectedIndex,
- values = [],
- options = elem.options,
- one = elem.type === "select-one";
-
- // Nothing was selected
- if ( index < 0 ) {
- return null;
- }
-
- // Loop through all the selected options
- for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
- var option = options[ i ];
-
- // Don't return options that are disabled or in a disabled optgroup
- if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
- (!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
-
- // Get the specific value for the option
- value = jQuery(option).val();
-
- // We don't need an array for one selects
- if ( one ) {
- return value;
- }
-
- // Multi-Selects return an array
- values.push( value );
- }
- }
-
- return values;
- }
-
- // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
- if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
- return elem.getAttribute("value") === null ? "on" : elem.value;
- }
-
-
- // Everything else, we just grab the value
- return (elem.value || "").replace(rreturn, "");
-
- }
-
- return undefined;
- }
-
- var isFunction = jQuery.isFunction(value);
-
- return this.each(function(i) {
- var self = jQuery(this), val = value;
-
- if ( this.nodeType !== 1 ) {
- return;
- }
-
- if ( isFunction ) {
- val = value.call(this, i, self.val());
- }
-
- // Treat null/undefined as ""; convert numbers to string
- if ( val == null ) {
- val = "";
- } else if ( typeof val === "number" ) {
- val += "";
- } else if ( jQuery.isArray(val) ) {
- val = jQuery.map(val, function (value) {
- return value == null ? "" : value + "";
- });
- }
-
- if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
- this.checked = jQuery.inArray( self.val(), val ) >= 0;
-
- } else if ( jQuery.nodeName( this, "select" ) ) {
- var values = jQuery.makeArray(val);
-
- jQuery( "option", this ).each(function() {
- this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
- });
-
- if ( !values.length ) {
- this.selectedIndex = -1;
- }
-
- } else {
- this.value = val;
- }
- });
- }
-});
-
-jQuery.extend({
- attrFn: {
- val: true,
- css: true,
- html: true,
- text: true,
- data: true,
- width: true,
- height: true,
- offset: true
- },
-
- attr: function( elem, name, value, pass ) {
- // don't set attributes on text and comment nodes
- if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
- return undefined;
- }
-
- if ( pass && name in jQuery.attrFn ) {
- return jQuery(elem)[name](value);
- }
-
- var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
- // Whether we are setting (or getting)
- set = value !== undefined;
-
- // Try to normalize/fix the name
- name = notxml && jQuery.props[ name ] || name;
-
- // These attributes require special treatment
- var special = rspecialurl.test( name );
-
- // Safari mis-reports the default selected property of an option
- // Accessing the parent's selectedIndex property fixes it
- if ( name === "selected" && !jQuery.support.optSelected ) {
- var parent = elem.parentNode;
- if ( parent ) {
- parent.selectedIndex;
-
- // Make sure that it also works with optgroups, see #5701
- if ( parent.parentNode ) {
- parent.parentNode.selectedIndex;
- }
- }
- }
-
- // If applicable, access the attribute via the DOM 0 way
- // 'in' checks fail in Blackberry 4.7 #6931
- if ( (name in elem || elem[ name ] !== undefined) && notxml && !special ) {
- if ( set ) {
- // We can't allow the type property to be changed (since it causes problems in IE)
- if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
- jQuery.error( "type property can't be changed" );
- }
-
- if ( value === null ) {
- if ( elem.nodeType === 1 ) {
- elem.removeAttribute( name );
- }
-
- } else {
- elem[ name ] = value;
- }
- }
-
- // browsers index elements by id/name on forms, give priority to attributes.
- if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
- return elem.getAttributeNode( name ).nodeValue;
- }
-
- // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
- // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
- if ( name === "tabIndex" ) {
- var attributeNode = elem.getAttributeNode( "tabIndex" );
-
- return attributeNode && attributeNode.specified ?
- attributeNode.value :
- rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
- 0 :
- undefined;
- }
-
- return elem[ name ];
- }
-
- if ( !jQuery.support.style && notxml && name === "style" ) {
- if ( set ) {
- elem.style.cssText = "" + value;
- }
-
- return elem.style.cssText;
- }
-
- if ( set ) {
- // convert the value to a string (all browsers do this but IE) see #1070
- elem.setAttribute( name, "" + value );
- }
-
- // Ensure that missing attributes return undefined
- // Blackberry 4.7 returns "" from getAttribute #6938
- if ( !elem.attributes[ name ] && (elem.hasAttribute && !elem.hasAttribute( name )) ) {
- return undefined;
- }
-
- var attr = !jQuery.support.hrefNormalized && notxml && special ?
- // Some attributes require a special call on IE
- elem.getAttribute( name, 2 ) :
- elem.getAttribute( name );
-
- // Non-existent attributes return null, we normalize to undefined
- return attr === null ? undefined : attr;
- }
-});
-
-
-
-
-var rnamespaces = /\.(.*)$/,
- rformElems = /^(?:textarea|input|select)$/i,
- rperiod = /\./g,
- rspace = / /g,
- rescape = /[^\w\s.|`]/g,
- fcleanup = function( nm ) {
- return nm.replace(rescape, "\\$&");
- },
- focusCounts = { focusin: 0, focusout: 0 };
-
-/*
- * A number of helper functions used for managing events.
- * Many of the ideas behind this code originated from
- * Dean Edwards' addEvent library.
- */
-jQuery.event = {
-
- // Bind an event to an element
- // Original by Dean Edwards
- add: function( elem, types, handler, data ) {
- if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
- return;
- }
-
- // For whatever reason, IE has trouble passing the window object
- // around, causing it to be cloned in the process
- if ( jQuery.isWindow( elem ) && ( elem !== window && !elem.frameElement ) ) {
- elem = window;
- }
-
- if ( handler === false ) {
- handler = returnFalse;
- } else if ( !handler ) {
- // Fixes bug #7229. Fix recommended by jdalton
- return;
- }
-
- var handleObjIn, handleObj;
-
- if ( handler.handler ) {
- handleObjIn = handler;
- handler = handleObjIn.handler;
- }
-
- // Make sure that the function being executed has a unique ID
- if ( !handler.guid ) {
- handler.guid = jQuery.guid++;
- }
-
- // Init the element's event structure
- var elemData = jQuery.data( elem );
-
- // If no elemData is found then we must be trying to bind to one of the
- // banned noData elements
- if ( !elemData ) {
- return;
- }
-
- // Use a key less likely to result in collisions for plain JS objects.
- // Fixes bug #7150.
- var eventKey = elem.nodeType ? "events" : "__events__",
- events = elemData[ eventKey ],
- eventHandle = elemData.handle;
-
- if ( typeof events === "function" ) {
- // On plain objects events is a fn that holds the the data
- // which prevents this data from being JSON serialized
- // the function does not need to be called, it just contains the data
- eventHandle = events.handle;
- events = events.events;
-
- } else if ( !events ) {
- if ( !elem.nodeType ) {
- // On plain objects, create a fn that acts as the holder
- // of the values to avoid JSON serialization of event data
- elemData[ eventKey ] = elemData = function(){};
- }
-
- elemData.events = events = {};
- }
-
- if ( !eventHandle ) {
- elemData.handle = eventHandle = function() {
- // Handle the second event of a trigger and when
- // an event is called after a page has unloaded
- return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
- jQuery.event.handle.apply( eventHandle.elem, arguments ) :
- undefined;
- };
- }
-
- // Add elem as a property of the handle function
- // This is to prevent a memory leak with non-native events in IE.
- eventHandle.elem = elem;
-
- // Handle multiple events separated by a space
- // jQuery(...).bind("mouseover mouseout", fn);
- types = types.split(" ");
-
- var type, i = 0, namespaces;
-
- while ( (type = types[ i++ ]) ) {
- handleObj = handleObjIn ?
- jQuery.extend({}, handleObjIn) :
- { handler: handler, data: data };
-
- // Namespaced event handlers
- if ( type.indexOf(".") > -1 ) {
- namespaces = type.split(".");
- type = namespaces.shift();
- handleObj.namespace = namespaces.slice(0).sort().join(".");
-
- } else {
- namespaces = [];
- handleObj.namespace = "";
- }
-
- handleObj.type = type;
- if ( !handleObj.guid ) {
- handleObj.guid = handler.guid;
- }
-
- // Get the current list of functions bound to this event
- var handlers = events[ type ],
- special = jQuery.event.special[ type ] || {};
-
- // Init the event handler queue
- if ( !handlers ) {
- handlers = events[ type ] = [];
-
- // Check for a special event handler
- // Only use addEventListener/attachEvent if the special
- // events handler returns false
- if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
- // Bind the global event handler to the element
- if ( elem.addEventListener ) {
- elem.addEventListener( type, eventHandle, false );
-
- } else if ( elem.attachEvent ) {
- elem.attachEvent( "on" + type, eventHandle );
- }
- }
- }
-
- if ( special.add ) {
- special.add.call( elem, handleObj );
-
- if ( !handleObj.handler.guid ) {
- handleObj.handler.guid = handler.guid;
- }
- }
-
- // Add the function to the element's handler list
- handlers.push( handleObj );
-
- // Keep track of which events have been used, for global triggering
- jQuery.event.global[ type ] = true;
- }
-
- // Nullify elem to prevent memory leaks in IE
- elem = null;
- },
-
- global: {},
-
- // Detach an event or set of events from an element
- remove: function( elem, types, handler, pos ) {
- // don't do events on text and comment nodes
- if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
- return;
- }
-
- if ( handler === false ) {
- handler = returnFalse;
- }
-
- var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
- eventKey = elem.nodeType ? "events" : "__events__",
- elemData = jQuery.data( elem ),
- events = elemData && elemData[ eventKey ];
-
- if ( !elemData || !events ) {
- return;
- }
-
- if ( typeof events === "function" ) {
- elemData = events;
- events = events.events;
- }
-
- // types is actually an event object here
- if ( types && types.type ) {
- handler = types.handler;
- types = types.type;
- }
-
- // Unbind all events for the element
- if ( !types || typeof types === "string" && types.charAt(0) === "." ) {
- types = types || "";
-
- for ( type in events ) {
- jQuery.event.remove( elem, type + types );
- }
-
- return;
- }
-
- // Handle multiple events separated by a space
- // jQuery(...).unbind("mouseover mouseout", fn);
- types = types.split(" ");
-
- while ( (type = types[ i++ ]) ) {
- origType = type;
- handleObj = null;
- all = type.indexOf(".") < 0;
- namespaces = [];
-
- if ( !all ) {
- // Namespaced event handlers
- namespaces = type.split(".");
- type = namespaces.shift();
-
- namespace = new RegExp("(^|\\.)" +
- jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)");
- }
-
- eventType = events[ type ];
-
- if ( !eventType ) {
- continue;
- }
-
- if ( !handler ) {
- for ( j = 0; j < eventType.length; j++ ) {
- handleObj = eventType[ j ];
-
- if ( all || namespace.test( handleObj.namespace ) ) {
- jQuery.event.remove( elem, origType, handleObj.handler, j );
- eventType.splice( j--, 1 );
- }
- }
-
- continue;
- }
-
- special = jQuery.event.special[ type ] || {};
-
- for ( j = pos || 0; j < eventType.length; j++ ) {
- handleObj = eventType[ j ];
-
- if ( handler.guid === handleObj.guid ) {
- // remove the given handler for the given type
- if ( all || namespace.test( handleObj.namespace ) ) {
- if ( pos == null ) {
- eventType.splice( j--, 1 );
- }
-
- if ( special.remove ) {
- special.remove.call( elem, handleObj );
- }
- }
-
- if ( pos != null ) {
- break;
- }
- }
- }
-
- // remove generic event handler if no more handlers exist
- if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
- if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
- jQuery.removeEvent( elem, type, elemData.handle );
- }
-
- ret = null;
- delete events[ type ];
- }
- }
-
- // Remove the expando if it's no longer used
- if ( jQuery.isEmptyObject( events ) ) {
- var handle = elemData.handle;
- if ( handle ) {
- handle.elem = null;
- }
-
- delete elemData.events;
- delete elemData.handle;
-
- if ( typeof elemData === "function" ) {
- jQuery.removeData( elem, eventKey );
-
- } else if ( jQuery.isEmptyObject( elemData ) ) {
- jQuery.removeData( elem );
- }
- }
- },
-
- // bubbling is internal
- trigger: function( event, data, elem /*, bubbling */ ) {
- // Event object or event type
- var type = event.type || event,
- bubbling = arguments[3];
-
- if ( !bubbling ) {
- event = typeof event === "object" ?
- // jQuery.Event object
- event[ jQuery.expando ] ? event :
- // Object literal
- jQuery.extend( jQuery.Event(type), event ) :
- // Just the event type (string)
- jQuery.Event(type);
-
- if ( type.indexOf("!") >= 0 ) {
- event.type = type = type.slice(0, -1);
- event.exclusive = true;
- }
-
- // Handle a global trigger
- if ( !elem ) {
- // Don't bubble custom events when global (to avoid too much overhead)
- event.stopPropagation();
-
- // Only trigger if we've ever bound an event for it
- if ( jQuery.event.global[ type ] ) {
- jQuery.each( jQuery.cache, function() {
- if ( this.events && this.events[type] ) {
- jQuery.event.trigger( event, data, this.handle.elem );
- }
- });
- }
- }
-
- // Handle triggering a single element
-
- // don't do events on text and comment nodes
- if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
- return undefined;
- }
-
- // Clean up in case it is reused
- event.result = undefined;
- event.target = elem;
-
- // Clone the incoming data, if any
- data = jQuery.makeArray( data );
- data.unshift( event );
- }
-
- event.currentTarget = elem;
-
- // Trigger the event, it is assumed that "handle" is a function
- var handle = elem.nodeType ?
- jQuery.data( elem, "handle" ) :
- (jQuery.data( elem, "__events__" ) || {}).handle;
-
- if ( handle ) {
- handle.apply( elem, data );
- }
-
- var parent = elem.parentNode || elem.ownerDocument;
-
- // Trigger an inline bound script
- try {
- if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) {
- if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) {
- event.result = false;
- event.preventDefault();
- }
- }
-
- // prevent IE from throwing an error for some elements with some event types, see #3533
- } catch (inlineError) {}
-
- if ( !event.isPropagationStopped() && parent ) {
- jQuery.event.trigger( event, data, parent, true );
-
- } else if ( !event.isDefaultPrevented() ) {
- var old,
- target = event.target,
- targetType = type.replace( rnamespaces, "" ),
- isClick = jQuery.nodeName( target, "a" ) && targetType === "click",
- special = jQuery.event.special[ targetType ] || {};
-
- if ( (!special._default || special._default.call( elem, event ) === false) &&
- !isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
-
- try {
- if ( target[ targetType ] ) {
- // Make sure that we don't accidentally re-trigger the onFOO events
- old = target[ "on" + targetType ];
-
- if ( old ) {
- target[ "on" + targetType ] = null;
- }
-
- jQuery.event.triggered = true;
- target[ targetType ]();
- }
-
- // prevent IE from throwing an error for some elements with some event types, see #3533
- } catch (triggerError) {}
-
- if ( old ) {
- target[ "on" + targetType ] = old;
- }
-
- jQuery.event.triggered = false;
- }
- }
- },
-
- handle: function( event ) {
- var all, handlers, namespaces, namespace_re, events,
- namespace_sort = [],
- args = jQuery.makeArray( arguments );
-
- event = args[0] = jQuery.event.fix( event || window.event );
- event.currentTarget = this;
-
- // Namespaced event handlers
- all = event.type.indexOf(".") < 0 && !event.exclusive;
-
- if ( !all ) {
- namespaces = event.type.split(".");
- event.type = namespaces.shift();
- namespace_sort = namespaces.slice(0).sort();
- namespace_re = new RegExp("(^|\\.)" + namespace_sort.join("\\.(?:.*\\.)?") + "(\\.|$)");
- }
-
- event.namespace = event.namespace || namespace_sort.join(".");
-
- events = jQuery.data(this, this.nodeType ? "events" : "__events__");
-
- if ( typeof events === "function" ) {
- events = events.events;
- }
-
- handlers = (events || {})[ event.type ];
-
- if ( events && handlers ) {
- // Clone the handlers to prevent manipulation
- handlers = handlers.slice(0);
-
- for ( var j = 0, l = handlers.length; j < l; j++ ) {
- var handleObj = handlers[ j ];
-
- // Filter the functions by class
- if ( all || namespace_re.test( handleObj.namespace ) ) {
- // Pass in a reference to the handler function itself
- // So that we can later remove it
- event.handler = handleObj.handler;
- event.data = handleObj.data;
- event.handleObj = handleObj;
-
- var ret = handleObj.handler.apply( this, args );
-
- if ( ret !== undefined ) {
- event.result = ret;
- if ( ret === false ) {
- event.preventDefault();
- event.stopPropagation();
- }
- }
-
- if ( event.isImmediatePropagationStopped() ) {
- break;
- }
- }
- }
- }
-
- return event.result;
- },
-
- props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-
- fix: function( event ) {
- if ( event[ jQuery.expando ] ) {
- return event;
- }
-
- // store a copy of the original event object
- // and "clone" to set read-only properties
- var originalEvent = event;
- event = jQuery.Event( originalEvent );
-
- for ( var i = this.props.length, prop; i; ) {
- prop = this.props[ --i ];
- event[ prop ] = originalEvent[ prop ];
- }
-
- // Fix target property, if necessary
- if ( !event.target ) {
- // Fixes #1925 where srcElement might not be defined either
- event.target = event.srcElement || document;
- }
-
- // check if target is a textnode (safari)
- if ( event.target.nodeType === 3 ) {
- event.target = event.target.parentNode;
- }
-
- // Add relatedTarget, if necessary
- if ( !event.relatedTarget && event.fromElement ) {
- event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement;
- }
-
- // Calculate pageX/Y if missing and clientX/Y available
- if ( event.pageX == null && event.clientX != null ) {
- var doc = document.documentElement,
- body = document.body;
-
- event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
- event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc && doc.clientTop || body && body.clientTop || 0);
- }
-
- // Add which for key events
- if ( event.which == null && (event.charCode != null || event.keyCode != null) ) {
- event.which = event.charCode != null ? event.charCode : event.keyCode;
- }
-
- // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
- if ( !event.metaKey && event.ctrlKey ) {
- event.metaKey = event.ctrlKey;
- }
-
- // Add which for click: 1 === left; 2 === middle; 3 === right
- // Note: button is not normalized, so don't use it
- if ( !event.which && event.button !== undefined ) {
- event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
- }
-
- return event;
- },
-
- // Deprecated, use jQuery.guid instead
- guid: 1E8,
-
- // Deprecated, use jQuery.proxy instead
- proxy: jQuery.proxy,
-
- special: {
- ready: {
- // Make sure the ready event is setup
- setup: jQuery.bindReady,
- teardown: jQuery.noop
- },
-
- live: {
- add: function( handleObj ) {
- jQuery.event.add( this,
- liveConvert( handleObj.origType, handleObj.selector ),
- jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) );
- },
-
- remove: function( handleObj ) {
- jQuery.event.remove( this, liveConvert( handleObj.origType, handleObj.selector ), handleObj );
- }
- },
-
- beforeunload: {
- setup: function( data, namespaces, eventHandle ) {
- // We only want to do this special case on windows
- if ( jQuery.isWindow( this ) ) {
- this.onbeforeunload = eventHandle;
- }
- },
-
- teardown: function( namespaces, eventHandle ) {
- if ( this.onbeforeunload === eventHandle ) {
- this.onbeforeunload = null;
- }
- }
- }
- }
-};
-
-jQuery.removeEvent = document.removeEventListener ?
- function( elem, type, handle ) {
- if ( elem.removeEventListener ) {
- elem.removeEventListener( type, handle, false );
- }
- } :
- function( elem, type, handle ) {
- if ( elem.detachEvent ) {
- elem.detachEvent( "on" + type, handle );
- }
- };
-
-jQuery.Event = function( src ) {
- // Allow instantiation without the 'new' keyword
- if ( !this.preventDefault ) {
- return new jQuery.Event( src );
- }
-
- // Event object
- if ( src && src.type ) {
- this.originalEvent = src;
- this.type = src.type;
- // Event type
- } else {
- this.type = src;
- }
-
- // timeStamp is buggy for some events on Firefox(#3843)
- // So we won't rely on the native value
- this.timeStamp = jQuery.now();
-
- // Mark it as fixed
- this[ jQuery.expando ] = true;
-};
-
-function returnFalse() {
- return false;
-}
-function returnTrue() {
- return true;
-}
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
- preventDefault: function() {
- this.isDefaultPrevented = returnTrue;
-
- var e = this.originalEvent;
- if ( !e ) {
- return;
- }
-
- // if preventDefault exists run it on the original event
- if ( e.preventDefault ) {
- e.preventDefault();
-
- // otherwise set the returnValue property of the original event to false (IE)
- } else {
- e.returnValue = false;
- }
- },
- stopPropagation: function() {
- this.isPropagationStopped = returnTrue;
-
- var e = this.originalEvent;
- if ( !e ) {
- return;
- }
- // if stopPropagation exists run it on the original event
- if ( e.stopPropagation ) {
- e.stopPropagation();
- }
- // otherwise set the cancelBubble property of the original event to true (IE)
- e.cancelBubble = true;
- },
- stopImmediatePropagation: function() {
- this.isImmediatePropagationStopped = returnTrue;
- this.stopPropagation();
- },
- isDefaultPrevented: returnFalse,
- isPropagationStopped: returnFalse,
- isImmediatePropagationStopped: returnFalse
-};
-
-// Checks if an event happened on an element within another element
-// Used in jQuery.event.special.mouseenter and mouseleave handlers
-var withinElement = function( event ) {
- // Check if mouse(over|out) are still within the same parent element
- var parent = event.relatedTarget;
-
- // Firefox sometimes assigns relatedTarget a XUL element
- // which we cannot access the parentNode property of
- try {
- // Traverse up the tree
- while ( parent && parent !== this ) {
- parent = parent.parentNode;
- }
-
- if ( parent !== this ) {
- // set the correct event type
- event.type = event.data;
-
- // handle event if we actually just moused on to a non sub-element
- jQuery.event.handle.apply( this, arguments );
- }
-
- // assuming we've left the element since we most likely mousedover a xul element
- } catch(e) { }
-},
-
-// In case of event delegation, we only need to rename the event.type,
-// liveHandler will take care of the rest.
-delegate = function( event ) {
- event.type = event.data;
- jQuery.event.handle.apply( this, arguments );
-};
-
-// Create mouseenter and mouseleave events
-jQuery.each({
- mouseenter: "mouseover",
- mouseleave: "mouseout"
-}, function( orig, fix ) {
- jQuery.event.special[ orig ] = {
- setup: function( data ) {
- jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig );
- },
- teardown: function( data ) {
- jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement );
- }
- };
-});
-
-// submit delegation
-if ( !jQuery.support.submitBubbles ) {
-
- jQuery.event.special.submit = {
- setup: function( data, namespaces ) {
- if ( this.nodeName.toLowerCase() !== "form" ) {
- jQuery.event.add(this, "click.specialSubmit", function( e ) {
- var elem = e.target,
- type = elem.type;
-
- if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
- e.liveFired = undefined;
- return trigger( "submit", this, arguments );
- }
- });
-
- jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
- var elem = e.target,
- type = elem.type;
-
- if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
- e.liveFired = undefined;
- return trigger( "submit", this, arguments );
- }
- });
-
- } else {
- return false;
- }
- },
-
- teardown: function( namespaces ) {
- jQuery.event.remove( this, ".specialSubmit" );
- }
- };
-
-}
-
-// change delegation, happens here so we have bind.
-if ( !jQuery.support.changeBubbles ) {
-
- var changeFilters,
-
- getVal = function( elem ) {
- var type = elem.type, val = elem.value;
-
- if ( type === "radio" || type === "checkbox" ) {
- val = elem.checked;
-
- } else if ( type === "select-multiple" ) {
- val = elem.selectedIndex > -1 ?
- jQuery.map( elem.options, function( elem ) {
- return elem.selected;
- }).join("-") :
- "";
-
- } else if ( elem.nodeName.toLowerCase() === "select" ) {
- val = elem.selectedIndex;
- }
-
- return val;
- },
-
- testChange = function testChange( e ) {
- var elem = e.target, data, val;
-
- if ( !rformElems.test( elem.nodeName ) || elem.readOnly ) {
- return;
- }
-
- data = jQuery.data( elem, "_change_data" );
- val = getVal(elem);
-
- // the current data will be also retrieved by beforeactivate
- if ( e.type !== "focusout" || elem.type !== "radio" ) {
- jQuery.data( elem, "_change_data", val );
- }
-
- if ( data === undefined || val === data ) {
- return;
- }
-
- if ( data != null || val ) {
- e.type = "change";
- e.liveFired = undefined;
- return jQuery.event.trigger( e, arguments[1], elem );
- }
- };
-
- jQuery.event.special.change = {
- filters: {
- focusout: testChange,
-
- beforedeactivate: testChange,
-
- click: function( e ) {
- var elem = e.target, type = elem.type;
-
- if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) {
- return testChange.call( this, e );
- }
- },
-
- // Change has to be called before submit
- // Keydown will be called before keypress, which is used in submit-event delegation
- keydown: function( e ) {
- var elem = e.target, type = elem.type;
-
- if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") ||
- (e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
- type === "select-multiple" ) {
- return testChange.call( this, e );
- }
- },
-
- // Beforeactivate happens also before the previous element is blurred
- // with this event you can't trigger a change event, but you can store
- // information
- beforeactivate: function( e ) {
- var elem = e.target;
- jQuery.data( elem, "_change_data", getVal(elem) );
- }
- },
-
- setup: function( data, namespaces ) {
- if ( this.type === "file" ) {
- return false;
- }
-
- for ( var type in changeFilters ) {
- jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
- }
-
- return rformElems.test( this.nodeName );
- },
-
- teardown: function( namespaces ) {
- jQuery.event.remove( this, ".specialChange" );
-
- return rformElems.test( this.nodeName );
- }
- };
-
- changeFilters = jQuery.event.special.change.filters;
-
- // Handle when the input is .focus()'d
- changeFilters.focus = changeFilters.beforeactivate;
-}
-
-function trigger( type, elem, args ) {
- args[0].type = type;
- return jQuery.event.handle.apply( elem, args );
-}
-
-// Create "bubbling" focus and blur events
-if ( document.addEventListener ) {
- jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
- jQuery.event.special[ fix ] = {
- setup: function() {
- if ( focusCounts[fix]++ === 0 ) {
- document.addEventListener( orig, handler, true );
- }
- },
- teardown: function() {
- if ( --focusCounts[fix] === 0 ) {
- document.removeEventListener( orig, handler, true );
- }
- }
- };
-
- function handler( e ) {
- e = jQuery.event.fix( e );
- e.type = fix;
- return jQuery.event.trigger( e, null, e.target );
- }
- });
-}
-
-jQuery.each(["bind", "one"], function( i, name ) {
- jQuery.fn[ name ] = function( type, data, fn ) {
- // Handle object literals
- if ( typeof type === "object" ) {
- for ( var key in type ) {
- this[ name ](key, data, type[key], fn);
- }
- return this;
- }
-
- if ( jQuery.isFunction( data ) || data === false ) {
- fn = data;
- data = undefined;
- }
-
- var handler = name === "one" ? jQuery.proxy( fn, function( event ) {
- jQuery( this ).unbind( event, handler );
- return fn.apply( this, arguments );
- }) : fn;
-
- if ( type === "unload" && name !== "one" ) {
- this.one( type, data, fn );
-
- } else {
- for ( var i = 0, l = this.length; i < l; i++ ) {
- jQuery.event.add( this[i], type, handler, data );
- }
- }
-
- return this;
- };
-});
-
-jQuery.fn.extend({
- unbind: function( type, fn ) {
- // Handle object literals
- if ( typeof type === "object" && !type.preventDefault ) {
- for ( var key in type ) {
- this.unbind(key, type[key]);
- }
-
- } else {
- for ( var i = 0, l = this.length; i < l; i++ ) {
- jQuery.event.remove( this[i], type, fn );
- }
- }
-
- return this;
- },
-
- delegate: function( selector, types, data, fn ) {
- return this.live( types, data, fn, selector );
- },
-
- undelegate: function( selector, types, fn ) {
- if ( arguments.length === 0 ) {
- return this.unbind( "live" );
-
- } else {
- return this.die( types, null, fn, selector );
- }
- },
-
- trigger: function( type, data ) {
- return this.each(function() {
- jQuery.event.trigger( type, data, this );
- });
- },
-
- triggerHandler: function( type, data ) {
- if ( this[0] ) {
- var event = jQuery.Event( type );
- event.preventDefault();
- event.stopPropagation();
- jQuery.event.trigger( event, data, this[0] );
- return event.result;
- }
- },
-
- toggle: function( fn ) {
- // Save reference to arguments for access in closure
- var args = arguments,
- i = 1;
-
- // link all the functions, so any of them can unbind this click handler
- while ( i < args.length ) {
- jQuery.proxy( fn, args[ i++ ] );
- }
-
- return this.click( jQuery.proxy( fn, function( event ) {
- // Figure out which function to execute
- var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i;
- jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 );
-
- // Make sure that clicks stop
- event.preventDefault();
-
- // and execute the function
- return args[ lastToggle ].apply( this, arguments ) || false;
- }));
- },
-
- hover: function( fnOver, fnOut ) {
- return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
- }
-});
-
-var liveMap = {
- focus: "focusin",
- blur: "focusout",
- mouseenter: "mouseover",
- mouseleave: "mouseout"
-};
-
-jQuery.each(["live", "die"], function( i, name ) {
- jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) {
- var type, i = 0, match, namespaces, preType,
- selector = origSelector || this.selector,
- context = origSelector ? this : jQuery( this.context );
-
- if ( typeof types === "object" && !types.preventDefault ) {
- for ( var key in types ) {
- context[ name ]( key, data, types[key], selector );
- }
-
- return this;
- }
-
- if ( jQuery.isFunction( data ) ) {
- fn = data;
- data = undefined;
- }
-
- types = (types || "").split(" ");
-
- while ( (type = types[ i++ ]) != null ) {
- match = rnamespaces.exec( type );
- namespaces = "";
-
- if ( match ) {
- namespaces = match[0];
- type = type.replace( rnamespaces, "" );
- }
-
- if ( type === "hover" ) {
- types.push( "mouseenter" + namespaces, "mouseleave" + namespaces );
- continue;
- }
-
- preType = type;
-
- if ( type === "focus" || type === "blur" ) {
- types.push( liveMap[ type ] + namespaces );
- type = type + namespaces;
-
- } else {
- type = (liveMap[ type ] || type) + namespaces;
- }
-
- if ( name === "live" ) {
- // bind live handler
- for ( var j = 0, l = context.length; j < l; j++ ) {
- jQuery.event.add( context[j], "live." + liveConvert( type, selector ),
- { data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
- }
-
- } else {
- // unbind live handler
- context.unbind( "live." + liveConvert( type, selector ), fn );
- }
- }
-
- return this;
- };
-});
-
-function liveHandler( event ) {
- var stop, maxLevel, related, match, handleObj, elem, j, i, l, data, close, namespace, ret,
- elems = [],
- selectors = [],
- events = jQuery.data( this, this.nodeType ? "events" : "__events__" );
-
- if ( typeof events === "function" ) {
- events = events.events;
- }
-
- // Make sure we avoid non-left-click bubbling in Firefox (#3861)
- if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
- return;
- }
-
- if ( event.namespace ) {
- namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)");
- }
-
- event.liveFired = this;
-
- var live = events.live.slice(0);
-
- for ( j = 0; j < live.length; j++ ) {
- handleObj = live[j];
-
- if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) {
- selectors.push( handleObj.selector );
-
- } else {
- live.splice( j--, 1 );
- }
- }
-
- match = jQuery( event.target ).closest( selectors, event.currentTarget );
-
- for ( i = 0, l = match.length; i < l; i++ ) {
- close = match[i];
-
- for ( j = 0; j < live.length; j++ ) {
- handleObj = live[j];
-
- if ( close.selector === handleObj.selector && (!namespace || namespace.test( handleObj.namespace )) ) {
- elem = close.elem;
- related = null;
-
- // Those two events require additional checking
- if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) {
- event.type = handleObj.preType;
- related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0];
- }
-
- if ( !related || related !== elem ) {
- elems.push({ elem: elem, handleObj: handleObj, level: close.level });
- }
- }
- }
- }
-
- for ( i = 0, l = elems.length; i < l; i++ ) {
- match = elems[i];
-
- if ( maxLevel && match.level > maxLevel ) {
- break;
- }
-
- event.currentTarget = match.elem;
- event.data = match.handleObj.data;
- event.handleObj = match.handleObj;
-
- ret = match.handleObj.origHandler.apply( match.elem, arguments );
-
- if ( ret === false || event.isPropagationStopped() ) {
- maxLevel = match.level;
-
- if ( ret === false ) {
- stop = false;
- }
- if ( event.isImmediatePropagationStopped() ) {
- break;
- }
- }
- }
-
- return stop;
-}
-
-function liveConvert( type, selector ) {
- return (type && type !== "*" ? type + "." : "") + selector.replace(rperiod, "`").replace(rspace, "&");
-}
-
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
- "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
- "change select submit keydown keypress keyup error").split(" "), function( i, name ) {
-
- // Handle event binding
- jQuery.fn[ name ] = function( data, fn ) {
- if ( fn == null ) {
- fn = data;
- data = null;
- }
-
- return arguments.length > 0 ?
- this.bind( name, data, fn ) :
- this.trigger( name );
- };
-
- if ( jQuery.attrFn ) {
- jQuery.attrFn[ name ] = true;
- }
-});
-
-// Prevent memory leaks in IE
-// Window isn't included so as not to unbind existing unload events
-// More info:
-// - http://isaacschlueter.com/2006/10/msie-memory-leaks/
-if ( window.attachEvent && !window.addEventListener ) {
- jQuery(window).bind("unload", function() {
- for ( var id in jQuery.cache ) {
- if ( jQuery.cache[ id ].handle ) {
- // Try/Catch is to handle iframes being unloaded, see #4280
- try {
- jQuery.event.remove( jQuery.cache[ id ].handle.elem );
- } catch(e) {}
- }
- }
- });
-}
-
-
-/*!
- * Sizzle CSS Selector Engine - v1.0
- * Copyright 2009, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- * More information: http://sizzlejs.com/
- */
-(function(){
-
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
- done = 0,
- toString = Object.prototype.toString,
- hasDuplicate = false,
- baseHasDuplicate = true;
-
-// Here we check if the JavaScript engine is using some sort of
-// optimization where it does not always call our comparision
-// function. If that is the case, discard the hasDuplicate value.
-// Thus far that includes Google Chrome.
-[0, 0].sort(function() {
- baseHasDuplicate = false;
- return 0;
-});
-
-var Sizzle = function( selector, context, results, seed ) {
- results = results || [];
- context = context || document;
-
- var origContext = context;
-
- if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
- return [];
- }
-
- if ( !selector || typeof selector !== "string" ) {
- return results;
- }
-
- var m, set, checkSet, extra, ret, cur, pop, i,
- prune = true,
- contextXML = Sizzle.isXML( context ),
- parts = [],
- soFar = selector;
-
- // Reset the position of the chunker regexp (start from head)
- do {
- chunker.exec( "" );
- m = chunker.exec( soFar );
-
- if ( m ) {
- soFar = m[3];
-
- parts.push( m[1] );
-
- if ( m[2] ) {
- extra = m[3];
- break;
- }
- }
- } while ( m );
-
- if ( parts.length > 1 && origPOS.exec( selector ) ) {
-
- if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
- set = posProcess( parts[0] + parts[1], context );
-
- } else {
- set = Expr.relative[ parts[0] ] ?
- [ context ] :
- Sizzle( parts.shift(), context );
-
- while ( parts.length ) {
- selector = parts.shift();
-
- if ( Expr.relative[ selector ] ) {
- selector += parts.shift();
- }
-
- set = posProcess( selector, set );
- }
- }
-
- } else {
- // Take a shortcut and set the context if the root selector is an ID
- // (but not if it'll be faster if the inner selector is an ID)
- if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
- Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
-
- ret = Sizzle.find( parts.shift(), context, contextXML );
- context = ret.expr ?
- Sizzle.filter( ret.expr, ret.set )[0] :
- ret.set[0];
- }
-
- if ( context ) {
- ret = seed ?
- { expr: parts.pop(), set: makeArray(seed) } :
- Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
-
- set = ret.expr ?
- Sizzle.filter( ret.expr, ret.set ) :
- ret.set;
-
- if ( parts.length > 0 ) {
- checkSet = makeArray( set );
-
- } else {
- prune = false;
- }
-
- while ( parts.length ) {
- cur = parts.pop();
- pop = cur;
-
- if ( !Expr.relative[ cur ] ) {
- cur = "";
- } else {
- pop = parts.pop();
- }
-
- if ( pop == null ) {
- pop = context;
- }
-
- Expr.relative[ cur ]( checkSet, pop, contextXML );
- }
-
- } else {
- checkSet = parts = [];
- }
- }
-
- if ( !checkSet ) {
- checkSet = set;
- }
-
- if ( !checkSet ) {
- Sizzle.error( cur || selector );
- }
-
- if ( toString.call(checkSet) === "[object Array]" ) {
- if ( !prune ) {
- results.push.apply( results, checkSet );
-
- } else if ( context && context.nodeType === 1 ) {
- for ( i = 0; checkSet[i] != null; i++ ) {
- if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {
- results.push( set[i] );
- }
- }
-
- } else {
- for ( i = 0; checkSet[i] != null; i++ ) {
- if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
- results.push( set[i] );
- }
- }
- }
-
- } else {
- makeArray( checkSet, results );
- }
-
- if ( extra ) {
- Sizzle( extra, origContext, results, seed );
- Sizzle.uniqueSort( results );
- }
-
- return results;
-};
-
-Sizzle.uniqueSort = function( results ) {
- if ( sortOrder ) {
- hasDuplicate = baseHasDuplicate;
- results.sort( sortOrder );
-
- if ( hasDuplicate ) {
- for ( var i = 1; i < results.length; i++ ) {
- if ( results[i] === results[ i - 1 ] ) {
- results.splice( i--, 1 );
- }
- }
- }
- }
-
- return results;
-};
-
-Sizzle.matches = function( expr, set ) {
- return Sizzle( expr, null, null, set );
-};
-
-Sizzle.matchesSelector = function( node, expr ) {
- return Sizzle( expr, null, null, [node] ).length > 0;
-};
-
-Sizzle.find = function( expr, context, isXML ) {
- var set;
-
- if ( !expr ) {
- return [];
- }
-
- for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
- var match,
- type = Expr.order[i];
-
- if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
- var left = match[1];
- match.splice( 1, 1 );
-
- if ( left.substr( left.length - 1 ) !== "\\" ) {
- match[1] = (match[1] || "").replace(/\\/g, "");
- set = Expr.find[ type ]( match, context, isXML );
-
- if ( set != null ) {
- expr = expr.replace( Expr.match[ type ], "" );
- break;
- }
- }
- }
- }
-
- if ( !set ) {
- set = context.getElementsByTagName( "*" );
- }
-
- return { set: set, expr: expr };
-};
-
-Sizzle.filter = function( expr, set, inplace, not ) {
- var match, anyFound,
- old = expr,
- result = [],
- curLoop = set,
- isXMLFilter = set && set[0] && Sizzle.isXML( set[0] );
-
- while ( expr && set.length ) {
- for ( var type in Expr.filter ) {
- if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
- var found, item,
- filter = Expr.filter[ type ],
- left = match[1];
-
- anyFound = false;
-
- match.splice(1,1);
-
- if ( left.substr( left.length - 1 ) === "\\" ) {
- continue;
- }
-
- if ( curLoop === result ) {
- result = [];
- }
-
- if ( Expr.preFilter[ type ] ) {
- match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
-
- if ( !match ) {
- anyFound = found = true;
-
- } else if ( match === true ) {
- continue;
- }
- }
-
- if ( match ) {
- for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
- if ( item ) {
- found = filter( item, match, i, curLoop );
- var pass = not ^ !!found;
-
- if ( inplace && found != null ) {
- if ( pass ) {
- anyFound = true;
-
- } else {
- curLoop[i] = false;
- }
-
- } else if ( pass ) {
- result.push( item );
- anyFound = true;
- }
- }
- }
- }
-
- if ( found !== undefined ) {
- if ( !inplace ) {
- curLoop = result;
- }
-
- expr = expr.replace( Expr.match[ type ], "" );
-
- if ( !anyFound ) {
- return [];
- }
-
- break;
- }
- }
- }
-
- // Improper expression
- if ( expr === old ) {
- if ( anyFound == null ) {
- Sizzle.error( expr );
-
- } else {
- break;
- }
- }
-
- old = expr;
- }
-
- return curLoop;
-};
-
-Sizzle.error = function( msg ) {
- throw "Syntax error, unrecognized expression: " + msg;
-};
-
-var Expr = Sizzle.selectors = {
- order: [ "ID", "NAME", "TAG" ],
-
- match: {
- ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
- CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
- NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,
- ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
- TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,
- CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,
- POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,
- PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
- },
-
- leftMatch: {},
-
- attrMap: {
- "class": "className",
- "for": "htmlFor"
- },
-
- attrHandle: {
- href: function( elem ) {
- return elem.getAttribute( "href" );
- }
- },
-
- relative: {
- "+": function(checkSet, part){
- var isPartStr = typeof part === "string",
- isTag = isPartStr && !/\W/.test( part ),
- isPartStrNotTag = isPartStr && !isTag;
-
- if ( isTag ) {
- part = part.toLowerCase();
- }
-
- for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
- if ( (elem = checkSet[i]) ) {
- while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
-
- checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
- elem || false :
- elem === part;
- }
- }
-
- if ( isPartStrNotTag ) {
- Sizzle.filter( part, checkSet, true );
- }
- },
-
- ">": function( checkSet, part ) {
- var elem,
- isPartStr = typeof part === "string",
- i = 0,
- l = checkSet.length;
-
- if ( isPartStr && !/\W/.test( part ) ) {
- part = part.toLowerCase();
-
- for ( ; i < l; i++ ) {
- elem = checkSet[i];
-
- if ( elem ) {
- var parent = elem.parentNode;
- checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
- }
- }
-
- } else {
- for ( ; i < l; i++ ) {
- elem = checkSet[i];
-
- if ( elem ) {
- checkSet[i] = isPartStr ?
- elem.parentNode :
- elem.parentNode === part;
- }
- }
-
- if ( isPartStr ) {
- Sizzle.filter( part, checkSet, true );
- }
- }
- },
-
- "": function(checkSet, part, isXML){
- var nodeCheck,
- doneName = done++,
- checkFn = dirCheck;
-
- if ( typeof part === "string" && !/\W/.test(part) ) {
- part = part.toLowerCase();
- nodeCheck = part;
- checkFn = dirNodeCheck;
- }
-
- checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML );
- },
-
- "~": function( checkSet, part, isXML ) {
- var nodeCheck,
- doneName = done++,
- checkFn = dirCheck;
-
- if ( typeof part === "string" && !/\W/.test( part ) ) {
- part = part.toLowerCase();
- nodeCheck = part;
- checkFn = dirNodeCheck;
- }
-
- checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML );
- }
- },
-
- find: {
- ID: function( match, context, isXML ) {
- if ( typeof context.getElementById !== "undefined" && !isXML ) {
- var m = context.getElementById(match[1]);
- // Check parentNode to catch when Blackberry 4.6 returns
- // nodes that are no longer in the document #6963
- return m && m.parentNode ? [m] : [];
- }
- },
-
- NAME: function( match, context ) {
- if ( typeof context.getElementsByName !== "undefined" ) {
- var ret = [],
- results = context.getElementsByName( match[1] );
-
- for ( var i = 0, l = results.length; i < l; i++ ) {
- if ( results[i].getAttribute("name") === match[1] ) {
- ret.push( results[i] );
- }
- }
-
- return ret.length === 0 ? null : ret;
- }
- },
-
- TAG: function( match, context ) {
- return context.getElementsByTagName( match[1] );
- }
- },
- preFilter: {
- CLASS: function( match, curLoop, inplace, result, not, isXML ) {
- match = " " + match[1].replace(/\\/g, "") + " ";
-
- if ( isXML ) {
- return match;
- }
-
- for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
- if ( elem ) {
- if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {
- if ( !inplace ) {
- result.push( elem );
- }
-
- } else if ( inplace ) {
- curLoop[i] = false;
- }
- }
- }
-
- return false;
- },
-
- ID: function( match ) {
- return match[1].replace(/\\/g, "");
- },
-
- TAG: function( match, curLoop ) {
- return match[1].toLowerCase();
- },
-
- CHILD: function( match ) {
- if ( match[1] === "nth" ) {
- // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
- var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
- match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
- !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
-
- // calculate the numbers (first)n+(last) including if they are negative
- match[2] = (test[1] + (test[2] || 1)) - 0;
- match[3] = test[3] - 0;
- }
-
- // TODO: Move to normal caching system
- match[0] = done++;
-
- return match;
- },
-
- ATTR: function( match, curLoop, inplace, result, not, isXML ) {
- var name = match[1].replace(/\\/g, "");
-
- if ( !isXML && Expr.attrMap[name] ) {
- match[1] = Expr.attrMap[name];
- }
-
- if ( match[2] === "~=" ) {
- match[4] = " " + match[4] + " ";
- }
-
- return match;
- },
-
- PSEUDO: function( match, curLoop, inplace, result, not ) {
- if ( match[1] === "not" ) {
- // If we're dealing with a complex expression, or a simple one
- if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
- match[3] = Sizzle(match[3], null, null, curLoop);
-
- } else {
- var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
-
- if ( !inplace ) {
- result.push.apply( result, ret );
- }
-
- return false;
- }
-
- } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
- return true;
- }
-
- return match;
- },
-
- POS: function( match ) {
- match.unshift( true );
-
- return match;
- }
- },
-
- filters: {
- enabled: function( elem ) {
- return elem.disabled === false && elem.type !== "hidden";
- },
-
- disabled: function( elem ) {
- return elem.disabled === true;
- },
-
- checked: function( elem ) {
- return elem.checked === true;
- },
-
- selected: function( elem ) {
- // Accessing this property makes selected-by-default
- // options in Safari work properly
- elem.parentNode.selectedIndex;
-
- return elem.selected === true;
- },
-
- parent: function( elem ) {
- return !!elem.firstChild;
- },
-
- empty: function( elem ) {
- return !elem.firstChild;
- },
-
- has: function( elem, i, match ) {
- return !!Sizzle( match[3], elem ).length;
- },
-
- header: function( elem ) {
- return (/h\d/i).test( elem.nodeName );
- },
-
- text: function( elem ) {
- return "text" === elem.type;
- },
- radio: function( elem ) {
- return "radio" === elem.type;
- },
-
- checkbox: function( elem ) {
- return "checkbox" === elem.type;
- },
-
- file: function( elem ) {
- return "file" === elem.type;
- },
- password: function( elem ) {
- return "password" === elem.type;
- },
-
- submit: function( elem ) {
- return "submit" === elem.type;
- },
-
- image: function( elem ) {
- return "image" === elem.type;
- },
-
- reset: function( elem ) {
- return "reset" === elem.type;
- },
-
- button: function( elem ) {
- return "button" === elem.type || elem.nodeName.toLowerCase() === "button";
- },
-
- input: function( elem ) {
- return (/input|select|textarea|button/i).test( elem.nodeName );
- }
- },
- setFilters: {
- first: function( elem, i ) {
- return i === 0;
- },
-
- last: function( elem, i, match, array ) {
- return i === array.length - 1;
- },
-
- even: function( elem, i ) {
- return i % 2 === 0;
- },
-
- odd: function( elem, i ) {
- return i % 2 === 1;
- },
-
- lt: function( elem, i, match ) {
- return i < match[3] - 0;
- },
-
- gt: function( elem, i, match ) {
- return i > match[3] - 0;
- },
-
- nth: function( elem, i, match ) {
- return match[3] - 0 === i;
- },
-
- eq: function( elem, i, match ) {
- return match[3] - 0 === i;
- }
- },
- filter: {
- PSEUDO: function( elem, match, i, array ) {
- var name = match[1],
- filter = Expr.filters[ name ];
-
- if ( filter ) {
- return filter( elem, i, match, array );
-
- } else if ( name === "contains" ) {
- return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0;
-
- } else if ( name === "not" ) {
- var not = match[3];
-
- for ( var j = 0, l = not.length; j < l; j++ ) {
- if ( not[j] === elem ) {
- return false;
- }
- }
-
- return true;
-
- } else {
- Sizzle.error( "Syntax error, unrecognized expression: " + name );
- }
- },
-
- CHILD: function( elem, match ) {
- var type = match[1],
- node = elem;
-
- switch ( type ) {
- case "only":
- case "first":
- while ( (node = node.previousSibling) ) {
- if ( node.nodeType === 1 ) {
- return false;
- }
- }
-
- if ( type === "first" ) {
- return true;
- }
-
- node = elem;
-
- case "last":
- while ( (node = node.nextSibling) ) {
- if ( node.nodeType === 1 ) {
- return false;
- }
- }
-
- return true;
-
- case "nth":
- var first = match[2],
- last = match[3];
-
- if ( first === 1 && last === 0 ) {
- return true;
- }
-
- var doneName = match[0],
- parent = elem.parentNode;
-
- if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
- var count = 0;
-
- for ( node = parent.firstChild; node; node = node.nextSibling ) {
- if ( node.nodeType === 1 ) {
- node.nodeIndex = ++count;
- }
- }
-
- parent.sizcache = doneName;
- }
-
- var diff = elem.nodeIndex - last;
-
- if ( first === 0 ) {
- return diff === 0;
-
- } else {
- return ( diff % first === 0 && diff / first >= 0 );
- }
- }
- },
-
- ID: function( elem, match ) {
- return elem.nodeType === 1 && elem.getAttribute("id") === match;
- },
-
- TAG: function( elem, match ) {
- return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
- },
-
- CLASS: function( elem, match ) {
- return (" " + (elem.className || elem.getAttribute("class")) + " ")
- .indexOf( match ) > -1;
- },
-
- ATTR: function( elem, match ) {
- var name = match[1],
- result = Expr.attrHandle[ name ] ?
- Expr.attrHandle[ name ]( elem ) :
- elem[ name ] != null ?
- elem[ name ] :
- elem.getAttribute( name ),
- value = result + "",
- type = match[2],
- check = match[4];
-
- return result == null ?
- type === "!=" :
- type === "=" ?
- value === check :
- type === "*=" ?
- value.indexOf(check) >= 0 :
- type === "~=" ?
- (" " + value + " ").indexOf(check) >= 0 :
- !check ?
- value && result !== false :
- type === "!=" ?
- value !== check :
- type === "^=" ?
- value.indexOf(check) === 0 :
- type === "$=" ?
- value.substr(value.length - check.length) === check :
- type === "|=" ?
- value === check || value.substr(0, check.length + 1) === check + "-" :
- false;
- },
-
- POS: function( elem, match, i, array ) {
- var name = match[2],
- filter = Expr.setFilters[ name ];
-
- if ( filter ) {
- return filter( elem, i, match, array );
- }
- }
- }
-};
-
-var origPOS = Expr.match.POS,
- fescape = function(all, num){
- return "\\" + (num - 0 + 1);
- };
-
-for ( var type in Expr.match ) {
- Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
- Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
-}
-
-var makeArray = function( array, results ) {
- array = Array.prototype.slice.call( array, 0 );
-
- if ( results ) {
- results.push.apply( results, array );
- return results;
- }
-
- return array;
-};
-
-// Perform a simple check to determine if the browser is capable of
-// converting a NodeList to an array using builtin methods.
-// Also verifies that the returned array holds DOM nodes
-// (which is not the case in the Blackberry browser)
-try {
- Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
-
-// Provide a fallback method if it does not work
-} catch( e ) {
- makeArray = function( array, results ) {
- var i = 0,
- ret = results || [];
-
- if ( toString.call(array) === "[object Array]" ) {
- Array.prototype.push.apply( ret, array );
-
- } else {
- if ( typeof array.length === "number" ) {
- for ( var l = array.length; i < l; i++ ) {
- ret.push( array[i] );
- }
-
- } else {
- for ( ; array[i]; i++ ) {
- ret.push( array[i] );
- }
- }
- }
-
- return ret;
- };
-}
-
-var sortOrder, siblingCheck;
-
-if ( document.documentElement.compareDocumentPosition ) {
- sortOrder = function( a, b ) {
- if ( a === b ) {
- hasDuplicate = true;
- return 0;
- }
-
- if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
- return a.compareDocumentPosition ? -1 : 1;
- }
-
- return a.compareDocumentPosition(b) & 4 ? -1 : 1;
- };
-
-} else {
- sortOrder = function( a, b ) {
- var al, bl,
- ap = [],
- bp = [],
- aup = a.parentNode,
- bup = b.parentNode,
- cur = aup;
-
- // The nodes are identical, we can exit early
- if ( a === b ) {
- hasDuplicate = true;
- return 0;
-
- // If the nodes are siblings (or identical) we can do a quick check
- } else if ( aup === bup ) {
- return siblingCheck( a, b );
-
- // If no parents were found then the nodes are disconnected
- } else if ( !aup ) {
- return -1;
-
- } else if ( !bup ) {
- return 1;
- }
-
- // Otherwise they're somewhere else in the tree so we need
- // to build up a full list of the parentNodes for comparison
- while ( cur ) {
- ap.unshift( cur );
- cur = cur.parentNode;
- }
-
- cur = bup;
-
- while ( cur ) {
- bp.unshift( cur );
- cur = cur.parentNode;
- }
-
- al = ap.length;
- bl = bp.length;
-
- // Start walking down the tree looking for a discrepancy
- for ( var i = 0; i < al && i < bl; i++ ) {
- if ( ap[i] !== bp[i] ) {
- return siblingCheck( ap[i], bp[i] );
- }
- }
-
- // We ended someplace up the tree so do a sibling check
- return i === al ?
- siblingCheck( a, bp[i], -1 ) :
- siblingCheck( ap[i], b, 1 );
- };
-
- siblingCheck = function( a, b, ret ) {
- if ( a === b ) {
- return ret;
- }
-
- var cur = a.nextSibling;
-
- while ( cur ) {
- if ( cur === b ) {
- return -1;
- }
-
- cur = cur.nextSibling;
- }
-
- return 1;
- };
-}
-
-// Utility function for retreiving the text value of an array of DOM nodes
-Sizzle.getText = function( elems ) {
- var ret = "", elem;
-
- for ( var i = 0; elems[i]; i++ ) {
- elem = elems[i];
-
- // Get the text from text nodes and CDATA nodes
- if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
- ret += elem.nodeValue;
-
- // Traverse everything else, except comment nodes
- } else if ( elem.nodeType !== 8 ) {
- ret += Sizzle.getText( elem.childNodes );
- }
- }
-
- return ret;
-};
-
-// Check to see if the browser returns elements by name when
-// querying by getElementById (and provide a workaround)
-(function(){
- // We're going to inject a fake input element with a specified name
- var form = document.createElement("div"),
- id = "script" + (new Date()).getTime(),
- root = document.documentElement;
-
- form.innerHTML = "<a name='" + id + "'/>";
-
- // Inject it into the root element, check its status, and remove it quickly
- root.insertBefore( form, root.firstChild );
-
- // The workaround has to do additional checks after a getElementById
- // Which slows things down for other browsers (hence the branching)
- if ( document.getElementById( id ) ) {
- Expr.find.ID = function( match, context, isXML ) {
- if ( typeof context.getElementById !== "undefined" && !isXML ) {
- var m = context.getElementById(match[1]);
-
- return m ?
- m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
- [m] :
- undefined :
- [];
- }
- };
-
- Expr.filter.ID = function( elem, match ) {
- var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
-
- return elem.nodeType === 1 && node && node.nodeValue === match;
- };
- }
-
- root.removeChild( form );
-
- // release memory in IE
- root = form = null;
-})();
-
-(function(){
- // Check to see if the browser returns only elements
- // when doing getElementsByTagName("*")
-
- // Create a fake element
- var div = document.createElement("div");
- div.appendChild( document.createComment("") );
-
- // Make sure no comments are found
- if ( div.getElementsByTagName("*").length > 0 ) {
- Expr.find.TAG = function( match, context ) {
- var results = context.getElementsByTagName( match[1] );
-
- // Filter out possible comments
- if ( match[1] === "*" ) {
- var tmp = [];
-
- for ( var i = 0; results[i]; i++ ) {
- if ( results[i].nodeType === 1 ) {
- tmp.push( results[i] );
- }
- }
-
- results = tmp;
- }
-
- return results;
- };
- }
-
- // Check to see if an attribute returns normalized href attributes
- div.innerHTML = "<a href='#'></a>";
-
- if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
- div.firstChild.getAttribute("href") !== "#" ) {
-
- Expr.attrHandle.href = function( elem ) {
- return elem.getAttribute( "href", 2 );
- };
- }
-
- // release memory in IE
- div = null;
-})();
-
-if ( document.querySelectorAll ) {
- (function(){
- var oldSizzle = Sizzle,
- div = document.createElement("div"),
- id = "__sizzle__";
-
- div.innerHTML = "<p class='TEST'></p>";
-
- // Safari can't handle uppercase or unicode characters when
- // in quirks mode.
- if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
- return;
- }
-
- Sizzle = function( query, context, extra, seed ) {
- context = context || document;
-
- // Make sure that attribute selectors are quoted
- query = query.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
-
- // Only use querySelectorAll on non-XML documents
- // (ID selectors don't work in non-HTML documents)
- if ( !seed && !Sizzle.isXML(context) ) {
- if ( context.nodeType === 9 ) {
- try {
- return makeArray( context.querySelectorAll(query), extra );
- } catch(qsaError) {}
-
- // qSA works strangely on Element-rooted queries
- // We can work around this by specifying an extra ID on the root
- // and working up from there (Thanks to Andrew Dupont for the technique)
- // IE 8 doesn't work on object elements
- } else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
- var old = context.getAttribute( "id" ),
- nid = old || id;
-
- if ( !old ) {
- context.setAttribute( "id", nid );
- }
-
- try {
- return makeArray( context.querySelectorAll( "#" + nid + " " + query ), extra );
-
- } catch(pseudoError) {
- } finally {
- if ( !old ) {
- context.removeAttribute( "id" );
- }
- }
- }
- }
-
- return oldSizzle(query, context, extra, seed);
- };
-
- for ( var prop in oldSizzle ) {
- Sizzle[ prop ] = oldSizzle[ prop ];
- }
-
- // release memory in IE
- div = null;
- })();
-}
-
-(function(){
- var html = document.documentElement,
- matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector,
- pseudoWorks = false;
-
- try {
- // This should fail with an exception
- // Gecko does not error, returns false instead
- matches.call( document.documentElement, "[test!='']:sizzle" );
-
- } catch( pseudoError ) {
- pseudoWorks = true;
- }
-
- if ( matches ) {
- Sizzle.matchesSelector = function( node, expr ) {
- // Make sure that attribute selectors are quoted
- expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
-
- if ( !Sizzle.isXML( node ) ) {
- try {
- if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
- return matches.call( node, expr );
- }
- } catch(e) {}
- }
-
- return Sizzle(expr, null, null, [node]).length > 0;
- };
- }
-})();
-
-(function(){
- var div = document.createElement("div");
-
- div.innerHTML = "<div class='test e'></div><div class='test'></div>";
-
- // Opera can't find a second classname (in 9.6)
- // Also, make sure that getElementsByClassName actually exists
- if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
- return;
- }
-
- // Safari caches class attributes, doesn't catch changes (in 3.2)
- div.lastChild.className = "e";
-
- if ( div.getElementsByClassName("e").length === 1 ) {
- return;
- }
-
- Expr.order.splice(1, 0, "CLASS");
- Expr.find.CLASS = function( match, context, isXML ) {
- if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
- return context.getElementsByClassName(match[1]);
- }
- };
-
- // release memory in IE
- div = null;
-})();
-
-function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
- for ( var i = 0, l = checkSet.length; i < l; i++ ) {
- var elem = checkSet[i];
-
- if ( elem ) {
- var match = false;
-
- elem = elem[dir];
-
- while ( elem ) {
- if ( elem.sizcache === doneName ) {
- match = checkSet[elem.sizset];
- break;
- }
-
- if ( elem.nodeType === 1 && !isXML ){
- elem.sizcache = doneName;
- elem.sizset = i;
- }
-
- if ( elem.nodeName.toLowerCase() === cur ) {
- match = elem;
- break;
- }
-
- elem = elem[dir];
- }
-
- checkSet[i] = match;
- }
- }
-}
-
-function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
- for ( var i = 0, l = checkSet.length; i < l; i++ ) {
- var elem = checkSet[i];
-
- if ( elem ) {
- var match = false;
-
- elem = elem[dir];
-
- while ( elem ) {
- if ( elem.sizcache === doneName ) {
- match = checkSet[elem.sizset];
- break;
- }
-
- if ( elem.nodeType === 1 ) {
- if ( !isXML ) {
- elem.sizcache = doneName;
- elem.sizset = i;
- }
-
- if ( typeof cur !== "string" ) {
- if ( elem === cur ) {
- match = true;
- break;
- }
-
- } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
- match = elem;
- break;
- }
- }
-
- elem = elem[dir];
- }
-
- checkSet[i] = match;
- }
- }
-}
-
-if ( document.documentElement.contains ) {
- Sizzle.contains = function( a, b ) {
- return a !== b && (a.contains ? a.contains(b) : true);
- };
-
-} else if ( document.documentElement.compareDocumentPosition ) {
- Sizzle.contains = function( a, b ) {
- return !!(a.compareDocumentPosition(b) & 16);
- };
-
-} else {
- Sizzle.contains = function() {
- return false;
- };
-}
-
-Sizzle.isXML = function( elem ) {
- // documentElement is verified for cases where it doesn't yet exist
- // (such as loading iframes in IE - #4833)
- var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
-
- return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-var posProcess = function( selector, context ) {
- var match,
- tmpSet = [],
- later = "",
- root = context.nodeType ? [context] : context;
-
- // Position selectors must be done after the filter
- // And so must :not(positional) so we move all PSEUDOs to the end
- while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
- later += match[0];
- selector = selector.replace( Expr.match.PSEUDO, "" );
- }
-
- selector = Expr.relative[selector] ? selector + "*" : selector;
-
- for ( var i = 0, l = root.length; i < l; i++ ) {
- Sizzle( selector, root[i], tmpSet );
- }
-
- return Sizzle.filter( later, tmpSet );
-};
-
-// EXPOSE
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.filters;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-})();
-
-
-var runtil = /Until$/,
- rparentsprev = /^(?:parents|prevUntil|prevAll)/,
- // Note: This RegExp should be improved, or likely pulled from Sizzle
- rmultiselector = /,/,
- isSimple = /^.[^:#\[\.,]*$/,
- slice = Array.prototype.slice,
- POS = jQuery.expr.match.POS;
-
-jQuery.fn.extend({
- find: function( selector ) {
- var ret = this.pushStack( "", "find", selector ),
- length = 0;
-
- for ( var i = 0, l = this.length; i < l; i++ ) {
- length = ret.length;
- jQuery.find( selector, this[i], ret );
-
- if ( i > 0 ) {
- // Make sure that the results are unique
- for ( var n = length; n < ret.length; n++ ) {
- for ( var r = 0; r < length; r++ ) {
- if ( ret[r] === ret[n] ) {
- ret.splice(n--, 1);
- break;
- }
- }
- }
- }
- }
-
- return ret;
- },
-
- has: function( target ) {
- var targets = jQuery( target );
- return this.filter(function() {
- for ( var i = 0, l = targets.length; i < l; i++ ) {
- if ( jQuery.contains( this, targets[i] ) ) {
- return true;
- }
- }
- });
- },
-
- not: function( selector ) {
- return this.pushStack( winnow(this, selector, false), "not", selector);
- },
-
- filter: function( selector ) {
- return this.pushStack( winnow(this, selector, true), "filter", selector );
- },
-
- is: function( selector ) {
- return !!selector && jQuery.filter( selector, this ).length > 0;
- },
-
- closest: function( selectors, context ) {
- var ret = [], i, l, cur = this[0];
-
- if ( jQuery.isArray( selectors ) ) {
- var match, selector,
- matches = {},
- level = 1;
-
- if ( cur && selectors.length ) {
- for ( i = 0, l = selectors.length; i < l; i++ ) {
- selector = selectors[i];
-
- if ( !matches[selector] ) {
- matches[selector] = jQuery.expr.match.POS.test( selector ) ?
- jQuery( selector, context || this.context ) :
- selector;
- }
- }
-
- while ( cur && cur.ownerDocument && cur !== context ) {
- for ( selector in matches ) {
- match = matches[selector];
-
- if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
- ret.push({ selector: selector, elem: cur, level: level });
- }
- }
-
- cur = cur.parentNode;
- level++;
- }
- }
-
- return ret;
- }
-
- var pos = POS.test( selectors ) ?
- jQuery( selectors, context || this.context ) : null;
-
- for ( i = 0, l = this.length; i < l; i++ ) {
- cur = this[i];
-
- while ( cur ) {
- if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
- ret.push( cur );
- break;
-
- } else {
- cur = cur.parentNode;
- if ( !cur || !cur.ownerDocument || cur === context ) {
- break;
- }
- }
- }
- }
-
- ret = ret.length > 1 ? jQuery.unique(ret) : ret;
-
- return this.pushStack( ret, "closest", selectors );
- },
-
- // Determine the position of an element within
- // the matched set of elements
- index: function( elem ) {
- if ( !elem || typeof elem === "string" ) {
- return jQuery.inArray( this[0],
- // If it receives a string, the selector is used
- // If it receives nothing, the siblings are used
- elem ? jQuery( elem ) : this.parent().children() );
- }
- // Locate the position of the desired element
- return jQuery.inArray(
- // If it receives a jQuery object, the first element is used
- elem.jquery ? elem[0] : elem, this );
- },
-
- add: function( selector, context ) {
- var set = typeof selector === "string" ?
- jQuery( selector, context || this.context ) :
- jQuery.makeArray( selector ),
- all = jQuery.merge( this.get(), set );
-
- return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
- all :
- jQuery.unique( all ) );
- },
-
- andSelf: function() {
- return this.add( this.prevObject );
- }
-});
-
-// A painfully simple check to see if an element is disconnected
-// from a document (should be improved, where feasible).
-function isDisconnected( node ) {
- return !node || !node.parentNode || node.parentNode.nodeType === 11;
-}
-
-jQuery.each({
- parent: function( elem ) {
- var parent = elem.parentNode;
- return parent && parent.nodeType !== 11 ? parent : null;
- },
- parents: function( elem ) {
- return jQuery.dir( elem, "parentNode" );
- },
- parentsUntil: function( elem, i, until ) {
- return jQuery.dir( elem, "parentNode", until );
- },
- next: function( elem ) {
- return jQuery.nth( elem, 2, "nextSibling" );
- },
- prev: function( elem ) {
- return jQuery.nth( elem, 2, "previousSibling" );
- },
- nextAll: function( elem ) {
- return jQuery.dir( elem, "nextSibling" );
- },
- prevAll: function( elem ) {
- return jQuery.dir( elem, "previousSibling" );
- },
- nextUntil: function( elem, i, until ) {
- return jQuery.dir( elem, "nextSibling", until );
- },
- prevUntil: function( elem, i, until ) {
- return jQuery.dir( elem, "previousSibling", until );
- },
- siblings: function( elem ) {
- return jQuery.sibling( elem.parentNode.firstChild, elem );
- },
- children: function( elem ) {
- return jQuery.sibling( elem.firstChild );
- },
- contents: function( elem ) {
- return jQuery.nodeName( elem, "iframe" ) ?
- elem.contentDocument || elem.contentWindow.document :
- jQuery.makeArray( elem.childNodes );
- }
-}, function( name, fn ) {
- jQuery.fn[ name ] = function( until, selector ) {
- var ret = jQuery.map( this, fn, until );
-
- if ( !runtil.test( name ) ) {
- selector = until;
- }
-
- if ( selector && typeof selector === "string" ) {
- ret = jQuery.filter( selector, ret );
- }
-
- ret = this.length > 1 ? jQuery.unique( ret ) : ret;
-
- if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
- ret = ret.reverse();
- }
-
- return this.pushStack( ret, name, slice.call(arguments).join(",") );
- };
-});
-
-jQuery.extend({
- filter: function( expr, elems, not ) {
- if ( not ) {
- expr = ":not(" + expr + ")";
- }
-
- return elems.length === 1 ?
- jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
- jQuery.find.matches(expr, elems);
- },
-
- dir: function( elem, dir, until ) {
- var matched = [],
- cur = elem[ dir ];
-
- while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
- if ( cur.nodeType === 1 ) {
- matched.push( cur );
- }
- cur = cur[dir];
- }
- return matched;
- },
-
- nth: function( cur, result, dir, elem ) {
- result = result || 1;
- var num = 0;
-
- for ( ; cur; cur = cur[dir] ) {
- if ( cur.nodeType === 1 && ++num === result ) {
- break;
- }
- }
-
- return cur;
- },
-
- sibling: function( n, elem ) {
- var r = [];
-
- for ( ; n; n = n.nextSibling ) {
- if ( n.nodeType === 1 && n !== elem ) {
- r.push( n );
- }
- }
-
- return r;
- }
-});
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, keep ) {
- if ( jQuery.isFunction( qualifier ) ) {
- return jQuery.grep(elements, function( elem, i ) {
- var retVal = !!qualifier.call( elem, i, elem );
- return retVal === keep;
- });
-
- } else if ( qualifier.nodeType ) {
- return jQuery.grep(elements, function( elem, i ) {
- return (elem === qualifier) === keep;
- });
-
- } else if ( typeof qualifier === "string" ) {
- var filtered = jQuery.grep(elements, function( elem ) {
- return elem.nodeType === 1;
- });
-
- if ( isSimple.test( qualifier ) ) {
- return jQuery.filter(qualifier, filtered, !keep);
- } else {
- qualifier = jQuery.filter( qualifier, filtered );
- }
- }
-
- return jQuery.grep(elements, function( elem, i ) {
- return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
- });
-}
-
-
-
-
-var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
- rleadingWhitespace = /^\s+/,
- rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
- rtagName = /<([\w:]+)/,
- rtbody = /<tbody/i,
- rhtml = /<|&#?\w+;/,
- rnocache = /<(?:script|object|embed|option|style)/i,
- // checked="checked" or checked (html5)
- rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
- raction = /\=([^="'>\s]+\/)>/g,
- wrapMap = {
- option: [ 1, "<select multiple='multiple'>", "</select>" ],
- legend: [ 1, "<fieldset>", "</fieldset>" ],
- thead: [ 1, "<table>", "</table>" ],
- tr: [ 2, "<table><tbody>", "</tbody></table>" ],
- td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
- col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
- area: [ 1, "<map>", "</map>" ],
- _default: [ 0, "", "" ]
- };
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-// IE can't serialize <link> and <script> tags normally
-if ( !jQuery.support.htmlSerialize ) {
- wrapMap._default = [ 1, "div<div>", "</div>" ];
-}
-
-jQuery.fn.extend({
- text: function( text ) {
- if ( jQuery.isFunction(text) ) {
- return this.each(function(i) {
- var self = jQuery( this );
-
- self.text( text.call(this, i, self.text()) );
- });
- }
-
- if ( typeof text !== "object" && text !== undefined ) {
- return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
- }
-
- return jQuery.text( this );
- },
-
- wrapAll: function( html ) {
- if ( jQuery.isFunction( html ) ) {
- return this.each(function(i) {
- jQuery(this).wrapAll( html.call(this, i) );
- });
- }
-
- if ( this[0] ) {
- // The elements to wrap the target around
- var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
- if ( this[0].parentNode ) {
- wrap.insertBefore( this[0] );
- }
-
- wrap.map(function() {
- var elem = this;
-
- while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
- elem = elem.firstChild;
- }
-
- return elem;
- }).append(this);
- }
-
- return this;
- },
-
- wrapInner: function( html ) {
- if ( jQuery.isFunction( html ) ) {
- return this.each(function(i) {
- jQuery(this).wrapInner( html.call(this, i) );
- });
- }
-
- return this.each(function() {
- var self = jQuery( this ),
- contents = self.contents();
-
- if ( contents.length ) {
- contents.wrapAll( html );
-
- } else {
- self.append( html );
- }
- });
- },
-
- wrap: function( html ) {
- return this.each(function() {
- jQuery( this ).wrapAll( html );
- });
- },
-
- unwrap: function() {
- return this.parent().each(function() {
- if ( !jQuery.nodeName( this, "body" ) ) {
- jQuery( this ).replaceWith( this.childNodes );
- }
- }).end();
- },
-
- append: function() {
- return this.domManip(arguments, true, function( elem ) {
- if ( this.nodeType === 1 ) {
- this.appendChild( elem );
- }
- });
- },
-
- prepend: function() {
- return this.domManip(arguments, true, function( elem ) {
- if ( this.nodeType === 1 ) {
- this.insertBefore( elem, this.firstChild );
- }
- });
- },
-
- before: function() {
- if ( this[0] && this[0].parentNode ) {
- return this.domManip(arguments, false, function( elem ) {
- this.parentNode.insertBefore( elem, this );
- });
- } else if ( arguments.length ) {
- var set = jQuery(arguments[0]);
- set.push.apply( set, this.toArray() );
- return this.pushStack( set, "before", arguments );
- }
- },
-
- after: function() {
- if ( this[0] && this[0].parentNode ) {
- return this.domManip(arguments, false, function( elem ) {
- this.parentNode.insertBefore( elem, this.nextSibling );
- });
- } else if ( arguments.length ) {
- var set = this.pushStack( this, "after", arguments );
- set.push.apply( set, jQuery(arguments[0]).toArray() );
- return set;
- }
- },
-
- // keepData is for internal use only--do not document
- remove: function( selector, keepData ) {
- for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
- if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
- if ( !keepData && elem.nodeType === 1 ) {
- jQuery.cleanData( elem.getElementsByTagName("*") );
- jQuery.cleanData( [ elem ] );
- }
-
- if ( elem.parentNode ) {
- elem.parentNode.removeChild( elem );
- }
- }
- }
-
- return this;
- },
-
- empty: function() {
- for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
- // Remove element nodes and prevent memory leaks
- if ( elem.nodeType === 1 ) {
- jQuery.cleanData( elem.getElementsByTagName("*") );
- }
-
- // Remove any remaining nodes
- while ( elem.firstChild ) {
- elem.removeChild( elem.firstChild );
- }
- }
-
- return this;
- },
-
- clone: function( events ) {
- // Do the clone
- var ret = this.map(function() {
- if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
- // IE copies events bound via attachEvent when
- // using cloneNode. Calling detachEvent on the
- // clone will also remove the events from the orignal
- // In order to get around this, we use innerHTML.
- // Unfortunately, this means some modifications to
- // attributes in IE that are actually only stored
- // as properties will not be copied (such as the
- // the name attribute on an input).
- var html = this.outerHTML,
- ownerDocument = this.ownerDocument;
-
- if ( !html ) {
- var div = ownerDocument.createElement("div");
- div.appendChild( this.cloneNode(true) );
- html = div.innerHTML;
- }
-
- return jQuery.clean([html.replace(rinlinejQuery, "")
- // Handle the case in IE 8 where action=/test/> self-closes a tag
- .replace(raction, '="$1">')
- .replace(rleadingWhitespace, "")], ownerDocument)[0];
- } else {
- return this.cloneNode(true);
- }
- });
-
- // Copy the events from the original to the clone
- if ( events === true ) {
- cloneCopyEvent( this, ret );
- cloneCopyEvent( this.find("*"), ret.find("*") );
- }
-
- // Return the cloned set
- return ret;
- },
-
- html: function( value ) {
- if ( value === undefined ) {
- return this[0] && this[0].nodeType === 1 ?
- this[0].innerHTML.replace(rinlinejQuery, "") :
- null;
-
- // See if we can take a shortcut and just use innerHTML
- } else if ( typeof value === "string" && !rnocache.test( value ) &&
- (jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
- !wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
-
- value = value.replace(rxhtmlTag, "<$1></$2>");
-
- try {
- for ( var i = 0, l = this.length; i < l; i++ ) {
- // Remove element nodes and prevent memory leaks
- if ( this[i].nodeType === 1 ) {
- jQuery.cleanData( this[i].getElementsByTagName("*") );
- this[i].innerHTML = value;
- }
- }
-
- // If using innerHTML throws an exception, use the fallback method
- } catch(e) {
- this.empty().append( value );
- }
-
- } else if ( jQuery.isFunction( value ) ) {
- this.each(function(i){
- var self = jQuery( this );
-
- self.html( value.call(this, i, self.html()) );
- });
-
- } else {
- this.empty().append( value );
- }
-
- return this;
- },
-
- replaceWith: function( value ) {
- if ( this[0] && this[0].parentNode ) {
- // Make sure that the elements are removed from the DOM before they are inserted
- // this can help fix replacing a parent with child elements
- if ( jQuery.isFunction( value ) ) {
- return this.each(function(i) {
- var self = jQuery(this), old = self.html();
- self.replaceWith( value.call( this, i, old ) );
- });
- }
-
- if ( typeof value !== "string" ) {
- value = jQuery( value ).detach();
- }
-
- return this.each(function() {
- var next = this.nextSibling,
- parent = this.parentNode;
-
- jQuery( this ).remove();
-
- if ( next ) {
- jQuery(next).before( value );
- } else {
- jQuery(parent).append( value );
- }
- });
- } else {
- return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
- }
- },
-
- detach: function( selector ) {
- return this.remove( selector, true );
- },
-
- domManip: function( args, table, callback ) {
- var results, first, fragment, parent,
- value = args[0],
- scripts = [];
-
- // We can't cloneNode fragments that contain checked, in WebKit
- if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
- return this.each(function() {
- jQuery(this).domManip( args, table, callback, true );
- });
- }
-
- if ( jQuery.isFunction(value) ) {
- return this.each(function(i) {
- var self = jQuery(this);
- args[0] = value.call(this, i, table ? self.html() : undefined);
- self.domManip( args, table, callback );
- });
- }
-
- if ( this[0] ) {
- parent = value && value.parentNode;
-
- // If we're in a fragment, just use that instead of building a new one
- if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
- results = { fragment: parent };
-
- } else {
- results = jQuery.buildFragment( args, this, scripts );
- }
-
- fragment = results.fragment;
-
- if ( fragment.childNodes.length === 1 ) {
- first = fragment = fragment.firstChild;
- } else {
- first = fragment.firstChild;
- }
-
- if ( first ) {
- table = table && jQuery.nodeName( first, "tr" );
-
- for ( var i = 0, l = this.length; i < l; i++ ) {
- callback.call(
- table ?
- root(this[i], first) :
- this[i],
- i > 0 || results.cacheable || this.length > 1 ?
- fragment.cloneNode(true) :
- fragment
- );
- }
- }
-
- if ( scripts.length ) {
- jQuery.each( scripts, evalScript );
- }
- }
-
- return this;
- }
-});
-
-function root( elem, cur ) {
- return jQuery.nodeName(elem, "table") ?
- (elem.getElementsByTagName("tbody")[0] ||
- elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
- elem;
-}
-
-function cloneCopyEvent(orig, ret) {
- var i = 0;
-
- ret.each(function() {
- if ( this.nodeName !== (orig[i] && orig[i].nodeName) ) {
- return;
- }
-
- var oldData = jQuery.data( orig[i++] ),
- curData = jQuery.data( this, oldData ),
- events = oldData && oldData.events;
-
- if ( events ) {
- delete curData.handle;
- curData.events = {};
-
- for ( var type in events ) {
- for ( var handler in events[ type ] ) {
- jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
- }
- }
- }
- });
-}
-
-jQuery.buildFragment = function( args, nodes, scripts ) {
- var fragment, cacheable, cacheresults,
- doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
-
- // Only cache "small" (1/2 KB) strings that are associated with the main document
- // Cloning options loses the selected state, so don't cache them
- // IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
- // Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
- if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
- !rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
-
- cacheable = true;
- cacheresults = jQuery.fragments[ args[0] ];
- if ( cacheresults ) {
- if ( cacheresults !== 1 ) {
- fragment = cacheresults;
- }
- }
- }
-
- if ( !fragment ) {
- fragment = doc.createDocumentFragment();
- jQuery.clean( args, doc, fragment, scripts );
- }
-
- if ( cacheable ) {
- jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
- }
-
- return { fragment: fragment, cacheable: cacheable };
-};
-
-jQuery.fragments = {};
-
-jQuery.each({
- appendTo: "append",
- prependTo: "prepend",
- insertBefore: "before",
- insertAfter: "after",
- replaceAll: "replaceWith"
-}, function( name, original ) {
- jQuery.fn[ name ] = function( selector ) {
- var ret = [],
- insert = jQuery( selector ),
- parent = this.length === 1 && this[0].parentNode;
-
- if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
- insert[ original ]( this[0] );
- return this;
-
- } else {
- for ( var i = 0, l = insert.length; i < l; i++ ) {
- var elems = (i > 0 ? this.clone(true) : this).get();
- jQuery( insert[i] )[ original ]( elems );
- ret = ret.concat( elems );
- }
-
- return this.pushStack( ret, name, insert.selector );
- }
- };
-});
-
-jQuery.extend({
- clean: function( elems, context, fragment, scripts ) {
- context = context || document;
-
- // !context.createElement fails in IE with an error but returns typeof 'object'
- if ( typeof context.createElement === "undefined" ) {
- context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
- }
-
- var ret = [];
-
- for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
- if ( typeof elem === "number" ) {
- elem += "";
- }
-
- if ( !elem ) {
- continue;
- }
-
- // Convert html string into DOM nodes
- if ( typeof elem === "string" && !rhtml.test( elem ) ) {
- elem = context.createTextNode( elem );
-
- } else if ( typeof elem === "string" ) {
- // Fix "XHTML"-style tags in all browsers
- elem = elem.replace(rxhtmlTag, "<$1></$2>");
-
- // Trim whitespace, otherwise indexOf won't work as expected
- var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
- wrap = wrapMap[ tag ] || wrapMap._default,
- depth = wrap[0],
- div = context.createElement("div");
-
- // Go to html and back, then peel off extra wrappers
- div.innerHTML = wrap[1] + elem + wrap[2];
-
- // Move to the right depth
- while ( depth-- ) {
- div = div.lastChild;
- }
-
- // Remove IE's autoinserted <tbody> from table fragments
- if ( !jQuery.support.tbody ) {
-
- // String was a <table>, *may* have spurious <tbody>
- var hasBody = rtbody.test(elem),
- tbody = tag === "table" && !hasBody ?
- div.firstChild && div.firstChild.childNodes :
-
- // String was a bare <thead> or <tfoot>
- wrap[1] === "<table>" && !hasBody ?
- div.childNodes :
- [];
-
- for ( var j = tbody.length - 1; j >= 0 ; --j ) {
- if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
- tbody[ j ].parentNode.removeChild( tbody[ j ] );
- }
- }
-
- }
-
- // IE completely kills leading whitespace when innerHTML is used
- if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
- div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
- }
-
- elem = div.childNodes;
- }
-
- if ( elem.nodeType ) {
- ret.push( elem );
- } else {
- ret = jQuery.merge( ret, elem );
- }
- }
-
- if ( fragment ) {
- for ( i = 0; ret[i]; i++ ) {
- if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
- scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
-
- } else {
- if ( ret[i].nodeType === 1 ) {
- ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
- }
- fragment.appendChild( ret[i] );
- }
- }
- }
-
- return ret;
- },
-
- cleanData: function( elems ) {
- var data, id, cache = jQuery.cache,
- special = jQuery.event.special,
- deleteExpando = jQuery.support.deleteExpando;
-
- for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
- if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
- continue;
- }
-
- id = elem[ jQuery.expando ];
-
- if ( id ) {
- data = cache[ id ];
-
- if ( data && data.events ) {
- for ( var type in data.events ) {
- if ( special[ type ] ) {
- jQuery.event.remove( elem, type );
-
- } else {
- jQuery.removeEvent( elem, type, data.handle );
- }
- }
- }
-
- if ( deleteExpando ) {
- delete elem[ jQuery.expando ];
-
- } else if ( elem.removeAttribute ) {
- elem.removeAttribute( jQuery.expando );
- }
-
- delete cache[ id ];
- }
- }
- }
-});
-
-function evalScript( i, elem ) {
- if ( elem.src ) {
- jQuery.ajax({
- url: elem.src,
- async: false,
- dataType: "script"
- });
- } else {
- jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
- }
-
- if ( elem.parentNode ) {
- elem.parentNode.removeChild( elem );
- }
-}
-
-
-
-
-var ralpha = /alpha\([^)]*\)/i,
- ropacity = /opacity=([^)]*)/,
- rdashAlpha = /-([a-z])/ig,
- rupper = /([A-Z])/g,
- rnumpx = /^-?\d+(?:px)?$/i,
- rnum = /^-?\d/,
-
- cssShow = { position: "absolute", visibility: "hidden", display: "block" },
- cssWidth = [ "Left", "Right" ],
- cssHeight = [ "Top", "Bottom" ],
- curCSS,
-
- getComputedStyle,
- currentStyle,
-
- fcamelCase = function( all, letter ) {
- return letter.toUpperCase();
- };
-
-jQuery.fn.css = function( name, value ) {
- // Setting 'undefined' is a no-op
- if ( arguments.length === 2 && value === undefined ) {
- return this;
- }
-
- return jQuery.access( this, name, value, true, function( elem, name, value ) {
- return value !== undefined ?
- jQuery.style( elem, name, value ) :
- jQuery.css( elem, name );
- });
-};
-
-jQuery.extend({
- // Add in style property hooks for overriding the default
- // behavior of getting and setting a style property
- cssHooks: {
- opacity: {
- get: function( elem, computed ) {
- if ( computed ) {
- // We should always get a number back from opacity
- var ret = curCSS( elem, "opacity", "opacity" );
- return ret === "" ? "1" : ret;
-
- } else {
- return elem.style.opacity;
- }
- }
- }
- },
-
- // Exclude the following css properties to add px
- cssNumber: {
- "zIndex": true,
- "fontWeight": true,
- "opacity": true,
- "zoom": true,
- "lineHeight": true
- },
-
- // Add in properties whose names you wish to fix before
- // setting or getting the value
- cssProps: {
- // normalize float css property
- "float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
- },
-
- // Get and set the style property on a DOM Node
- style: function( elem, name, value, extra ) {
- // Don't set styles on text and comment nodes
- if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
- return;
- }
-
- // Make sure that we're working with the right name
- var ret, origName = jQuery.camelCase( name ),
- style = elem.style, hooks = jQuery.cssHooks[ origName ];
-
- name = jQuery.cssProps[ origName ] || origName;
-
- // Check if we're setting a value
- if ( value !== undefined ) {
- // Make sure that NaN and null values aren't set. See: #7116
- if ( typeof value === "number" && isNaN( value ) || value == null ) {
- return;
- }
-
- // If a number was passed in, add 'px' to the (except for certain CSS properties)
- if ( typeof value === "number" && !jQuery.cssNumber[ origName ] ) {
- value += "px";
- }
-
- // If a hook was provided, use that value, otherwise just set the specified value
- if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
- // Wrapped to prevent IE from throwing errors when 'invalid' values are provided
- // Fixes bug #5509
- try {
- style[ name ] = value;
- } catch(e) {}
- }
-
- } else {
- // If a hook was provided get the non-computed value from there
- if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
- return ret;
- }
-
- // Otherwise just get the value from the style object
- return style[ name ];
- }
- },
-
- css: function( elem, name, extra ) {
- // Make sure that we're working with the right name
- var ret, origName = jQuery.camelCase( name ),
- hooks = jQuery.cssHooks[ origName ];
-
- name = jQuery.cssProps[ origName ] || origName;
-
- // If a hook was provided get the computed value from there
- if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) {
- return ret;
-
- // Otherwise, if a way to get the computed value exists, use that
- } else if ( curCSS ) {
- return curCSS( elem, name, origName );
- }
- },
-
- // A method for quickly swapping in/out CSS properties to get correct calculations
- swap: function( elem, options, callback ) {
- var old = {};
-
- // Remember the old values, and insert the new ones
- for ( var name in options ) {
- old[ name ] = elem.style[ name ];
- elem.style[ name ] = options[ name ];
- }
-
- callback.call( elem );
-
- // Revert the old values
- for ( name in options ) {
- elem.style[ name ] = old[ name ];
- }
- },
-
- camelCase: function( string ) {
- return string.replace( rdashAlpha, fcamelCase );
- }
-});
-
-// DEPRECATED, Use jQuery.css() instead
-jQuery.curCSS = jQuery.css;
-
-jQuery.each(["height", "width"], function( i, name ) {
- jQuery.cssHooks[ name ] = {
- get: function( elem, computed, extra ) {
- var val;
-
- if ( computed ) {
- if ( elem.offsetWidth !== 0 ) {
- val = getWH( elem, name, extra );
-
- } else {
- jQuery.swap( elem, cssShow, function() {
- val = getWH( elem, name, extra );
- });
- }
-
- if ( val <= 0 ) {
- val = curCSS( elem, name, name );
-
- if ( val === "0px" && currentStyle ) {
- val = currentStyle( elem, name, name );
- }
-
- if ( val != null ) {
- // Should return "auto" instead of 0, use 0 for
- // temporary backwards-compat
- return val === "" || val === "auto" ? "0px" : val;
- }
- }
-
- if ( val < 0 || val == null ) {
- val = elem.style[ name ];
-
- // Should return "auto" instead of 0, use 0 for
- // temporary backwards-compat
- return val === "" || val === "auto" ? "0px" : val;
- }
-
- return typeof val === "string" ? val : val + "px";
- }
- },
-
- set: function( elem, value ) {
- if ( rnumpx.test( value ) ) {
- // ignore negative width and height values #1599
- value = parseFloat(value);
-
- if ( value >= 0 ) {
- return value + "px";
- }
-
- } else {
- return value;
- }
- }
- };
-});
-
-if ( !jQuery.support.opacity ) {
- jQuery.cssHooks.opacity = {
- get: function( elem, computed ) {
- // IE uses filters for opacity
- return ropacity.test((computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "") ?
- (parseFloat(RegExp.$1) / 100) + "" :
- computed ? "1" : "";
- },
-
- set: function( elem, value ) {
- var style = elem.style;
-
- // IE has trouble with opacity if it does not have layout
- // Force it by setting the zoom level
- style.zoom = 1;
-
- // Set the alpha filter to set the opacity
- var opacity = jQuery.isNaN(value) ?
- "" :
- "alpha(opacity=" + value * 100 + ")",
- filter = style.filter || "";
-
- style.filter = ralpha.test(filter) ?
- filter.replace(ralpha, opacity) :
- style.filter + ' ' + opacity;
- }
- };
-}
-
-if ( document.defaultView && document.defaultView.getComputedStyle ) {
- getComputedStyle = function( elem, newName, name ) {
- var ret, defaultView, computedStyle;
-
- name = name.replace( rupper, "-$1" ).toLowerCase();
-
- if ( !(defaultView = elem.ownerDocument.defaultView) ) {
- return undefined;
- }
-
- if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
- ret = computedStyle.getPropertyValue( name );
- if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
- ret = jQuery.style( elem, name );
- }
- }
-
- return ret;
- };
-}
-
-if ( document.documentElement.currentStyle ) {
- currentStyle = function( elem, name ) {
- var left, rsLeft,
- ret = elem.currentStyle && elem.currentStyle[ name ],
- style = elem.style;
-
- // From the awesome hack by Dean Edwards
- // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
- // If we're not dealing with a regular pixel number
- // but a number that has a weird ending, we need to convert it to pixels
- if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
- // Remember the original values
- left = style.left;
- rsLeft = elem.runtimeStyle.left;
-
- // Put in the new values to get a computed value out
- elem.runtimeStyle.left = elem.currentStyle.left;
- style.left = name === "fontSize" ? "1em" : (ret || 0);
- ret = style.pixelLeft + "px";
-
- // Revert the changed values
- style.left = left;
- elem.runtimeStyle.left = rsLeft;
- }
-
- return ret === "" ? "auto" : ret;
- };
-}
-
-curCSS = getComputedStyle || currentStyle;
-
-function getWH( elem, name, extra ) {
- var which = name === "width" ? cssWidth : cssHeight,
- val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
-
- if ( extra === "border" ) {
- return val;
- }
-
- jQuery.each( which, function() {
- if ( !extra ) {
- val -= parseFloat(jQuery.css( elem, "padding" + this )) || 0;
- }
-
- if ( extra === "margin" ) {
- val += parseFloat(jQuery.css( elem, "margin" + this )) || 0;
-
- } else {
- val -= parseFloat(jQuery.css( elem, "border" + this + "Width" )) || 0;
- }
- });
-
- return val;
-}
-
-if ( jQuery.expr && jQuery.expr.filters ) {
- jQuery.expr.filters.hidden = function( elem ) {
- var width = elem.offsetWidth,
- height = elem.offsetHeight;
-
- return (width === 0 && height === 0) || (!jQuery.support.reliableHiddenOffsets && (elem.style.display || jQuery.css( elem, "display" )) === "none");
- };
-
- jQuery.expr.filters.visible = function( elem ) {
- return !jQuery.expr.filters.hidden( elem );
- };
-}
-
-
-
-
-var jsc = jQuery.now(),
- rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
- rselectTextarea = /^(?:select|textarea)/i,
- rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
- rnoContent = /^(?:GET|HEAD)$/,
- rbracket = /\[\]$/,
- jsre = /\=\?(&|$)/,
- rquery = /\?/,
- rts = /([?&])_=[^&]*/,
- rurl = /^(\w+:)?\/\/([^\/?#]+)/,
- r20 = /%20/g,
- rhash = /#.*$/,
-
- // Keep a copy of the old load method
- _load = jQuery.fn.load;
-
-jQuery.fn.extend({
- load: function( url, params, callback ) {
- if ( typeof url !== "string" && _load ) {
- return _load.apply( this, arguments );
-
- // Don't do a request if no elements are being requested
- } else if ( !this.length ) {
- return this;
- }
-
- var off = url.indexOf(" ");
- if ( off >= 0 ) {
- var selector = url.slice(off, url.length);
- url = url.slice(0, off);
- }
-
- // Default to a GET request
- var type = "GET";
-
- // If the second parameter was provided
- if ( params ) {
- // If it's a function
- if ( jQuery.isFunction( params ) ) {
- // We assume that it's the callback
- callback = params;
- params = null;
-
- // Otherwise, build a param string
- } else if ( typeof params === "object" ) {
- params = jQuery.param( params, jQuery.ajaxSettings.traditional );
- type = "POST";
- }
- }
-
- var self = this;
-
- // Request the remote document
- jQuery.ajax({
- url: url,
- type: type,
- dataType: "html",
- data: params,
- complete: function( res, status ) {
- // If successful, inject the HTML into all the matched elements
- if ( status === "success" || status === "notmodified" ) {
- // See if a selector was specified
- self.html( selector ?
- // Create a dummy div to hold the results
- jQuery("<div>")
- // inject the contents of the document in, removing the scripts
- // to avoid any 'Permission Denied' errors in IE
- .append(res.responseText.replace(rscript, ""))
-
- // Locate the specified elements
- .find(selector) :
-
- // If not, just inject the full result
- res.responseText );
- }
-
- if ( callback ) {
- self.each( callback, [res.responseText, status, res] );
- }
- }
- });
-
- return this;
- },
-
- serialize: function() {
- return jQuery.param(this.serializeArray());
- },
-
- serializeArray: function() {
- return this.map(function() {
- return this.elements ? jQuery.makeArray(this.elements) : this;
- })
- .filter(function() {
- return this.name && !this.disabled &&
- (this.checked || rselectTextarea.test(this.nodeName) ||
- rinput.test(this.type));
- })
- .map(function( i, elem ) {
- var val = jQuery(this).val();
-
- return val == null ?
- null :
- jQuery.isArray(val) ?
- jQuery.map( val, function( val, i ) {
- return { name: elem.name, value: val };
- }) :
- { name: elem.name, value: val };
- }).get();
- }
-});
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function( i, o ) {
- jQuery.fn[o] = function( f ) {
- return this.bind(o, f);
- };
-});
-
-jQuery.extend({
- get: function( url, data, callback, type ) {
- // shift arguments if data argument was omited
- if ( jQuery.isFunction( data ) ) {
- type = type || callback;
- callback = data;
- data = null;
- }
-
- return jQuery.ajax({
- type: "GET",
- url: url,
- data: data,
- success: callback,
- dataType: type
- });
- },
-
- getScript: function( url, callback ) {
- return jQuery.get(url, null, callback, "script");
- },
-
- getJSON: function( url, data, callback ) {
- return jQuery.get(url, data, callback, "json");
- },
-
- post: function( url, data, callback, type ) {
- // shift arguments if data argument was omited
- if ( jQuery.isFunction( data ) ) {
- type = type || callback;
- callback = data;
- data = {};
- }
-
- return jQuery.ajax({
- type: "POST",
- url: url,
- data: data,
- success: callback,
- dataType: type
- });
- },
-
- ajaxSetup: function( settings ) {
- jQuery.extend( jQuery.ajaxSettings, settings );
- },
-
- ajaxSettings: {
- url: location.href,
- global: true,
- type: "GET",
- contentType: "application/x-www-form-urlencoded",
- processData: true,
- async: true,
- /*
- timeout: 0,
- data: null,
- username: null,
- password: null,
- traditional: false,
- */
- // This function can be overriden by calling jQuery.ajaxSetup
- xhr: function() {
- return new window.XMLHttpRequest();
- },
- accepts: {
- xml: "application/xml, text/xml",
- html: "text/html",
- script: "text/javascript, application/javascript",
- json: "application/json, text/javascript",
- text: "text/plain",
- _default: "*/*"
- }
- },
-
- ajax: function( origSettings ) {
- var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings),
- jsonp, status, data, type = s.type.toUpperCase(), noContent = rnoContent.test(type);
-
- s.url = s.url.replace( rhash, "" );
-
- // Use original (not extended) context object if it was provided
- s.context = origSettings && origSettings.context != null ? origSettings.context : s;
-
- // convert data if not already a string
- if ( s.data && s.processData && typeof s.data !== "string" ) {
- s.data = jQuery.param( s.data, s.traditional );
- }
-
- // Handle JSONP Parameter Callbacks
- if ( s.dataType === "jsonp" ) {
- if ( type === "GET" ) {
- if ( !jsre.test( s.url ) ) {
- s.url += (rquery.test( s.url ) ? "&" : "?") + (s.jsonp || "callback") + "=?";
- }
- } else if ( !s.data || !jsre.test(s.data) ) {
- s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
- }
- s.dataType = "json";
- }
-
- // Build temporary JSONP function
- if ( s.dataType === "json" && (s.data && jsre.test(s.data) || jsre.test(s.url)) ) {
- jsonp = s.jsonpCallback || ("jsonp" + jsc++);
-
- // Replace the =? sequence both in the query string and the data
- if ( s.data ) {
- s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
- }
-
- s.url = s.url.replace(jsre, "=" + jsonp + "$1");
-
- // We need to make sure
- // that a JSONP style response is executed properly
- s.dataType = "script";
-
- // Handle JSONP-style loading
- var customJsonp = window[ jsonp ];
-
- window[ jsonp ] = function( tmp ) {
- if ( jQuery.isFunction( customJsonp ) ) {
- customJsonp( tmp );
-
- } else {
- // Garbage collect
- window[ jsonp ] = undefined;
-
- try {
- delete window[ jsonp ];
- } catch( jsonpError ) {}
- }
-
- data = tmp;
- jQuery.handleSuccess( s, xhr, status, data );
- jQuery.handleComplete( s, xhr, status, data );
-
- if ( head ) {
- head.removeChild( script );
- }
- };
- }
-
- if ( s.dataType === "script" && s.cache === null ) {
- s.cache = false;
- }
-
- if ( s.cache === false && noContent ) {
- var ts = jQuery.now();
-
- // try replacing _= if it is there
- var ret = s.url.replace(rts, "$1_=" + ts);
-
- // if nothing was replaced, add timestamp to the end
- s.url = ret + ((ret === s.url) ? (rquery.test(s.url) ? "&" : "?") + "_=" + ts : "");
- }
-
- // If data is available, append data to url for GET/HEAD requests
- if ( s.data && noContent ) {
- s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
- }
-
- // Watch for a new set of requests
- if ( s.global && jQuery.active++ === 0 ) {
- jQuery.event.trigger( "ajaxStart" );
- }
-
- // Matches an absolute URL, and saves the domain
- var parts = rurl.exec( s.url ),
- remote = parts && (parts[1] && parts[1].toLowerCase() !== location.protocol || parts[2].toLowerCase() !== location.host);
-
- // If we're requesting a remote document
- // and trying to load JSON or Script with a GET
- if ( s.dataType === "script" && type === "GET" && remote ) {
- var head = document.getElementsByTagName("head")[0] || document.documentElement;
- var script = document.createElement("script");
- if ( s.scriptCharset ) {
- script.charset = s.scriptCharset;
- }
- script.src = s.url;
-
- // Handle Script loading
- if ( !jsonp ) {
- var done = false;
-
- // Attach handlers for all browsers
- script.onload = script.onreadystatechange = function() {
- if ( !done && (!this.readyState ||
- this.readyState === "loaded" || this.readyState === "complete") ) {
- done = true;
- jQuery.handleSuccess( s, xhr, status, data );
- jQuery.handleComplete( s, xhr, status, data );
-
- // Handle memory leak in IE
- script.onload = script.onreadystatechange = null;
- if ( head && script.parentNode ) {
- head.removeChild( script );
- }
- }
- };
- }
-
- // Use insertBefore instead of appendChild to circumvent an IE6 bug.
- // This arises when a base node is used (#2709 and #4378).
- head.insertBefore( script, head.firstChild );
-
- // We handle everything using the script element injection
- return undefined;
- }
-
- var requestDone = false;
-
- // Create the request object
- var xhr = s.xhr();
-
- if ( !xhr ) {
- return;
- }
-
- // Open the socket
- // Passing null username, generates a login popup on Opera (#2865)
- if ( s.username ) {
- xhr.open(type, s.url, s.async, s.username, s.password);
- } else {
- xhr.open(type, s.url, s.async);
- }
-
- // Need an extra try/catch for cross domain requests in Firefox 3
- try {
- // Set content-type if data specified and content-body is valid for this type
- if ( (s.data != null && !noContent) || (origSettings && origSettings.contentType) ) {
- xhr.setRequestHeader("Content-Type", s.contentType);
- }
-
- // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
- if ( s.ifModified ) {
- if ( jQuery.lastModified[s.url] ) {
- xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
- }
-
- if ( jQuery.etag[s.url] ) {
- xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]);
- }
- }
-
- // Set header so the called script knows that it's an XMLHttpRequest
- // Only send the header if it's not a remote XHR
- if ( !remote ) {
- xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
- }
-
- // Set the Accepts header for the server, depending on the dataType
- xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
- s.accepts[ s.dataType ] + ", */*; q=0.01" :
- s.accepts._default );
- } catch( headerError ) {}
-
- // Allow custom headers/mimetypes and early abort
- if ( s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false ) {
- // Handle the global AJAX counter
- if ( s.global && jQuery.active-- === 1 ) {
- jQuery.event.trigger( "ajaxStop" );
- }
-
- // close opended socket
- xhr.abort();
- return false;
- }
-
- if ( s.global ) {
- jQuery.triggerGlobal( s, "ajaxSend", [xhr, s] );
- }
-
- // Wait for a response to come back
- var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) {
- // The request was aborted
- if ( !xhr || xhr.readyState === 0 || isTimeout === "abort" ) {
- // Opera doesn't call onreadystatechange before this point
- // so we simulate the call
- if ( !requestDone ) {
- jQuery.handleComplete( s, xhr, status, data );
- }
-
- requestDone = true;
- if ( xhr ) {
- xhr.onreadystatechange = jQuery.noop;
- }
-
- // The transfer is complete and the data is available, or the request timed out
- } else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) {
- requestDone = true;
- xhr.onreadystatechange = jQuery.noop;
-
- status = isTimeout === "timeout" ?
- "timeout" :
- !jQuery.httpSuccess( xhr ) ?
- "error" :
- s.ifModified && jQuery.httpNotModified( xhr, s.url ) ?
- "notmodified" :
- "success";
-
- var errMsg;
-
- if ( status === "success" ) {
- // Watch for, and catch, XML document parse errors
- try {
- // process the data (runs the xml through httpData regardless of callback)
- data = jQuery.httpData( xhr, s.dataType, s );
- } catch( parserError ) {
- status = "parsererror";
- errMsg = parserError;
- }
- }
-
- // Make sure that the request was successful or notmodified
- if ( status === "success" || status === "notmodified" ) {
- // JSONP handles its own success callback
- if ( !jsonp ) {
- jQuery.handleSuccess( s, xhr, status, data );
- }
- } else {
- jQuery.handleError( s, xhr, status, errMsg );
- }
-
- // Fire the complete handlers
- if ( !jsonp ) {
- jQuery.handleComplete( s, xhr, status, data );
- }
-
- if ( isTimeout === "timeout" ) {
- xhr.abort();
- }
-
- // Stop memory leaks
- if ( s.async ) {
- xhr = null;
- }
- }
- };
-
- // Override the abort handler, if we can (IE 6 doesn't allow it, but that's OK)
- // Opera doesn't fire onreadystatechange at all on abort
- try {
- var oldAbort = xhr.abort;
- xhr.abort = function() {
- if ( xhr ) {
- // oldAbort has no call property in IE7 so
- // just do it this way, which works in all
- // browsers
- Function.prototype.call.call( oldAbort, xhr );
- }
-
- onreadystatechange( "abort" );
- };
- } catch( abortError ) {}
-
- // Timeout checker
- if ( s.async && s.timeout > 0 ) {
- setTimeout(function() {
- // Check to see if the request is still happening
- if ( xhr && !requestDone ) {
- onreadystatechange( "timeout" );
- }
- }, s.timeout);
- }
-
- // Send the data
- try {
- xhr.send( noContent || s.data == null ? null : s.data );
-
- } catch( sendError ) {
- jQuery.handleError( s, xhr, null, sendError );
-
- // Fire the complete handlers
- jQuery.handleComplete( s, xhr, status, data );
- }
-
- // firefox 1.5 doesn't fire statechange for sync requests
- if ( !s.async ) {
- onreadystatechange();
- }
-
- // return XMLHttpRequest to allow aborting the request etc.
- return xhr;
- },
-
- // Serialize an array of form elements or a set of
- // key/values into a query string
- param: function( a, traditional ) {
- var s = [],
- add = function( key, value ) {
- // If value is a function, invoke it and return its value
- value = jQuery.isFunction(value) ? value() : value;
- s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
- };
-
- // Set traditional to true for jQuery <= 1.3.2 behavior.
- if ( traditional === undefined ) {
- traditional = jQuery.ajaxSettings.traditional;
- }
-
- // If an array was passed in, assume that it is an array of form elements.
- if ( jQuery.isArray(a) || a.jquery ) {
- // Serialize the form elements
- jQuery.each( a, function() {
- add( this.name, this.value );
- });
-
- } else {
- // If traditional, encode the "old" way (the way 1.3.2 or older
- // did it), otherwise encode params recursively.
- for ( var prefix in a ) {
- buildParams( prefix, a[prefix], traditional, add );
- }
- }
-
- // Return the resulting serialization
- return s.join("&").replace(r20, "+");
- }
-});
-
-function buildParams( prefix, obj, traditional, add ) {
- if ( jQuery.isArray(obj) && obj.length ) {
- // Serialize array item.
- jQuery.each( obj, function( i, v ) {
- if ( traditional || rbracket.test( prefix ) ) {
- // Treat each array item as a scalar.
- add( prefix, v );
-
- } else {
- // If array item is non-scalar (array or object), encode its
- // numeric index to resolve deserialization ambiguity issues.
- // Note that rack (as of 1.0.0) can't currently deserialize
- // nested arrays properly, and attempting to do so may cause
- // a server error. Possible fixes are to modify rack's
- // deserialization algorithm or to provide an option or flag
- // to force array serialization to be shallow.
- buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add );
- }
- });
-
- } else if ( !traditional && obj != null && typeof obj === "object" ) {
- if ( jQuery.isEmptyObject( obj ) ) {
- add( prefix, "" );
-
- // Serialize object item.
- } else {
- jQuery.each( obj, function( k, v ) {
- buildParams( prefix + "[" + k + "]", v, traditional, add );
- });
- }
-
- } else {
- // Serialize scalar item.
- add( prefix, obj );
- }
-}
-
-// This is still on the jQuery object... for now
-// Want to move this to jQuery.ajax some day
-jQuery.extend({
-
- // Counter for holding the number of active queries
- active: 0,
-
- // Last-Modified header cache for next request
- lastModified: {},
- etag: {},
-
- handleError: function( s, xhr, status, e ) {
- // If a local callback was specified, fire it
- if ( s.error ) {
- s.error.call( s.context, xhr, status, e );
- }
-
- // Fire the global callback
- if ( s.global ) {
- jQuery.triggerGlobal( s, "ajaxError", [xhr, s, e] );
- }
- },
-
- handleSuccess: function( s, xhr, status, data ) {
- // If a local callback was specified, fire it and pass it the data
- if ( s.success ) {
- s.success.call( s.context, data, status, xhr );
- }
-
- // Fire the global callback
- if ( s.global ) {
- jQuery.triggerGlobal( s, "ajaxSuccess", [xhr, s] );
- }
- },
-
- handleComplete: function( s, xhr, status ) {
- // Process result
- if ( s.complete ) {
- s.complete.call( s.context, xhr, status );
- }
-
- // The request was completed
- if ( s.global ) {
- jQuery.triggerGlobal( s, "ajaxComplete", [xhr, s] );
- }
-
- // Handle the global AJAX counter
- if ( s.global && jQuery.active-- === 1 ) {
- jQuery.event.trigger( "ajaxStop" );
- }
- },
-
- triggerGlobal: function( s, type, args ) {
- (s.context && s.context.url == null ? jQuery(s.context) : jQuery.event).trigger(type, args);
- },
-
- // Determines if an XMLHttpRequest was successful or not
- httpSuccess: function( xhr ) {
- try {
- // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
- return !xhr.status && location.protocol === "file:" ||
- xhr.status >= 200 && xhr.status < 300 ||
- xhr.status === 304 || xhr.status === 1223;
- } catch(e) {}
-
- return false;
- },
-
- // Determines if an XMLHttpRequest returns NotModified
- httpNotModified: function( xhr, url ) {
- var lastModified = xhr.getResponseHeader("Last-Modified"),
- etag = xhr.getResponseHeader("Etag");
-
- if ( lastModified ) {
- jQuery.lastModified[url] = lastModified;
- }
-
- if ( etag ) {
- jQuery.etag[url] = etag;
- }
-
- return xhr.status === 304;
- },
-
- httpData: function( xhr, type, s ) {
- var ct = xhr.getResponseHeader("content-type") || "",
- xml = type === "xml" || !type && ct.indexOf("xml") >= 0,
- data = xml ? xhr.responseXML : xhr.responseText;
-
- if ( xml && data.documentElement.nodeName === "parsererror" ) {
- jQuery.error( "parsererror" );
- }
-
- // Allow a pre-filtering function to sanitize the response
- // s is checked to keep backwards compatibility
- if ( s && s.dataFilter ) {
- data = s.dataFilter( data, type );
- }
-
- // The filter can actually parse the response
- if ( typeof data === "string" ) {
- // Get the JavaScript object, if JSON is used.
- if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
- data = jQuery.parseJSON( data );
-
- // If the type is "script", eval it in global context
- } else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
- jQuery.globalEval( data );
- }
- }
-
- return data;
- }
-
-});
-
-/*
- * Create the request object; Microsoft failed to properly
- * implement the XMLHttpRequest in IE7 (can't request local files),
- * so we use the ActiveXObject when it is available
- * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
- * we need a fallback.
- */
-if ( window.ActiveXObject ) {
- jQuery.ajaxSettings.xhr = function() {
- if ( window.location.protocol !== "file:" ) {
- try {
- return new window.XMLHttpRequest();
- } catch(xhrError) {}
- }
-
- try {
- return new window.ActiveXObject("Microsoft.XMLHTTP");
- } catch(activeError) {}
- };
-}
-
-// Does this browser support XHR requests?
-jQuery.support.ajax = !!jQuery.ajaxSettings.xhr();
-
-
-
-
-var elemdisplay = {},
- rfxtypes = /^(?:toggle|show|hide)$/,
- rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
- timerId,
- fxAttrs = [
- // height animations
- [ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
- // width animations
- [ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
- // opacity animations
- [ "opacity" ]
- ];
-
-jQuery.fn.extend({
- show: function( speed, easing, callback ) {
- var elem, display;
-
- if ( speed || speed === 0 ) {
- return this.animate( genFx("show", 3), speed, easing, callback);
-
- } else {
- for ( var i = 0, j = this.length; i < j; i++ ) {
- elem = this[i];
- display = elem.style.display;
-
- // Reset the inline display of this element to learn if it is
- // being hidden by cascaded rules or not
- if ( !jQuery.data(elem, "olddisplay") && display === "none" ) {
- display = elem.style.display = "";
- }
-
- // Set elements which have been overridden with display: none
- // in a stylesheet to whatever the default browser style is
- // for such an element
- if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
- jQuery.data(elem, "olddisplay", defaultDisplay(elem.nodeName));
- }
- }
-
- // Set the display of most of the elements in a second loop
- // to avoid the constant reflow
- for ( i = 0; i < j; i++ ) {
- elem = this[i];
- display = elem.style.display;
-
- if ( display === "" || display === "none" ) {
- elem.style.display = jQuery.data(elem, "olddisplay") || "";
- }
- }
-
- return this;
- }
- },
-
- hide: function( speed, easing, callback ) {
- if ( speed || speed === 0 ) {
- return this.animate( genFx("hide", 3), speed, easing, callback);
-
- } else {
- for ( var i = 0, j = this.length; i < j; i++ ) {
- var display = jQuery.css( this[i], "display" );
-
- if ( display !== "none" ) {
- jQuery.data( this[i], "olddisplay", display );
- }
- }
-
- // Set the display of the elements in a second loop
- // to avoid the constant reflow
- for ( i = 0; i < j; i++ ) {
- this[i].style.display = "none";
- }
-
- return this;
- }
- },
-
- // Save the old toggle function
- _toggle: jQuery.fn.toggle,
-
- toggle: function( fn, fn2, callback ) {
- var bool = typeof fn === "boolean";
-
- if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
- this._toggle.apply( this, arguments );
-
- } else if ( fn == null || bool ) {
- this.each(function() {
- var state = bool ? fn : jQuery(this).is(":hidden");
- jQuery(this)[ state ? "show" : "hide" ]();
- });
-
- } else {
- this.animate(genFx("toggle", 3), fn, fn2, callback);
- }
-
- return this;
- },
-
- fadeTo: function( speed, to, easing, callback ) {
- return this.filter(":hidden").css("opacity", 0).show().end()
- .animate({opacity: to}, speed, easing, callback);
- },
-
- animate: function( prop, speed, easing, callback ) {
- var optall = jQuery.speed(speed, easing, callback);
-
- if ( jQuery.isEmptyObject( prop ) ) {
- return this.each( optall.complete );
- }
-
- return this[ optall.queue === false ? "each" : "queue" ](function() {
- // XXX 'this' does not always have a nodeName when running the
- // test suite
-
- var opt = jQuery.extend({}, optall), p,
- isElement = this.nodeType === 1,
- hidden = isElement && jQuery(this).is(":hidden"),
- self = this;
-
- for ( p in prop ) {
- var name = jQuery.camelCase( p );
-
- if ( p !== name ) {
- prop[ name ] = prop[ p ];
- delete prop[ p ];
- p = name;
- }
-
- if ( prop[p] === "hide" && hidden || prop[p] === "show" && !hidden ) {
- return opt.complete.call(this);
- }
-
- if ( isElement && ( p === "height" || p === "width" ) ) {
- // Make sure that nothing sneaks out
- // Record all 3 overflow attributes because IE does not
- // change the overflow attribute when overflowX and
- // overflowY are set to the same value
- opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
-
- // Set display property to inline-block for height/width
- // animations on inline elements that are having width/height
- // animated
- if ( jQuery.css( this, "display" ) === "inline" &&
- jQuery.css( this, "float" ) === "none" ) {
- if ( !jQuery.support.inlineBlockNeedsLayout ) {
- this.style.display = "inline-block";
-
- } else {
- var display = defaultDisplay(this.nodeName);
-
- // inline-level elements accept inline-block;
- // block-level elements need to be inline with layout
- if ( display === "inline" ) {
- this.style.display = "inline-block";
-
- } else {
- this.style.display = "inline";
- this.style.zoom = 1;
- }
- }
- }
- }
-
- if ( jQuery.isArray( prop[p] ) ) {
- // Create (if needed) and add to specialEasing
- (opt.specialEasing = opt.specialEasing || {})[p] = prop[p][1];
- prop[p] = prop[p][0];
- }
- }
-
- if ( opt.overflow != null ) {
- this.style.overflow = "hidden";
- }
-
- opt.curAnim = jQuery.extend({}, prop);
-
- jQuery.each( prop, function( name, val ) {
- var e = new jQuery.fx( self, opt, name );
-
- if ( rfxtypes.test(val) ) {
- e[ val === "toggle" ? hidden ? "show" : "hide" : val ]( prop );
-
- } else {
- var parts = rfxnum.exec(val),
- start = e.cur() || 0;
-
- if ( parts ) {
- var end = parseFloat( parts[2] ),
- unit = parts[3] || "px";
-
- // We need to compute starting value
- if ( unit !== "px" ) {
- jQuery.style( self, name, (end || 1) + unit);
- start = ((end || 1) / e.cur()) * start;
- jQuery.style( self, name, start + unit);
- }
-
- // If a +=/-= token was provided, we're doing a relative animation
- if ( parts[1] ) {
- end = ((parts[1] === "-=" ? -1 : 1) * end) + start;
- }
-
- e.custom( start, end, unit );
-
- } else {
- e.custom( start, val, "" );
- }
- }
- });
-
- // For JS strict compliance
- return true;
- });
- },
-
- stop: function( clearQueue, gotoEnd ) {
- var timers = jQuery.timers;
-
- if ( clearQueue ) {
- this.queue([]);
- }
-
- this.each(function() {
- // go in reverse order so anything added to the queue during the loop is ignored
- for ( var i = timers.length - 1; i >= 0; i-- ) {
- if ( timers[i].elem === this ) {
- if (gotoEnd) {
- // force the next step to be the last
- timers[i](true);
- }
-
- timers.splice(i, 1);
- }
- }
- });
-
- // start the next in the queue if the last step wasn't forced
- if ( !gotoEnd ) {
- this.dequeue();
- }
-
- return this;
- }
-
-});
-
-function genFx( type, num ) {
- var obj = {};
-
- jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
- obj[ this ] = type;
- });
-
- return obj;
-}
-
-// Generate shortcuts for custom animations
-jQuery.each({
- slideDown: genFx("show", 1),
- slideUp: genFx("hide", 1),
- slideToggle: genFx("toggle", 1),
- fadeIn: { opacity: "show" },
- fadeOut: { opacity: "hide" },
- fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
- jQuery.fn[ name ] = function( speed, easing, callback ) {
- return this.animate( props, speed, easing, callback );
- };
-});
-
-jQuery.extend({
- speed: function( speed, easing, fn ) {
- var opt = speed && typeof speed === "object" ? jQuery.extend({}, speed) : {
- complete: fn || !fn && easing ||
- jQuery.isFunction( speed ) && speed,
- duration: speed,
- easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
- };
-
- opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
- opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[opt.duration] : jQuery.fx.speeds._default;
-
- // Queueing
- opt.old = opt.complete;
- opt.complete = function() {
- if ( opt.queue !== false ) {
- jQuery(this).dequeue();
- }
- if ( jQuery.isFunction( opt.old ) ) {
- opt.old.call( this );
- }
- };
-
- return opt;
- },
-
- easing: {
- linear: function( p, n, firstNum, diff ) {
- return firstNum + diff * p;
- },
- swing: function( p, n, firstNum, diff ) {
- return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
- }
- },
-
- timers: [],
-
- fx: function( elem, options, prop ) {
- this.options = options;
- this.elem = elem;
- this.prop = prop;
-
- if ( !options.orig ) {
- options.orig = {};
- }
- }
-
-});
-
-jQuery.fx.prototype = {
- // Simple function for setting a style value
- update: function() {
- if ( this.options.step ) {
- this.options.step.call( this.elem, this.now, this );
- }
-
- (jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
- },
-
- // Get the current size
- cur: function() {
- if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
- return this.elem[ this.prop ];
- }
-
- var r = parseFloat( jQuery.css( this.elem, this.prop ) );
- return r && r > -10000 ? r : 0;
- },
-
- // Start an animation from one number to another
- custom: function( from, to, unit ) {
- var self = this,
- fx = jQuery.fx;
-
- this.startTime = jQuery.now();
- this.start = from;
- this.end = to;
- this.unit = unit || this.unit || "px";
- this.now = this.start;
- this.pos = this.state = 0;
-
- function t( gotoEnd ) {
- return self.step(gotoEnd);
- }
-
- t.elem = this.elem;
-
- if ( t() && jQuery.timers.push(t) && !timerId ) {
- timerId = setInterval(fx.tick, fx.interval);
- }
- },
-
- // Simple 'show' function
- show: function() {
- // Remember where we started, so that we can go back to it later
- this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
- this.options.show = true;
-
- // Begin the animation
- // Make sure that we start at a small width/height to avoid any
- // flash of content
- this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur());
-
- // Start by showing the element
- jQuery( this.elem ).show();
- },
-
- // Simple 'hide' function
- hide: function() {
- // Remember where we started, so that we can go back to it later
- this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
- this.options.hide = true;
-
- // Begin the animation
- this.custom(this.cur(), 0);
- },
-
- // Each step of an animation
- step: function( gotoEnd ) {
- var t = jQuery.now(), done = true;
-
- if ( gotoEnd || t >= this.options.duration + this.startTime ) {
- this.now = this.end;
- this.pos = this.state = 1;
- this.update();
-
- this.options.curAnim[ this.prop ] = true;
-
- for ( var i in this.options.curAnim ) {
- if ( this.options.curAnim[i] !== true ) {
- done = false;
- }
- }
-
- if ( done ) {
- // Reset the overflow
- if ( this.options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
- var elem = this.elem,
- options = this.options;
-
- jQuery.each( [ "", "X", "Y" ], function (index, value) {
- elem.style[ "overflow" + value ] = options.overflow[index];
- } );
- }
-
- // Hide the element if the "hide" operation was done
- if ( this.options.hide ) {
- jQuery(this.elem).hide();
- }
-
- // Reset the properties, if the item has been hidden or shown
- if ( this.options.hide || this.options.show ) {
- for ( var p in this.options.curAnim ) {
- jQuery.style( this.elem, p, this.options.orig[p] );
- }
- }
-
- // Execute the complete function
- this.options.complete.call( this.elem );
- }
-
- return false;
-
- } else {
- var n = t - this.startTime;
- this.state = n / this.options.duration;
-
- // Perform the easing function, defaults to swing
- var specialEasing = this.options.specialEasing && this.options.specialEasing[this.prop];
- var defaultEasing = this.options.easing || (jQuery.easing.swing ? "swing" : "linear");
- this.pos = jQuery.easing[specialEasing || defaultEasing](this.state, n, 0, 1, this.options.duration);
- this.now = this.start + ((this.end - this.start) * this.pos);
-
- // Perform the next step of the animation
- this.update();
- }
-
- return true;
- }
-};
-
-jQuery.extend( jQuery.fx, {
- tick: function() {
- var timers = jQuery.timers;
-
- for ( var i = 0; i < timers.length; i++ ) {
- if ( !timers[i]() ) {
- timers.splice(i--, 1);
- }
- }
-
- if ( !timers.length ) {
- jQuery.fx.stop();
- }
- },
-
- interval: 13,
-
- stop: function() {
- clearInterval( timerId );
- timerId = null;
- },
-
- speeds: {
- slow: 600,
- fast: 200,
- // Default speed
- _default: 400
- },
-
- step: {
- opacity: function( fx ) {
- jQuery.style( fx.elem, "opacity", fx.now );
- },
-
- _default: function( fx ) {
- if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
- fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit;
- } else {
- fx.elem[ fx.prop ] = fx.now;
- }
- }
- }
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
- jQuery.expr.filters.animated = function( elem ) {
- return jQuery.grep(jQuery.timers, function( fn ) {
- return elem === fn.elem;
- }).length;
- };
-}
-
-function defaultDisplay( nodeName ) {
- if ( !elemdisplay[ nodeName ] ) {
- var elem = jQuery("<" + nodeName + ">").appendTo("body"),
- display = elem.css("display");
-
- elem.remove();
-
- if ( display === "none" || display === "" ) {
- display = "block";
- }
-
- elemdisplay[ nodeName ] = display;
- }
-
- return elemdisplay[ nodeName ];
-}
-
-
-
-
-var rtable = /^t(?:able|d|h)$/i,
- rroot = /^(?:body|html)$/i;
-
-if ( "getBoundingClientRect" in document.documentElement ) {
- jQuery.fn.offset = function( options ) {
- var elem = this[0], box;
-
- if ( options ) {
- return this.each(function( i ) {
- jQuery.offset.setOffset( this, options, i );
- });
- }
-
- if ( !elem || !elem.ownerDocument ) {
- return null;
- }
-
- if ( elem === elem.ownerDocument.body ) {
- return jQuery.offset.bodyOffset( elem );
- }
-
- try {
- box = elem.getBoundingClientRect();
- } catch(e) {}
-
- var doc = elem.ownerDocument,
- docElem = doc.documentElement;
-
- // Make sure we're not dealing with a disconnected DOM node
- if ( !box || !jQuery.contains( docElem, elem ) ) {
- return box || { top: 0, left: 0 };
- }
-
- var body = doc.body,
- win = getWindow(doc),
- clientTop = docElem.clientTop || body.clientTop || 0,
- clientLeft = docElem.clientLeft || body.clientLeft || 0,
- scrollTop = (win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop || body.scrollTop ),
- scrollLeft = (win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft),
- top = box.top + scrollTop - clientTop,
- left = box.left + scrollLeft - clientLeft;
-
- return { top: top, left: left };
- };
-
-} else {
- jQuery.fn.offset = function( options ) {
- var elem = this[0];
-
- if ( options ) {
- return this.each(function( i ) {
- jQuery.offset.setOffset( this, options, i );
- });
- }
-
- if ( !elem || !elem.ownerDocument ) {
- return null;
- }
-
- if ( elem === elem.ownerDocument.body ) {
- return jQuery.offset.bodyOffset( elem );
- }
-
- jQuery.offset.initialize();
-
- var computedStyle,
- offsetParent = elem.offsetParent,
- prevOffsetParent = elem,
- doc = elem.ownerDocument,
- docElem = doc.documentElement,
- body = doc.body,
- defaultView = doc.defaultView,
- prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
- top = elem.offsetTop,
- left = elem.offsetLeft;
-
- while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
- if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
- break;
- }
-
- computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
- top -= elem.scrollTop;
- left -= elem.scrollLeft;
-
- if ( elem === offsetParent ) {
- top += elem.offsetTop;
- left += elem.offsetLeft;
-
- if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
- top += parseFloat( computedStyle.borderTopWidth ) || 0;
- left += parseFloat( computedStyle.borderLeftWidth ) || 0;
- }
-
- prevOffsetParent = offsetParent;
- offsetParent = elem.offsetParent;
- }
-
- if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
- top += parseFloat( computedStyle.borderTopWidth ) || 0;
- left += parseFloat( computedStyle.borderLeftWidth ) || 0;
- }
-
- prevComputedStyle = computedStyle;
- }
-
- if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
- top += body.offsetTop;
- left += body.offsetLeft;
- }
-
- if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
- top += Math.max( docElem.scrollTop, body.scrollTop );
- left += Math.max( docElem.scrollLeft, body.scrollLeft );
- }
-
- return { top: top, left: left };
- };
-}
-
-jQuery.offset = {
- initialize: function() {
- var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop") ) || 0,
- html = "<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
-
- jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } );
-
- container.innerHTML = html;
- body.insertBefore( container, body.firstChild );
- innerDiv = container.firstChild;
- checkDiv = innerDiv.firstChild;
- td = innerDiv.nextSibling.firstChild.firstChild;
-
- this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
- this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
-
- checkDiv.style.position = "fixed";
- checkDiv.style.top = "20px";
-
- // safari subtracts parent border width here which is 5px
- this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
- checkDiv.style.position = checkDiv.style.top = "";
-
- innerDiv.style.overflow = "hidden";
- innerDiv.style.position = "relative";
-
- this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
-
- this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
-
- body.removeChild( container );
- body = container = innerDiv = checkDiv = table = td = null;
- jQuery.offset.initialize = jQuery.noop;
- },
-
- bodyOffset: function( body ) {
- var top = body.offsetTop,
- left = body.offsetLeft;
-
- jQuery.offset.initialize();
-
- if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
- top += parseFloat( jQuery.css(body, "marginTop") ) || 0;
- left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
- }
-
- return { top: top, left: left };
- },
-
- setOffset: function( elem, options, i ) {
- var position = jQuery.css( elem, "position" );
-
- // set position first, in-case top/left are set even on static elem
- if ( position === "static" ) {
- elem.style.position = "relative";
- }
-
- var curElem = jQuery( elem ),
- curOffset = curElem.offset(),
- curCSSTop = jQuery.css( elem, "top" ),
- curCSSLeft = jQuery.css( elem, "left" ),
- calculatePosition = (position === "absolute" && jQuery.inArray('auto', [curCSSTop, curCSSLeft]) > -1),
- props = {}, curPosition = {}, curTop, curLeft;
-
- // need to be able to calculate position if either top or left is auto and position is absolute
- if ( calculatePosition ) {
- curPosition = curElem.position();
- }
-
- curTop = calculatePosition ? curPosition.top : parseInt( curCSSTop, 10 ) || 0;
- curLeft = calculatePosition ? curPosition.left : parseInt( curCSSLeft, 10 ) || 0;
-
- if ( jQuery.isFunction( options ) ) {
- options = options.call( elem, i, curOffset );
- }
-
- if (options.top != null) {
- props.top = (options.top - curOffset.top) + curTop;
- }
- if (options.left != null) {
- props.left = (options.left - curOffset.left) + curLeft;
- }
-
- if ( "using" in options ) {
- options.using.call( elem, props );
- } else {
- curElem.css( props );
- }
- }
-};
-
-
-jQuery.fn.extend({
- position: function() {
- if ( !this[0] ) {
- return null;
- }
-
- var elem = this[0],
-
- // Get *real* offsetParent
- offsetParent = this.offsetParent(),
-
- // Get correct offsets
- offset = this.offset(),
- parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
-
- // Subtract element margins
- // note: when an element has margin: auto the offsetLeft and marginLeft
- // are the same in Safari causing offset.left to incorrectly be 0
- offset.top -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
- offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
-
- // Add offsetParent borders
- parentOffset.top += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
- parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
-
- // Subtract the two offsets
- return {
- top: offset.top - parentOffset.top,
- left: offset.left - parentOffset.left
- };
- },
-
- offsetParent: function() {
- return this.map(function() {
- var offsetParent = this.offsetParent || document.body;
- while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
- offsetParent = offsetParent.offsetParent;
- }
- return offsetParent;
- });
- }
-});
-
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( ["Left", "Top"], function( i, name ) {
- var method = "scroll" + name;
-
- jQuery.fn[ method ] = function(val) {
- var elem = this[0], win;
-
- if ( !elem ) {
- return null;
- }
-
- if ( val !== undefined ) {
- // Set the scroll offset
- return this.each(function() {
- win = getWindow( this );
-
- if ( win ) {
- win.scrollTo(
- !i ? val : jQuery(win).scrollLeft(),
- i ? val : jQuery(win).scrollTop()
- );
-
- } else {
- this[ method ] = val;
- }
- });
- } else {
- win = getWindow( elem );
-
- // Return the scroll offset
- return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
- jQuery.support.boxModel && win.document.documentElement[ method ] ||
- win.document.body[ method ] :
- elem[ method ];
- }
- };
-});
-
-function getWindow( elem ) {
- return jQuery.isWindow( elem ) ?
- elem :
- elem.nodeType === 9 ?
- elem.defaultView || elem.parentWindow :
- false;
-}
-
-
-
-
-// Create innerHeight, innerWidth, outerHeight and outerWidth methods
-jQuery.each([ "Height", "Width" ], function( i, name ) {
-
- var type = name.toLowerCase();
-
- // innerHeight and innerWidth
- jQuery.fn["inner" + name] = function() {
- return this[0] ?
- parseFloat( jQuery.css( this[0], type, "padding" ) ) :
- null;
- };
-
- // outerHeight and outerWidth
- jQuery.fn["outer" + name] = function( margin ) {
- return this[0] ?
- parseFloat( jQuery.css( this[0], type, margin ? "margin" : "border" ) ) :
- null;
- };
-
- jQuery.fn[ type ] = function( size ) {
- // Get window width or height
- var elem = this[0];
- if ( !elem ) {
- return size == null ? null : this;
- }
-
- if ( jQuery.isFunction( size ) ) {
- return this.each(function( i ) {
- var self = jQuery( this );
- self[ type ]( size.call( this, i, self[ type ]() ) );
- });
- }
-
- if ( jQuery.isWindow( elem ) ) {
- // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
- return elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] ||
- elem.document.body[ "client" + name ];
-
- // Get document width or height
- } else if ( elem.nodeType === 9 ) {
- // Either scroll[Width/Height] or offset[Width/Height], whichever is greater
- return Math.max(
- elem.documentElement["client" + name],
- elem.body["scroll" + name], elem.documentElement["scroll" + name],
- elem.body["offset" + name], elem.documentElement["offset" + name]
- );
-
- // Get or set width or height on the element
- } else if ( size === undefined ) {
- var orig = jQuery.css( elem, type ),
- ret = parseFloat( orig );
-
- return jQuery.isNaN( ret ) ? orig : ret;
-
- // Set the width or height on the element (default to pixels if value is unitless)
- } else {
- return this.css( type, typeof size === "string" ? size : size + "px" );
- }
- };
-
-});
-
-
-})(window);
diff --git a/third_party/seasocks/src/ws_test_web/lib/jquery.min.js b/third_party/seasocks/src/ws_test_web/lib/jquery.min.js
new file mode 100644
index 0000000..f78f96a
--- /dev/null
+++ b/third_party/seasocks/src/ws_test_web/lib/jquery.min.js
@@ -0,0 +1,16 @@
+/*!
+ * jQuery JavaScript Library v1.5.2
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu Mar 31 15:28:23 2011 -0400
+ */
+(function(a,b){function ci(a){return d.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cf(a){if(!b_[a]){var b=d("<"+a+">").appendTo("body"),c=b.css("display");b.remove();if(c==="none"||c==="")c="block";b_[a]=c}return b_[a]}function ce(a,b){var c={};d.each(cd.concat.apply([],cd.slice(0,b)),function(){c[this]=a});return c}function b$(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function bZ(){try{return new a.XMLHttpRequest}catch(b){}}function bY(){d(a).unload(function(){for(var a in bW)bW[a](0,1)})}function bS(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var e=a.dataTypes,f={},g,h,i=e.length,j,k=e[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h==="string"&&(f[h.toLowerCase()]=a.converters[h]);l=k,k=e[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=f[m]||f["* "+k];if(!n){p=b;for(o in f){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=f[j[1]+" "+k];if(p){o=f[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&d.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bR(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bQ(a,b,c,e){if(d.isArray(b)&&b.length)d.each(b,function(b,f){c||bs.test(a)?e(a,f):bQ(a+"["+(typeof f==="object"||d.isArray(f)?b:"")+"]",f,c,e)});else if(c||b==null||typeof b!=="object")e(a,b);else if(d.isArray(b)||d.isEmptyObject(b))e(a,"");else for(var f in b)bQ(a+"["+f+"]",b[f],c,e)}function bP(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bJ,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l==="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bP(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bP(a,c,d,e,"*",g));return l}function bO(a){return function(b,c){typeof b!=="string"&&(c=b,b="*");if(d.isFunction(c)){var e=b.toLowerCase().split(bD),f=0,g=e.length,h,i,j;for(;f<g;f++)h=e[f],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bq(a,b,c){var e=b==="width"?bk:bl,f=b==="width"?a.offsetWidth:a.offsetHeight;if(c==="border")return f;d.each(e,function(){c||(f-=parseFloat(d.css(a,"padding"+this))||0),c==="margin"?f+=parseFloat(d.css(a,"margin"+this))||0:f-=parseFloat(d.css(a,"border"+this+"Width"))||0});return f}function bc(a,b){b.src?d.ajax({url:b.src,async:!1,dataType:"script"}):d.globalEval(b.text||b.textContent||b.innerHTML||""),b.parentNode&&b.parentNode.removeChild(b)}function bb(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function ba(a,b){if(b.nodeType===1){var c=b.nodeName.toLowerCase();b.clearAttributes(),b.mergeAttributes(a);if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(d.expando)}}function _(a,b){if(b.nodeType===1&&d.hasData(a)){var c=d.expando,e=d.data(a),f=d.data(b,e);if(e=e[c]){var g=e.events;f=f[c]=d.extend({},e);if(g){delete f.handle,f.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)d.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function $(a,b){return d.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Q(a,b,c){if(d.isFunction(b))return d.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return d.grep(a,function(a,d){return a===b===c});if(typeof b==="string"){var e=d.grep(a,function(a){return a.nodeType===1});if(L.test(b))return d.filter(b,e,!c);b=d.filter(b,e)}return d.grep(a,function(a,e){return d.inArray(a,b)>=0===c})}function P(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function H(a,b){return(a&&a!=="*"?a+".":"")+b.replace(t,"`").replace(u,"&")}function G(a){var b,c,e,f,g,h,i,j,k,l,m,n,o,p=[],q=[],s=d._data(this,"events");if(a.liveFired!==this&&s&&s.live&&!a.target.disabled&&(!a.button||a.type!=="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var t=s.live.slice(0);for(i=0;i<t.length;i++)g=t[i],g.origType.replace(r,"")===a.type?q.push(g.selector):t.splice(i--,1);f=d(a.target).closest(q,a.currentTarget);for(j=0,k=f.length;j<k;j++){m=f[j];for(i=0;i<t.length;i++){g=t[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,e=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,e=d(a.relatedTarget).closest(g.selector)[0];(!e||e!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){f=p[j];if(c&&f.level>c)break;a.currentTarget=f.elem,a.data=f.handleObj.data,a.handleObj=f.handleObj,o=f.handleObj.origHandler.apply(f.elem,arguments);if(o===!1||a.isPropagationStopped()){c=f.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function E(a,c,e){var f=d.extend({},e[0]);f.type=a,f.originalEvent={},f.liveFired=b,d.event.handle.call(c,f),f.isDefaultPrevented()&&e[0].preventDefault()}function y(){return!0}function x(){return!1}function i(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function h(a,c,e){if(e===b&&a.nodeType===1){e=a.getAttribute("data-"+c);if(typeof e==="string"){try{e=e==="true"?!0:e==="false"?!1:e==="null"?null:d.isNaN(e)?g.test(e)?d.parseJSON(e):e:parseFloat(e)}catch(f){}d.data(a,c,e)}else e=b}return e}var c=a.document,d=function(){function G(){if(!d.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(G,1);return}d.ready()}}var d=function(a,b){return new d.fn.init(a,b,g)},e=a.jQuery,f=a.$,g,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,i=/\S/,j=/^\s+/,k=/\s+$/,l=/\d/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=navigator.userAgent,w,x,y,z=Object.prototype.toString,A=Object.prototype.hasOwnProperty,B=Array.prototype.push,C=Array.prototype.slice,D=String.prototype.trim,E=Array.prototype.indexOf,F={};d.fn=d.prototype={constructor:d,init:function(a,e,f){var g,i,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!e&&c.body){this.context=c,this[0]=c.body,this.selector="body",this.length=1;return this}if(typeof a==="string"){g=h.exec(a);if(!g||!g[1]&&e)return!e||e.jquery?(e||f).find(a):this.constructor(e).find(a);if(g[1]){e=e instanceof d?e[0]:e,k=e?e.ownerDocument||e:c,j=m.exec(a),j?d.isPlainObject(e)?(a=[c.createElement(j[1])],d.fn.attr.call(a,e,!0)):a=[k.createElement(j[1])]:(j=d.buildFragment([g[1]],[k]),a=(j.cacheable?d.clone(j.fragment):j.fragment).childNodes);return d.merge(this,a)}i=c.getElementById(g[2]);if(i&&i.parentNode){if(i.id!==g[2])return f.find(a);this.length=1,this[0]=i}this.context=c,this.selector=a;return this}if(d.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return d.makeArray(a,this)},selector:"",jquery:"1.5.2",length:0,size:function(){return this.length},toArray:function(){return C.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var e=this.constructor();d.isArray(a)?B.apply(e,a):d.merge(e,a),e.prevObject=this,e.context=this.context,b==="find"?e.selector=this.selector+(this.selector?" ":"")+c:b&&(e.selector=this.selector+"."+b+"("+c+")");return e},each:function(a,b){return d.each(this,a,b)},ready:function(a){d.bindReady(),x.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(C.apply(this,arguments),"slice",C.call(arguments).join(","))},map:function(a){return this.pushStack(d.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:B,sort:[].sort,splice:[].splice},d.fn.init.prototype=d.fn,d.extend=d.fn.extend=function(){var a,c,e,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i==="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!=="object"&&!d.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){e=i[c],f=a[c];if(i===f)continue;l&&f&&(d.isPlainObject(f)||(g=d.isArray(f)))?(g?(g=!1,h=e&&d.isArray(e)?e:[]):h=e&&d.isPlainObject(e)?e:{},i[c]=d.extend(l,h,f)):f!==b&&(i[c]=f)}return i},d.extend({noConflict:function(b){a.$=f,b&&(a.jQuery=e);return d},isReady:!1,readyWait:1,ready:function(a){a===!0&&d.readyWait--;if(!d.readyWait||a!==!0&&!d.isReady){if(!c.body)return setTimeout(d.ready,1);d.isReady=!0;if(a!==!0&&--d.readyWait>0)return;x.resolveWith(c,[d]),d.fn.trigger&&d(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!x){x=d._Deferred();if(c.readyState==="complete")return setTimeout(d.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",y,!1),a.addEventListener("load",d.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",y),a.attachEvent("onload",d.ready);var b=!1;try{b=a.frameElement==null}catch(e){}c.documentElement.doScroll&&b&&G()}}},isFunction:function(a){return d.type(a)==="function"},isArray:Array.isArray||function(a){return d.type(a)==="array"},isWindow:function(a){return a&&typeof a==="object"&&"setInterval"in a},isNaN:function(a){return a==null||!l.test(a)||isNaN(a)},type:function(a){return a==null?String(a):F[z.call(a)]||"object"},isPlainObject:function(a){if(!a||d.type(a)!=="object"||a.nodeType||d.isWindow(a))return!1;if(a.constructor&&!A.call(a,"constructor")&&!A.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a){}return c===b||A.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!=="string"||!b)return null;b=d.trim(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return a.JSON&&a.JSON.parse?a.JSON.parse(b):(new Function("return "+b))();d.error("Invalid JSON: "+b)},parseXML:function(b,c,e){a.DOMParser?(e=new DOMParser,c=e.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),e=c.documentElement,(!e||!e.nodeName||e.nodeName==="parsererror")&&d.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(a){if(a&&i.test(a)){var b=c.head||c.getElementsByTagName("head")[0]||c.documentElement,e=c.createElement("script");d.support.scriptEval()?e.appendChild(c.createTextNode(a)):e.text=a,b.insertBefore(e,b.firstChild),b.removeChild(e)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,e){var f,g=0,h=a.length,i=h===b||d.isFunction(a);if(e){if(i){for(f in a)if(c.apply(a[f],e)===!1)break}else for(;g<h;)if(c.apply(a[g++],e)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(var j=a[0];g<h&&c.call(j,g,j)!==!1;j=a[++g]){}return a},trim:D?function(a){return a==null?"":D.call(a)}:function(a){return a==null?"":(a+"").replace(j,"").replace(k,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var e=d.type(a);a.length==null||e==="string"||e==="function"||e==="regexp"||d.isWindow(a)?B.call(c,a):d.merge(c,a)}return c},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length==="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,b,c){var d=[],e;for(var f=0,g=a.length;f<g;f++)e=b(a[f],f,c),e!=null&&(d[d.length]=e);return d.concat.apply([],d)},guid:1,proxy:function(a,c,e){arguments.length===2&&(typeof c==="string"?(e=a,a=e[c],c=b):c&&!d.isFunction(c)&&(e=c,c=b)),!c&&a&&(c=function(){return a.apply(e||this,arguments)}),a&&(c.guid=a.guid=a.guid||c.guid||d.guid++);return c},access:function(a,c,e,f,g,h){var i=a.length;if(typeof c==="object"){for(var j in c)d.access(a,j,c[j],f,g,e);return a}if(e!==b){f=!h&&f&&d.isFunction(e);for(var k=0;k<i;k++)g(a[k],c,f?e.call(a[k],k,g(a[k],c)):e,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}d.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.subclass=this.subclass,a.fn.init=function b(b,c){c&&c instanceof d&&!(c instanceof a)&&(c=a(c));return d.fn.init.call(this,b,c,e)},a.fn.init.prototype=a.fn;var e=a(c);return a},browser:{}}),d.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){F["[object "+b+"]"]=b.toLowerCase()}),w=d.uaMatch(v),w.browser&&(d.browser[w.browser]=!0,d.browser.version=w.version),d.browser.webkit&&(d.browser.safari=!0),E&&(d.inArray=function(a,b){return E.call(b,a)}),i.test(" ")&&(j=/^[\s\xA0]+/,k=/[\s\xA0]+$/),g=d(c),c.addEventListener?y=function(){c.removeEventListener("DOMContentLoaded",y,!1),d.ready()}:c.attachEvent&&(y=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",y),d.ready())});return d}(),e="then done fail isResolved isRejected promise".split(" "),f=[].slice;d.extend({_Deferred:function(){var a=[],b,c,e,f={done:function(){if(!e){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=d.type(i),j==="array"?f.done.apply(f,i):j==="function"&&a.push(i);k&&f.resolveWith(k[0],k[1])}return this},resolveWith:function(d,f){if(!e&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(d,f)}finally{b=[d,f],c=0}}return this},resolve:function(){f.resolveWith(this,arguments);return this},isResolved:function(){return c||b},cancel:function(){e=1,a=[];return this}};return f},Deferred:function(a){var b=d._Deferred(),c=d._Deferred(),f;d.extend(b,{then:function(a,c){b.done(a).fail(c);return this},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,promise:function(a){if(a==null){if(f)return f;f=a={}}var c=e.length;while(c--)a[e[c]]=b[e[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?f.call(arguments,0):c,--g||h.resolveWith(h,f.call(b,0))}}var b=arguments,c=0,e=b.length,g=e,h=e<=1&&a&&d.isFunction(a.promise)?a:d.Deferred();if(e>1){for(;c<e;c++)b[c]&&d.isFunction(b[c].promise)?b[c].promise().then(i(c),h.reject):--g;g||h.resolveWith(h,b)}else h!==a&&h.resolveWith(h,e?[a]:[]);return h.promise()}}),function(){d.support={};var b=c.createElement("div");b.style.display="none",b.innerHTML=" <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var e=b.getElementsByTagName("*"),f=b.getElementsByTagName("a")[0],g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=b.getElementsByTagName("input")[0];if(e&&e.length&&f){d.support={leadingWhitespace:b.firstChild.nodeType===3,tbody:!b.getElementsByTagName("tbody").length,htmlSerialize:!!b.getElementsByTagName("link").length,style:/red/.test(f.getAttribute("style")),hrefNormalized:f.getAttribute("href")==="/a",opacity:/^0.55$/.test(f.style.opacity),cssFloat:!!f.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,deleteExpando:!0,optDisabled:!1,checkClone:!1,noCloneEvent:!0,noCloneChecked:!0,boxModel:null,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableHiddenOffsets:!0,reliableMarginRight:!0},i.checked=!0,d.support.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,d.support.optDisabled=!h.disabled;var j=null;d.support.scriptEval=function(){if(j===null){var b=c.documentElement,e=c.createElement("script"),f="script"+d.now();try{e.appendChild(c.createTextNode("window."+f+"=1;"))}catch(g){}b.insertBefore(e,b.firstChild),a[f]?(j=!0,delete a[f]):j=!1,b.removeChild(e)}return j};try{delete b.test}catch(k){d.support.deleteExpando=!1}!b.addEventListener&&b.attachEvent&&b.fireEvent&&(b.attachEvent("onclick",function l(){d.support.noCloneEvent=!1,b.detachEvent("onclick",l)}),b.cloneNode(!0).fireEvent("onclick")),b=c.createElement("div"),b.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";var m=c.createDocumentFragment();m.appendChild(b.firstChild),d.support.checkClone=m.cloneNode(!0).cloneNode(!0).lastChild.checked,d(function(){var a=c.createElement("div"),b=c.getElementsByTagName("body")[0];if(b){a.style.width=a.style.paddingLeft="1px",b.appendChild(a),d.boxModel=d.support.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,d.support.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",d.support.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";var e=a.getElementsByTagName("td");d.support.reliableHiddenOffsets=e[0].offsetHeight===0,e[0].style.display="",e[1].style.display="none",d.support.reliableHiddenOffsets=d.support.reliableHiddenOffsets&&e[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(a.style.width="1px",a.style.marginRight="0",d.support.reliableMarginRight=(parseInt(c.defaultView.getComputedStyle(a,null).marginRight,10)||0)===0),b.removeChild(a).style.display="none",a=e=null}});var n=function(a){var b=c.createElement("div");a="on"+a;if(!b.attachEvent)return!0;var d=a in b;d||(b.setAttribute(a,"return;"),d=typeof b[a]==="function");return d};d.support.submitBubbles=n("submit"),d.support.changeBubbles=n("change"),b=e=f=null}}();var g=/^(?:\{.*\}|\[.*\])$/;d.extend({cache:{},uuid:0,expando:"jQuery"+(d.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?d.cache[a[d.expando]]:a[d.expando];return!!a&&!i(a)},data:function(a,c,e,f){if(d.acceptData(a)){var g=d.expando,h=typeof c==="string",i,j=a.nodeType,k=j?d.cache:a,l=j?a[d.expando]:a[d.expando]&&d.expando;if((!l||f&&l&&!k[l][g])&&h&&e===b)return;l||(j?a[d.expando]=l=++d.uuid:l=d.expando),k[l]||(k[l]={},j||(k[l].toJSON=d.noop));if(typeof c==="object"||typeof c==="function")f?k[l][g]=d.extend(k[l][g],c):k[l]=d.extend(k[l],c);i=k[l],f&&(i[g]||(i[g]={}),i=i[g]),e!==b&&(i[c]=e);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[c]:i}},removeData:function(b,c,e){if(d.acceptData(b)){var f=d.expando,g=b.nodeType,h=g?d.cache:b,j=g?b[d.expando]:d.expando;if(!h[j])return;if(c){var k=e?h[j][f]:h[j];if(k){delete k[c];if(!i(k))return}}if(e){delete h[j][f];if(!i(h[j]))return}var l=h[j][f];d.support.deleteExpando||h!=a?delete h[j]:h[j]=null,l?(h[j]={},g||(h[j].toJSON=d.noop),h[j][f]=l):g&&(d.support.deleteExpando?delete b[d.expando]:b.removeAttribute?b.removeAttribute(d.expando):b[d.expando]=null)}},_data:function(a,b,c){return d.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=d.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),d.fn.extend({data:function(a,c){var e=null;if(typeof a==="undefined"){if(this.length){e=d.data(this[0]);if(this[0].nodeType===1){var f=this[0].attributes,g;for(var i=0,j=f.length;i<j;i++)g=f[i].name,g.indexOf("data-")===0&&(g=g.substr(5),h(this[0],g,e[g]))}}return e}if(typeof a==="object")return this.each(function(){d.data(this,a)});var k=a.split(".");k[1]=k[1]?"."+k[1]:"";if(c===b){e=this.triggerHandler("getData"+k[1]+"!",[k[0]]),e===b&&this.length&&(e=d.data(this[0],a),e=h(this[0],a,e));return e===b&&k[1]?this.data(k[0]):e}return this.each(function(){var b=d(this),e=[k[0],c];b.triggerHandler("setData"+k[1]+"!",e),d.data(this,a,c),b.triggerHandler("changeData"+k[1]+"!",e)})},removeData:function(a){return this.each(function(){d.removeData(this,a)})}}),d.extend({queue:function(a,b,c){if(a){b=(b||"fx")+"queue";var e=d._data(a,b);if(!c)return e||[];!e||d.isArray(c)?e=d._data(a,b,d.makeArray(c)):e.push(c);return e}},dequeue:function(a,b){b=b||"fx";var c=d.queue(a,b),e=c.shift();e==="inprogress"&&(e=c.shift()),e&&(b==="fx"&&c.unshift("inprogress"),e.call(a,function(){d.dequeue(a,b)})),c.length||d.removeData(a,b+"queue",!0)}}),d.fn.extend({queue:function(a,c){typeof a!=="string"&&(c=a,a="fx");if(c===b)return d.queue(this[0],a);return this.each(function(b){var e=d.queue(this,a,c);a==="fx"&&e[0]!=="inprogress"&&d.dequeue(this,a)})},dequeue:function(a){return this.each(function(){d.dequeue(this,a)})},delay:function(a,b){a=d.fx?d.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){d.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var j=/[\n\t\r]/g,k=/\s+/,l=/\r/g,m=/^(?:href|src|style)$/,n=/^(?:button|input)$/i,o=/^(?:button|input|object|select|textarea)$/i,p=/^a(?:rea)?$/i,q=/^(?:radio|checkbox)$/i;d.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"},d.fn.extend({attr:function(a,b){return d.access(this,a,b,!0,d.attr)},removeAttr:function(a,b){return this.each(function(){d.attr(this,a,""),this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.addClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"){var b=(a||"").split(k);for(var c=0,e=this.length;c<e;c++){var f=this[c];if(f.nodeType===1)if(f.className){var g=" "+f.className+" ",h=f.className;for(var i=0,j=b.length;i<j;i++)g.indexOf(" "+b[i]+" ")<0&&(h+=" "+b[i]);f.className=d.trim(h)}else f.className=a}}return this},removeClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.removeClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"||a===b){var c=(a||"").split(k);for(var e=0,f=this.length;e<f;e++){var g=this[e];if(g.nodeType===1&&g.className)if(a){var h=(" "+g.className+" ").replace(j," ");for(var i=0,l=c.length;i<l;i++)h=h.replace(" "+c[i]+" "," ");g.className=d.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,e=typeof b==="boolean";if(d.isFunction(a))return this.each(function(c){var e=d(this);e.toggleClass(a.call(this,c,e.attr("class"),b),b)});return this.each(function(){if(c==="string"){var f,g=0,h=d(this),i=b,j=a.split(k);while(f=j[g++])i=e?i:!h.hasClass(f),h[i?"addClass":"removeClass"](f)}else if(c==="undefined"||c==="boolean")this.className&&d._data(this,"__className__",this.className),this.className=this.className||a===!1?"":d._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(j," ").indexOf(b)>-1)return!0;return!1},val:function(a){if(!arguments.length){var c=this[0];if(c){if(d.nodeName(c,"option")){var e=c.attributes.value;return!e||e.specified?c.value:c.text}if(d.nodeName(c,"select")){var f=c.selectedIndex,g=[],h=c.options,i=c.type==="select-one";if(f<0)return null;for(var j=i?f:0,k=i?f+1:h.length;j<k;j++){var m=h[j];if(m.selected&&(d.support.optDisabled?!m.disabled:m.getAttribute("disabled")===null)&&(!m.parentNode.disabled||!d.nodeName(m.parentNode,"optgroup"))){a=d(m).val();if(i)return a;g.push(a)}}if(i&&!g.length&&h.length)return d(h[f]).val();return g}if(q.test(c.type)&&!d.support.checkOn)return c.getAttribute("value")===null?"on":c.value;return(c.value||"").replace(l,"")}return b}var n=d.isFunction(a);return this.each(function(b){var c=d(this),e=a;if(this.nodeType===1){n&&(e=a.call(this,b,c.val())),e==null?e="":typeof e==="number"?e+="":d.isArray(e)&&(e=d.map(e,function(a){return a==null?"":a+""}));if(d.isArray(e)&&q.test(this.type))this.checked=d.inArray(c.val(),e)>=0;else if(d.nodeName(this,"select")){var f=d.makeArray(e);d("option",this).each(function(){this.selected=d.inArray(d(this).val(),f)>=0}),f.length||(this.selectedIndex=-1)}else this.value=e}})}}),d.extend({attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,e,f){if(!a||a.nodeType===3||a.nodeType===8||a.nodeType===2)return b;if(f&&c in d.attrFn)return d(a)[c](e);var g=a.nodeType!==1||!d.isXMLDoc(a),h=e!==b;c=g&&d.props[c]||c;if(a.nodeType===1){var i=m.test(c);if(c==="selected"&&!d.support.optSelected){var j=a.parentNode;j&&(j.selectedIndex,j.parentNode&&j.parentNode.selectedIndex)}if((c in a||a[c]!==b)&&g&&!i){h&&(c==="type"&&n.test(a.nodeName)&&a.parentNode&&d.error("type property can't be changed"),e===null?a.nodeType===1&&a.removeAttribute(c):a[c]=e);if(d.nodeName(a,"form")&&a.getAttributeNode(c))return a.getAttributeNode(c).nodeValue;if(c==="tabIndex"){var k=a.getAttributeNode("tabIndex");return k&&k.specified?k.value:o.test(a.nodeName)||p.test(a.nodeName)&&a.href?0:b}return a[c]}if(!d.support.style&&g&&c==="style"){h&&(a.style.cssText=""+e);return a.style.cssText}h&&a.setAttribute(c,""+e);if(!a.attributes[c]&&(a.hasAttribute&&!a.hasAttribute(c)))return b;var l=!d.support.hrefNormalized&&g&&i?a.getAttribute(c,2):a.getAttribute(c);return l===null?b:l}h&&(a[c]=e);return a[c]}});var r=/\.(.*)$/,s=/^(?:textarea|input|select)$/i,t=/\./g,u=/ /g,v=/[^\w\s.|`]/g,w=function(a){return a.replace(v,"\\$&")};d.event={add:function(c,e,f,g){if(c.nodeType!==3&&c.nodeType!==8){try{d.isWindow(c)&&(c!==a&&!c.frameElement)&&(c=a)}catch(h){}if(f===!1)f=x;else if(!f)return;var i,j;f.handler&&(i=f,f=i.handler),f.guid||(f.guid=d.guid++);var k=d._data(c);if(!k)return;var l=k.events,m=k.handle;l||(k.events=l={}),m||(k.handle=m=function(a){return typeof d!=="undefined"&&d.event.triggered!==a.type?d.event.handle.apply(m.elem,arguments):b}),m.elem=c,e=e.split(" ");var n,o=0,p;while(n=e[o++]){j=i?d.extend({},i):{handler:f,data:g},n.indexOf(".")>-1?(p=n.split("."),n=p.shift(),j.namespace=p.slice(0).sort().join(".")):(p=[],j.namespace=""),j.type=n,j.guid||(j.guid=f.guid);var q=l[n],r=d.event.special[n]||{};if(!q){q=l[n]=[];if(!r.setup||r.setup.call(c,g,p,m)===!1)c.addEventListener?c.addEventListener(n,m,!1):c.attachEvent&&c.attachEvent("on"+n,m)}r.add&&(r.add.call(c,j),j.handler.guid||(j.handler.guid=f.guid)),q.push(j),d.event.global[n]=!0}c=null}},global:{},remove:function(a,c,e,f){if(a.nodeType!==3&&a.nodeType!==8){e===!1&&(e=x);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=d.hasData(a)&&d._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(e=c.handler,c=c.type);if(!c||typeof c==="string"&&c.charAt(0)==="."){c=c||"";for(h in t)d.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+d.map(m.slice(0).sort(),w).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!e){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))d.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=d.event.special[h]||{};for(j=f||0;j<p.length;j++){q=p[j];if(e.guid===q.guid){if(l||n.test(q.namespace))f==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(f!=null)break}}if(p.length===0||f!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&d.removeEvent(a,h,s.handle),g=null,delete t[h]}if(d.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,d.isEmptyObject(s)&&d.removeData(a,b,!0)}}},trigger:function(a,c,e){var f=a.type||a,g=arguments[3];if(!g){a=typeof a==="object"?a[d.expando]?a:d.extend(d.Event(f),a):d.Event(f),f.indexOf("!")>=0&&(a.type=f=f.slice(0,-1),a.exclusive=!0),e||(a.stopPropagation(),d.event.global[f]&&d.each(d.cache,function(){var b=d.expando,e=this[b];e&&e.events&&e.events[f]&&d.event.trigger(a,c,e.handle.elem)}));if(!e||e.nodeType===3||e.nodeType===8)return b;a.result=b,a.target=e,c=d.makeArray(c),c.unshift(a)}a.currentTarget=e;var h=d._data(e,"handle");h&&h.apply(e,c);var i=e.parentNode||e.ownerDocument;try{e&&e.nodeName&&d.noData[e.nodeName.toLowerCase()]||e["on"+f]&&e["on"+f].apply(e,c)===!1&&(a.result=!1,a.preventDefault())}catch(j){}if(!a.isPropagationStopped()&&i)d.event.trigger(a,c,i,!0);else if(!a.isDefaultPrevented()){var k,l=a.target,m=f.replace(r,""),n=d.nodeName(l,"a")&&m==="click",o=d.event.special[m]||{};if((!o._default||o._default.call(e,a)===!1)&&!n&&!(l&&l.nodeName&&d.noData[l.nodeName.toLowerCase()])){try{l[m]&&(k=l["on"+m],k&&(l["on"+m]=null),d.event.triggered=a.type,l[m]())}catch(p){}k&&(l["on"+m]=k),d.event.triggered=b}}},handle:function(c){var e,f,g,h,i,j=[],k=d.makeArray(arguments);c=k[0]=d.event.fix(c||a.event),c.currentTarget=this,e=c.type.indexOf(".")<0&&!c.exclusive,e||(g=c.type.split("."),c.type=g.shift(),j=g.slice(0).sort(),h=new RegExp("(^|\\.)"+j.join("\\.(?:.*\\.)?")+"(\\.|$)")),c.namespace=c.namespace||j.join("."),i=d._data(this,"events"),f=(i||{})[c.type];if(i&&f){f=f.slice(0);for(var l=0,m=f.length;l<m;l++){var n=f[l];if(e||h.test(n.namespace)){c.handler=n.handler,c.data=n.data,c.handleObj=n;var o=n.handler.apply(this,k);o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[d.expando])return a;var e=a;a=d.Event(e);for(var f=this.props.length,g;f;)g=this.props[--f],a[g]=e[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=c.documentElement,i=c.body;a.pageX=a.clientX+(h&&h.scrollLeft||i&&i.scrollLeft||0)-(h&&h.clientLeft||i&&i.clientLeft||0),a.pageY=a.clientY+(h&&h.scrollTop||i&&i.scrollTop||0)-(h&&h.clientTop||i&&i.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:d.proxy,special:{ready:{setup:d.bindReady,teardown:d.noop},live:{add:function(a){d.event.add(this,H(a.origType,a.selector),d.extend({},a,{handler:G,guid:a.handler.guid}))},remove:function(a){d.event.remove(this,H(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){d.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},d.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},d.Event=function(a){if(!this.preventDefault)return new d.Event(a);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?y:x):this.type=a,this.timeStamp=d.now(),this[d.expando]=!0},d.Event.prototype={preventDefault:function(){this.isDefaultPrevented=y;var a=this.originalEvent;a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=y;var a=this.originalEvent;a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=y,this.stopPropagation()},isDefaultPrevented:x,isPropagationStopped:x,isImmediatePropagationStopped:x};var z=function(a){var b=a.relatedTarget;try{if(b&&b!==c&&!b.parentNode)return;while(b&&b!==this)b=b.parentNode;b!==this&&(a.type=a.data,d.event.handle.apply(this,arguments))}catch(e){}},A=function(a){a.type=a.data,d.event.handle.apply(this,arguments)};d.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){d.event.special[a]={setup:function(c){d.event.add(this,b,c&&c.selector?A:z,a)},teardown:function(a){d.event.remove(this,b,a&&a.selector?A:z)}}}),d.support.submitBubbles||(d.event.special.submit={setup:function(a,b){if(this.nodeName&&this.nodeName.toLowerCase()!=="form")d.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&d(b).closest("form").length&&E("submit",this,arguments)}),d.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&d(b).closest("form").length&&a.keyCode===13&&E("submit",this,arguments)});else return!1},teardown:function(a){d.event.remove(this,".specialSubmit")}});if(!d.support.changeBubbles){var B,C=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?d.map(a.options,function(a){return a.selected}).join("-"):"":a.nodeName.toLowerCase()==="select"&&(c=a.selectedIndex);return c},D=function D(a){var c=a.target,e,f;if(s.test(c.nodeName)&&!c.readOnly){e=d._data(c,"_change_data"),f=C(c),(a.type!=="focusout"||c.type!=="radio")&&d._data(c,"_change_data",f);if(e===b||f===e)return;if(e!=null||f)a.type="change",a.liveFired=b,d.event.trigger(a,arguments[1],c)}};d.event.special.change={filters:{focusout:D,beforedeactivate:D,click:function(a){var b=a.target,c=b.type;(c==="radio"||c==="checkbox"||b.nodeName.toLowerCase()==="select")&&D.call(this,a)},keydown:function(a){var b=a.target,c=b.type;(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&D.call(this,a)},beforeactivate:function(a){var b=a.target;d._data(b,"_change_data",C(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in B)d.event.add(this,c+".specialChange",B[c]);return s.test(this.nodeName)},teardown:function(a){d.event.remove(this,".specialChange");return s.test(this.nodeName)}},B=d.event.special.change.filters,B.focus=B.beforeactivate}c.addEventListener&&d.each({focus:"focusin",blur:"focusout"},function(a,b){function f(a){var c=d.event.fix(a);c.type=b,c.originalEvent={},d.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var e=0;d.event.special[b]={setup:function(){e++===0&&c.addEventListener(a,f,!0)},teardown:function(){--e===0&&c.removeEventListener(a,f,!0)}}}),d.each(["bind","one"],function(a,c){d.fn[c]=function(a,e,f){if(typeof a==="object"){for(var g in a)this[c](g,e,a[g],f);return this}if(d.isFunction(e)||e===!1)f=e,e=b;var h=c==="one"?d.proxy(f,function(a){d(this).unbind(a,h);return f.apply(this,arguments)}):f;if(a==="unload"&&c!=="one")this.one(a,e,f);else for(var i=0,j=this.length;i<j;i++)d.event.add(this[i],a,h,e);return this}}),d.fn.extend({unbind:function(a,b){if(typeof a!=="object"||a.preventDefault)for(var e=0,f=this.length;e<f;e++)d.event.remove(this[e],a,b);else for(var c in a)this.unbind(c,a[c]);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){d.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){var c=d.Event(a);c.preventDefault(),c.stopPropagation(),d.event.trigger(c,b,this[0]);return c.result}},toggle:function(a){var b=arguments,c=1;while(c<b.length)d.proxy(a,b[c++]);return this.click(d.proxy(a,function(e){var f=(d._data(this,"lastToggle"+a.guid)||0)%c;d._data(this,"lastToggle"+a.guid,f+1),e.preventDefault();return b[f].apply(this,arguments)||!1}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var F={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};d.each(["live","die"],function(a,c){d.fn[c]=function(a,e,f,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:d(this.context);if(typeof a==="object"&&!a.preventDefault){for(var o in a)n[c](o,e,a[o],m);return this}d.isFunction(e)&&(f=e,e=b),a=(a||"").split(" ");while((h=a[i++])!=null){j=r.exec(h),k="",j&&(k=j[0],h=h.replace(r,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,h==="focus"||h==="blur"?(a.push(F[h]+k),h=h+k):h=(F[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)d.event.add(n[p],"live."+H(h,m),{data:e,selector:m,handler:f,origType:h,origHandler:f,preType:l});else n.unbind("live."+H(h,m),f)}return this}}),d.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){d.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},d.attrFn&&(d.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!=="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,e,g){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!=="string")return e;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(f.call(n)==="[object Array]")if(u)if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&e.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&e.push(j[t]);else e.push.apply(e,n);else p(n,e);o&&(k(o,h,e,g),k.uniqueSort(e));return e};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!=="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(f){if(f===!0)continue}else g=o=!0}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b==="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1){}a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b==="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!=="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!=="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!=="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return"text"===c&&(b===c||b===null)},radio:function(a){return"radio"===a.type},checkbox:function(a){return"checkbox"===a.type},file:function(a){return"file"===a.type},password:function(a){return"password"===a.type},submit:function(a){return"submit"===a.type},image:function(a){return"image"===a.type},reset:function(a){return"reset"===a.type},button:function(a){return"button"===a.type||a.nodeName.toLowerCase()==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(f.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length==="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(a===b){g=!0;return 0}if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!=="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!=="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!=="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!=="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!=="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};d.find=k,d.expr=k.selectors,d.expr[":"]=d.expr.filters,d.unique=k.uniqueSort,d.text=k.getText,d.isXMLDoc=k.isXML,d.contains=k.contains}();var I=/Until$/,J=/^(?:parents|prevUntil|prevAll)/,K=/,/,L=/^.[^:#\[\.,]*$/,M=Array.prototype.slice,N=d.expr.match.POS,O={children:!0,contents:!0,next:!0,prev:!0};d.fn.extend({find:function(a){var b=this.pushStack("","find",a),c=0;for(var e=0,f=this.length;e<f;e++){c=b.length,d.find(a,this[e],b);if(e>0)for(var g=c;g<b.length;g++)for(var h=0;h<c;h++)if(b[h]===b[g]){b.splice(g--,1);break}}return b},has:function(a){var b=d(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(d.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(Q(this,a,!1),"not",a)},filter:function(a){return this.pushStack(Q(this,a,!0),"filter",a)},is:function(a){return!!a&&d.filter(a,this).length>0},closest:function(a,b){var c=[],e,f,g=this[0];if(d.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(e=0,f=a.length;e<f;e++)i=a[e],j[i]||(j[i]=d.expr.match.POS.test(i)?d(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:d(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=N.test(a)?d(a,b||this.context):null;for(e=0,f=this.length;e<f;e++){g=this[e];while(g){if(l?l.index(g)>-1:d.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b)break}}c=c.length>1?d.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a==="string")return d.inArray(this[0],a?d(a):this.parent().children());return d.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a==="string"?d(a,b):d.makeArray(a),e=d.merge(this.get(),c);return this.pushStack(P(c[0])||P(e[0])?e:d.unique(e))},andSelf:function(){return this.add(this.prevObject)}}),d.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return d.dir(a,"parentNode")},parentsUntil:function(a,b,c){return d.dir(a,"parentNode",c)},next:function(a){return d.nth(a,2,"nextSibling")},prev:function(a){return d.nth(a,2,"previousSibling")},nextAll:function(a){return d.dir(a,"nextSibling")},prevAll:function(a){return d.dir(a,"previousSibling")},nextUntil:function(a,b,c){return d.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return d.dir(a,"previousSibling",c)},siblings:function(a){return d.sibling(a.parentNode.firstChild,a)},children:function(a){return d.sibling(a.firstChild)},contents:function(a){return d.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:d.makeArray(a.childNodes)}},function(a,b){d.fn[a]=function(c,e){var f=d.map(this,b,c),g=M.call(arguments);I.test(a)||(e=c),e&&typeof e==="string"&&(f=d.filter(e,f)),f=this.length>1&&!O[a]?d.unique(f):f,(this.length>1||K.test(e))&&J.test(a)&&(f=f.reverse());return this.pushStack(f,a,g.join(","))}}),d.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?d.find.matchesSelector(b[0],a)?[b[0]]:[]:d.find.matches(a,b)},dir:function(a,c,e){var f=[],g=a[c];while(g&&g.nodeType!==9&&(e===b||g.nodeType!==1||!d(g).is(e)))g.nodeType===1&&f.push(g),g=g[c];return f},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var R=/ jQuery\d+="(?:\d+|null)"/g,S=/^\s+/,T=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,U=/<([\w:]+)/,V=/<tbody/i,W=/<|&#?\w+;/,X=/<(?:script|object|embed|option|style)/i,Y=/checked\s*(?:[^=]|=\s*.checked.)/i,Z={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};Z.optgroup=Z.option,Z.tbody=Z.tfoot=Z.colgroup=Z.caption=Z.thead,Z.th=Z.td,d.support.htmlSerialize||(Z._default=[1,"div<div>","</div>"]),d.fn.extend({text:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.text(a.call(this,b,c.text()))});if(typeof a!=="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return d.text(this)},wrapAll:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapAll(a.call(this,b))});if(this[0]){var b=d(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapInner(a.call(this,b))});return this.each(function(){var b=d(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){d(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){d.nodeName(this,"body")||d(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=d(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,d(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,e;(e=this[c])!=null;c++)if(!a||d.filter(a,[e]).length)!b&&e.nodeType===1&&(d.cleanData(e.getElementsByTagName("*")),d.cleanData([e])),e.parentNode&&e.parentNode.removeChild(e);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&d.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return d.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(R,""):null;if(typeof a!=="string"||X.test(a)||!d.support.leadingWhitespace&&S.test(a)||Z[(U.exec(a)||["",""])[1].toLowerCase()])d.isFunction(a)?this.each(function(b){var c=d(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);else{a=a.replace(T,"<$1></$2>");try{for(var c=0,e=this.length;c<e;c++)this[c].nodeType===1&&(d.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(f){this.empty().append(a)}}return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(d.isFunction(a))return this.each(function(b){var c=d(this),e=c.html();c.replaceWith(a.call(this,b,e))});typeof a!=="string"&&(a=d(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;d(this).remove(),b?d(b).before(a):d(c).append(a)})}return this.length?this.pushStack(d(d.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,e){var f,g,h,i,j=a[0],k=[];if(!d.support.checkClone&&arguments.length===3&&typeof j==="string"&&Y.test(j))return this.each(function(){d(this).domManip(a,c,e,!0)});if(d.isFunction(j))return this.each(function(f){var g=d(this);a[0]=j.call(this,f,c?g.html():b),g.domManip(a,c,e)});if(this[0]){i=j&&j.parentNode,d.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?f={fragment:i}:f=d.buildFragment(a,this,k),h=f.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&d.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)e.call(c?$(this[l],g):this[l],f.cacheable||m>1&&l<n?d.clone(h,!0,!0):h)}k.length&&d.each(k,bc)}return this}}),d.buildFragment=function(a,b,e){var f,g,h,i=b&&b[0]?b[0].ownerDocument||b[0]:c;a.length===1&&typeof a[0]==="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!X.test(a[0])&&(d.support.checkClone||!Y.test(a[0]))&&(g=!0,h=d.fragments[a[0]],h&&(h!==1&&(f=h))),f||(f=i.createDocumentFragment(),d.clean(a,i,f,e)),g&&(d.fragments[a[0]]=h?f:1);return{fragment:f,cacheable:g}},d.fragments={},d.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){d.fn[a]=function(c){var e=[],f=d(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&f.length===1){f[b](this[0]);return this}for(var h=0,i=f.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();d(f[h])[b](j),e=e.concat(j)}return this.pushStack(e,a,f.selector)}}),d.extend({clone:function(a,b,c){var e=a.cloneNode(!0),f,g,h;if((!d.support.noCloneEvent||!d.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!d.isXMLDoc(a)){ba(a,e),f=bb(a),g=bb(e);for(h=0;f[h];++h)ba(f[h],g[h])}if(b){_(a,e);if(c){f=bb(a),g=bb(e);for(h=0;f[h];++h)_(f[h],g[h])}}return e},clean:function(a,b,e,f){b=b||c,typeof b.createElement==="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var g=[];for(var h=0,i;(i=a[h])!=null;h++){typeof i==="number"&&(i+="");if(!i)continue;if(typeof i!=="string"||W.test(i)){if(typeof i==="string"){i=i.replace(T,"<$1></$2>");var j=(U.exec(i)||["",""])[1].toLowerCase(),k=Z[j]||Z._default,l=k[0],m=b.createElement("div");m.innerHTML=k[1]+i+k[2];while(l--)m=m.lastChild;if(!d.support.tbody){var n=V.test(i),o=j==="table"&&!n?m.firstChild&&m.firstChild.childNodes:k[1]==="<table>"&&!n?m.childNodes:[];for(var p=o.length-1;p>=0;--p)d.nodeName(o[p],"tbody")&&!o[p].childNodes.length&&o[p].parentNode.removeChild(o[p])}!d.support.leadingWhitespace&&S.test(i)&&m.insertBefore(b.createTextNode(S.exec(i)[0]),m.firstChild),i=m.childNodes}}else i=b.createTextNode(i);i.nodeType?g.push(i):g=d.merge(g,i)}if(e)for(h=0;g[h];h++)!f||!d.nodeName(g[h],"script")||g[h].type&&g[h].type.toLowerCase()!=="text/javascript"?(g[h].nodeType===1&&g.splice.apply(g,[h+1,0].concat(d.makeArray(g[h].getElementsByTagName("script")))),e.appendChild(g[h])):f.push(g[h].parentNode?g[h].parentNode.removeChild(g[h]):g[h]);return g},cleanData:function(a){var b,c,e=d.cache,f=d.expando,g=d.event.special,h=d.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&d.noData[j.nodeName.toLowerCase()])continue;c=j[d.expando];if(c){b=e[c]&&e[c][f];if(b&&b.events){for(var k in b.events)g[k]?d.event.remove(j,k):d.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[d.expando]:j.removeAttribute&&j.removeAttribute(d.expando),delete e[c]}}}});var bd=/alpha\([^)]*\)/i,be=/opacity=([^)]*)/,bf=/-([a-z])/ig,bg=/([A-Z]|^ms)/g,bh=/^-?\d+(?:px)?$/i,bi=/^-?\d/,bj={position:"absolute",visibility:"hidden",display:"block"},bk=["Left","Right"],bl=["Top","Bottom"],bm,bn,bo,bp=function(a,b){return b.toUpperCase()};d.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return d.access(this,a,c,!0,function(a,c,e){return e!==b?d.style(a,c,e):d.css(a,c)})},d.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bm(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{zIndex:!0,fontWeight:!0,opacity:!0,zoom:!0,lineHeight:!0},cssProps:{"float":d.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,e,f){if(a&&a.nodeType!==3&&a.nodeType!==8&&a.style){var g,h=d.camelCase(c),i=a.style,j=d.cssHooks[h];c=d.cssProps[h]||h;if(e===b){if(j&&"get"in j&&(g=j.get(a,!1,f))!==b)return g;return i[c]}if(typeof e==="number"&&isNaN(e)||e==null)return;typeof e==="number"&&!d.cssNumber[h]&&(e+="px");if(!j||!("set"in j)||(e=j.set(a,e))!==b)try{i[c]=e}catch(k){}}},css:function(a,c,e){var f,g=d.camelCase(c),h=d.cssHooks[g];c=d.cssProps[g]||g;if(h&&"get"in h&&(f=h.get(a,!0,e))!==b)return f;if(bm)return bm(a,c,g)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]},camelCase:function(a){return a.replace(bf,bp)}}),d.curCSS=d.css,d.each(["height","width"],function(a,b){d.cssHooks[b]={get:function(a,c,e){var f;if(c){a.offsetWidth!==0?f=bq(a,b,e):d.swap(a,bj,function(){f=bq(a,b,e)});if(f<=0){f=bm(a,b,b),f==="0px"&&bo&&(f=bo(a,b,b));if(f!=null)return f===""||f==="auto"?"0px":f}if(f<0||f==null){f=a.style[b];return f===""||f==="auto"?"0px":f}return typeof f==="string"?f:f+"px"}},set:function(a,b){if(!bh.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),d.support.opacity||(d.cssHooks.opacity={get:function(a,b){return be.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style;c.zoom=1;var e=d.isNaN(b)?"":"alpha(opacity="+b*100+")",f=c.filter||"";c.filter=bd.test(f)?f.replace(bd,e):c.filter+" "+e}}),d(function(){d.support.reliableMarginRight||(d.cssHooks.marginRight={get:function(a,b){var c;d.swap(a,{display:"inline-block"},function(){b?c=bm(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bn=function(a,c,e){var f,g,h;e=e.replace(bg,"-$1").toLowerCase();if(!(g=a.ownerDocument.defaultView))return b;if(h=g.getComputedStyle(a,null))f=h.getPropertyValue(e),f===""&&!d.contains(a.ownerDocument.documentElement,a)&&(f=d.style(a,e));return f}),c.documentElement.currentStyle&&(bo=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bh.test(d)&&bi.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bm=bn||bo,d.expr&&d.expr.filters&&(d.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!d.support.reliableHiddenOffsets&&(a.style.display||d.css(a,"display"))==="none"},d.expr.filters.visible=function(a){return!d.expr.filters.hidden(a)});var br=/%20/g,bs=/\[\]$/,bt=/\r?\n/g,bu=/#.*$/,bv=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bw=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bx=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,by=/^(?:GET|HEAD)$/,bz=/^\/\//,bA=/\?/,bB=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bC=/^(?:select|textarea)/i,bD=/\s+/,bE=/([?&])_=[^&]*/,bF=/(^|\-)([a-z])/g,bG=function(a,b,c){return b+c.toUpperCase()},bH=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bI=d.fn.load,bJ={},bK={},bL,bM;try{bL=c.location.href}catch(bN){bL=c.createElement("a"),bL.href="",bL=bL.href}bM=bH.exec(bL.toLowerCase())||[],d.fn.extend({load:function(a,c,e){if(typeof a!=="string"&&bI)return bI.apply(this,arguments);if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var g=a.slice(f,a.length);a=a.slice(0,f)}var h="GET";c&&(d.isFunction(c)?(e=c,c=b):typeof c==="object"&&(c=d.param(c,d.ajaxSettings.traditional),h="POST"));var i=this;d.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?d("<div>").append(c.replace(bB,"")).find(g):c)),e&&i.each(e,[c,b,a])}});return this},serialize:function(){return d.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?d.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bC.test(this.nodeName)||bw.test(this.type))}).map(function(a,b){var c=d(this).val();return c==null?null:d.isArray(c)?d.map(c,function(a,c){return{name:b.name,value:a.replace(bt,"\r\n")}}):{name:b.name,value:c.replace(bt,"\r\n")}}).get()}}),d.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){d.fn[b]=function(a){return this.bind(b,a)}}),d.each(["get","post"],function(a,c){d[c]=function(a,e,f,g){d.isFunction(e)&&(g=g||f,f=e,e=b);return d.ajax({type:c,url:a,data:e,success:f,dataType:g})}}),d.extend({getScript:function(a,c){return d.get(a,b,c,"script")},getJSON:function(a,b,c){return d.get(a,b,c,"json")},ajaxSetup:function(a,b){b?d.extend(!0,a,d.ajaxSettings,b):(b=a,a=d.extend(!0,d.ajaxSettings,b));for(var c in {context:1,url:1})c in b?a[c]=b[c]:c in d.ajaxSettings&&(a[c]=d.ajaxSettings[c]);return a},ajaxSettings:{url:bL,isLocal:bx.test(bM[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":d.parseJSON,"text xml":d.parseXML}},ajaxPrefilter:bO(bJ),ajaxTransport:bO(bK),ajax:function(a,c){function v(a,c,l,n){if(r!==2){r=2,p&&clearTimeout(p),o=b,m=n||"",u.readyState=a?4:0;var q,t,v,w=l?bR(e,u,l):b,x,y;if(a>=200&&a<300||a===304){if(e.ifModified){if(x=u.getResponseHeader("Last-Modified"))d.lastModified[k]=x;if(y=u.getResponseHeader("Etag"))d.etag[k]=y}if(a===304)c="notmodified",q=!0;else try{t=bS(e,w),c="success",q=!0}catch(z){c="parsererror",v=z}}else{v=c;if(!c||a)c="error",a<0&&(a=0)}u.status=a,u.statusText=c,q?h.resolveWith(f,[t,c,u]):h.rejectWith(f,[u,c,v]),u.statusCode(j),j=b,s&&g.trigger("ajax"+(q?"Success":"Error"),[u,e,q?t:v]),i.resolveWith(f,[u,c]),s&&(g.trigger("ajaxComplete",[u,e]),--d.active||d.event.trigger("ajaxStop"))}}typeof a==="object"&&(c=a,a=b),c=c||{};var e=d.ajaxSetup({},c),f=e.context||e,g=f!==e&&(f.nodeType||f instanceof d)?d(f):d.event,h=d.Deferred(),i=d._Deferred(),j=e.statusCode||{},k,l={},m,n,o,p,q,r=0,s,t,u={readyState:0,setRequestHeader:function(a,b){r||(l[a.toLowerCase().replace(bF,bG)]=b);return this},getAllResponseHeaders:function(){return r===2?m:null},getResponseHeader:function(a){var c;if(r===2){if(!n){n={};while(c=bv.exec(m))n[c[1].toLowerCase()]=c[2]}c=n[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){r||(e.mimeType=a);return this},abort:function(a){a=a||"abort",o&&o.abort(a),v(0,a);return this}};h.promise(u),u.success=u.done,u.error=u.fail,u.complete=i.done,u.statusCode=function(a){if(a){var b;if(r<2)for(b in a)j[b]=[j[b],a[b]];else b=a[u.status],u.then(b,b)}return this},e.url=((a||e.url)+"").replace(bu,"").replace(bz,bM[1]+"//"),e.dataTypes=d.trim(e.dataType||"*").toLowerCase().split(bD),e.crossDomain==null&&(q=bH.exec(e.url.toLowerCase()),e.crossDomain=q&&(q[1]!=bM[1]||q[2]!=bM[2]||(q[3]||(q[1]==="http:"?80:443))!=(bM[3]||(bM[1]==="http:"?80:443)))),e.data&&e.processData&&typeof e.data!=="string"&&(e.data=d.param(e.data,e.traditional)),bP(bJ,e,c,u);if(r===2)return!1;s=e.global,e.type=e.type.toUpperCase(),e.hasContent=!by.test(e.type),s&&d.active++===0&&d.event.trigger("ajaxStart");if(!e.hasContent){e.data&&(e.url+=(bA.test(e.url)?"&":"?")+e.data),k=e.url;if(e.cache===!1){var w=d.now(),x=e.url.replace(bE,"$1_="+w);e.url=x+(x===e.url?(bA.test(e.url)?"&":"?")+"_="+w:"")}}if(e.data&&e.hasContent&&e.contentType!==!1||c.contentType)l["Content-Type"]=e.contentType;e.ifModified&&(k=k||e.url,d.lastModified[k]&&(l["If-Modified-Since"]=d.lastModified[k]),d.etag[k]&&(l["If-None-Match"]=d.etag[k])),l.Accept=e.dataTypes[0]&&e.accepts[e.dataTypes[0]]?e.accepts[e.dataTypes[0]]+(e.dataTypes[0]!=="*"?", */*; q=0.01":""):e.accepts["*"];for(t in e.headers)u.setRequestHeader(t,e.headers[t]);if(e.beforeSend&&(e.beforeSend.call(f,u,e)===!1||r===2)){u.abort();return!1}for(t in {success:1,error:1,complete:1})u[t](e[t]);o=bP(bK,e,c,u);if(o){u.readyState=1,s&&g.trigger("ajaxSend",[u,e]),e.async&&e.timeout>0&&(p=setTimeout(function(){u.abort("timeout")},e.timeout));try{r=1,o.send(l,v)}catch(y){status<2?v(-1,y):d.error(y)}}else v(-1,"No Transport");return u},param:function(a,c){var e=[],f=function(a,b){b=d.isFunction(b)?b():b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=d.ajaxSettings.traditional);if(d.isArray(a)||a.jquery&&!d.isPlainObject(a))d.each(a,function(){f(this.name,this.value)});else for(var g in a)bQ(g,a[g],c,f);return e.join("&").replace(br,"+")}}),d.extend({active:0,lastModified:{},etag:{}});var bT=d.now(),bU=/(\=)\?(&|$)|\?\?/i;d.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return d.expando+"_"+bT++}}),d.ajaxPrefilter("json jsonp",function(b,c,e){var f=typeof b.data==="string";if(b.dataTypes[0]==="jsonp"||c.jsonpCallback||c.jsonp!=null||b.jsonp!==!1&&(bU.test(b.url)||f&&bU.test(b.data))){var g,h=b.jsonpCallback=d.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2",m=function(){a[h]=i,g&&d.isFunction(i)&&a[h](g[0])};b.jsonp!==!1&&(j=j.replace(bU,l),b.url===j&&(f&&(k=k.replace(bU,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},e.then(m,m),b.converters["script json"]=function(){g||d.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),d.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){d.globalEval(a);return a}}}),d.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),d.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var bV=d.now(),bW,bX;d.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&bZ()||b$()}:bZ,bX=d.ajaxSettings.xhr(),d.support.ajax=!!bX,d.support.cors=bX&&"withCredentials"in bX,bX=b,d.support.ajax&&d.ajaxTransport(function(a){if(!a.crossDomain||d.support.cors){var c;return{send:function(e,f){var g=a.xhr(),h,i;a.username?g.open(a.type,a.url,a.async,a.username,a.password):g.open(a.type,a.url,a.async);if(a.xhrFields)for(i in a.xhrFields)g[i]=a.xhrFields[i];a.mimeType&&g.overrideMimeType&&g.overrideMimeType(a.mimeType),!a.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(i in e)g.setRequestHeader(i,e[i])}catch(j){}g.send(a.hasContent&&a.data||null),c=function(e,i){var j,k,l,m,n;try{if(c&&(i||g.readyState===4)){c=b,h&&(g.onreadystatechange=d.noop,delete bW[h]);if(i)g.readyState!==4&&g.abort();else{j=g.status,l=g.getAllResponseHeaders(),m={},n=g.responseXML,n&&n.documentElement&&(m.xml=n),m.text=g.responseText;try{k=g.statusText}catch(o){k=""}j||!a.isLocal||a.crossDomain?j===1223&&(j=204):j=m.text?200:404}}}catch(p){i||f(-1,p)}m&&f(j,k,m,l)},a.async&&g.readyState!==4?(bW||(bW={},bY()),h=bV++,g.onreadystatechange=bW[h]=c):c()},abort:function(){c&&c(0,1)}}}});var b_={},ca=/^(?:toggle|show|hide)$/,cb=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cc,cd=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];d.fn.extend({show:function(a,b,c){var e,f;if(a||a===0)return this.animate(ce("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)e=this[g],f=e.style.display,!d._data(e,"olddisplay")&&f==="none"&&(f=e.style.display=""),f===""&&d.css(e,"display")==="none"&&d._data(e,"olddisplay",cf(e.nodeName));for(g=0;g<h;g++){e=this[g],f=e.style.display;if(f===""||f==="none")e.style.display=d._data(e,"olddisplay")||""}return this},hide:function(a,b,c){if(a||a===0)return this.animate(ce("hide",3),a,b,c);for(var e=0,f=this.length;e<f;e++){var g=d.css(this[e],"display");g!=="none"&&!d._data(this[e],"olddisplay")&&d._data(this[e],"olddisplay",g)}for(e=0;e<f;e++)this[e].style.display="none";return this},_toggle:d.fn.toggle,toggle:function(a,b,c){var e=typeof a==="boolean";d.isFunction(a)&&d.isFunction(b)?this._toggle.apply(this,arguments):a==null||e?this.each(function(){var b=e?a:d(this).is(":hidden");d(this)[b?"show":"hide"]()}):this.animate(ce("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,e){var f=d.speed(b,c,e);if(d.isEmptyObject(a))return this.each(f.complete);return this[f.queue===!1?"each":"queue"](function(){var b=d.extend({},f),c,e=this.nodeType===1,g=e&&d(this).is(":hidden"),h=this;for(c in a){var i=d.camelCase(c);c!==i&&(a[i]=a[c],delete a[c],c=i);if(a[c]==="hide"&&g||a[c]==="show"&&!g)return b.complete.call(this);if(e&&(c==="height"||c==="width")){b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY];if(d.css(this,"display")==="inline"&&d.css(this,"float")==="none")if(d.support.inlineBlockNeedsLayout){var j=cf(this.nodeName);j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)}else this.style.display="inline-block"}d.isArray(a[c])&&((b.specialEasing=b.specialEasing||{})[c]=a[c][1],a[c]=a[c][0])}b.overflow!=null&&(this.style.overflow="hidden"),b.curAnim=d.extend({},a),d.each(a,function(c,e){var f=new d.fx(h,b,c);if(ca.test(e))f[e==="toggle"?g?"show":"hide":e](a);else{var i=cb.exec(e),j=f.cur();if(i){var k=parseFloat(i[2]),l=i[3]||(d.cssNumber[c]?"":"px");l!=="px"&&(d.style(h,c,(k||1)+l),j=(k||1)/f.cur()*j,d.style(h,c,j+l)),i[1]&&(k=(i[1]==="-="?-1:1)*k+j),f.custom(j,k,l)}else f.custom(j,e,"")}});return!0})},stop:function(a,b){var c=d.timers;a&&this.queue([]),this.each(function(){for(var a=c.length-1;a>=0;a--)c[a].elem===this&&(b&&c[a](!0),c.splice(a,1))}),b||this.dequeue();return this}}),d.each({slideDown:ce("show",1),slideUp:ce("hide",1),slideToggle:ce("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){d.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),d.extend({speed:function(a,b,c){var e=a&&typeof a==="object"?d.extend({},a):{complete:c||!c&&b||d.isFunction(a)&&a,duration:a,easing:c&&b||b&&!d.isFunction(b)&&b};e.duration=d.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in d.fx.speeds?d.fx.speeds[e.duration]:d.fx.speeds._default,e.old=e.complete,e.complete=function(){e.queue!==!1&&d(this).dequeue(),d.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig||(b.orig={})}}),d.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(d.fx.step[this.prop]||d.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=d.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function g(a){return e.step(a)}var e=this,f=d.fx;this.startTime=d.now(),this.start=a,this.end=b,this.unit=c||this.unit||(d.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,g.elem=this.elem,g()&&d.timers.push(g)&&!cc&&(cc=setInterval(f.tick,f.interval))},show:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),d(this.elem).show()},hide:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=d.now(),c=!0;if(a||b>=this.options.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),this.options.curAnim[this.prop]=!0;for(var e in this.options.curAnim)this.options.curAnim[e]!==!0&&(c=!1);if(c){if(this.options.overflow!=null&&!d.support.shrinkWrapBlocks){var f=this.elem,g=this.options;d.each(["","X","Y"],function(a,b){f.style["overflow"+b]=g.overflow[a]})}this.options.hide&&d(this.elem).hide();if(this.options.hide||this.options.show)for(var h in this.options.curAnim)d.style(this.elem,h,this.options.orig[h]);this.options.complete.call(this.elem)}return!1}var i=b-this.startTime;this.state=i/this.options.duration;var j=this.options.specialEasing&&this.options.specialEasing[this.prop],k=this.options.easing||(d.easing.swing?"swing":"linear");this.pos=d.easing[j||k](this.state,i,0,1,this.options.duration),this.now=this.start+(this.end-this.start)*this.pos,this.update();return!0}},d.extend(d.fx,{tick:function(){var a=d.timers;for(var b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||d.fx.stop()},interval:13,stop:function(){clearInterval(cc),cc=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){d.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),d.expr&&d.expr.filters&&(d.expr.filters.animated=function(a){return d.grep(d.timers,function(b){return a===b.elem}).length});var cg=/^t(?:able|d|h)$/i,ch=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?d.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(e){}var f=b.ownerDocument,g=f.documentElement;if(!c||!d.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=f.body,i=ci(f),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||d.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||d.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:d.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);d.offset.initialize();var c,e=b.offsetParent,f=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(d.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===e&&(l+=b.offsetTop,m+=b.offsetLeft,d.offset.doesNotAddBorder&&(!d.offset.doesAddBorderForTableAndCells||!cg.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),f=e,e=b.offsetParent),d.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;d.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},d.offset={initialize:function(){var a=c.body,b=c.createElement("div"),e,f,g,h,i=parseFloat(d.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";d.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),e=b.firstChild,f=e.firstChild,h=e.nextSibling.firstChild.firstChild,this.doesNotAddBorder=f.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,f.style.position="fixed",f.style.top="20px",this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15,f.style.position=f.style.top="",e.style.overflow="hidden",e.style.position="relative",this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),d.offset.initialize=d.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;d.offset.initialize(),d.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(d.css(a,"marginTop"))||0,c+=parseFloat(d.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var e=d.css(a,"position");e==="static"&&(a.style.position="relative");var f=d(a),g=f.offset(),h=d.css(a,"top"),i=d.css(a,"left"),j=(e==="absolute"||e==="fixed")&&d.inArray("auto",[h,i])>-1,k={},l={},m,n;j&&(l=f.position()),m=j?l.top:parseInt(h,10)||0,n=j?l.left:parseInt(i,10)||0,d.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):f.css(k)}},d.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),e=ch.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(d.css(a,"marginTop"))||0,c.left-=parseFloat(d.css(a,"marginLeft"))||0,e.top+=parseFloat(d.css(b[0],"borderTopWidth"))||0,e.left+=parseFloat(d.css(b[0],"borderLeftWidth"))||0;return{top:c.top-e.top,left:c.left-e.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&(!ch.test(a.nodeName)&&d.css(a,"position")==="static"))a=a.offsetParent;return a})}}),d.each(["Left","Top"],function(a,c){var e="scroll"+c;d.fn[e]=function(c){var f=this[0],g;if(!f)return null;if(c!==b)return this.each(function(){g=ci(this),g?g.scrollTo(a?d(g).scrollLeft():c,a?c:d(g).scrollTop()):this[e]=c});g=ci(f);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:d.support.boxModel&&g.document.documentElement[e]||g.document.body[e]:f[e]}}),d.each(["Height","Width"],function(a,c){var e=c.toLowerCase();d.fn["inner"+c]=function(){return this[0]?parseFloat(d.css(this[0],e,"padding")):null},d.fn["outer"+c]=function(a){return this[0]?parseFloat(d.css(this[0],e,a?"margin":"border")):null},d.fn[e]=function(a){var f=this[0];if(!f)return a==null?null:this;if(d.isFunction(a))return this.each(function(b){var c=d(this);c[e](a.call(this,b,c[e]()))});if(d.isWindow(f)){var g=f.document.documentElement["client"+c];return f.document.compatMode==="CSS1Compat"&&g||f.document.body["client"+c]||g}if(f.nodeType===9)return Math.max(f.documentElement["client"+c],f.body["scroll"+c],f.documentElement["scroll"+c],f.body["offset"+c],f.documentElement["offset"+c]);if(a===b){var h=d.css(f,e),i=parseFloat(h);return d.isNaN(i)?h:i}return this.css(e,typeof a==="string"?a:a+"px")}}),a.jQuery=a.$=d})(window);
\ No newline at end of file
diff --git a/y2016/dashboard/BUILD b/y2016/dashboard/BUILD
index 31038b5..2892814 100644
--- a/y2016/dashboard/BUILD
+++ b/y2016/dashboard/BUILD
@@ -1,37 +1,41 @@
-load('//aos/seasocks:gen_embedded.bzl', 'gen_embedded')
-load('//aos/downloader:downloader.bzl', 'aos_downloader_dir')
+load("//aos/seasocks:gen_embedded.bzl", "gen_embedded")
+load("//aos/downloader:downloader.bzl", "aos_downloader_dir")
gen_embedded(
- name = 'gen_embedded',
- srcs = glob(['www_defaults/**/*'], exclude=['www/**/*']),
+ name = "gen_embedded",
+ srcs = glob(
+ ["www_defaults/**/*"],
+ exclude = ["www/**/*"],
+ ),
)
aos_downloader_dir(
- name = 'www_files',
- visibility = ['//visibility:public'],
- srcs = glob([
- 'www/**/*',
- ]),
- dir = "www",
+ name = "www_files",
+ srcs = glob([
+ "www/**/*",
+ ]),
+ dir = "www",
+ visibility = ["//visibility:public"],
)
cc_binary(
- name = 'dashboard',
- visibility = ['//visibility:public'],
- srcs = [
- 'dashboard.cc',
- 'dashboard.h',
- ],
- deps = [
- ':gen_embedded',
- '//aos:init',
- '//aos/logging',
- '//aos/util:phased_loop',
- '//aos/time:time',
- '//frc971/autonomous:auto_queue',
- '//third_party/seasocks',
- '//y2016/vision:vision_queue',
- '//y2016/control_loops/superstructure:superstructure_queue',
- '//y2016/queues:ball_detector',
- ],
+ name = "dashboard",
+ srcs = [
+ "dashboard.cc",
+ "dashboard.h",
+ ],
+ visibility = ["//visibility:public"],
+ deps = [
+ ":gen_embedded",
+ "//aos:init",
+ "//aos/logging",
+ "//aos/seasocks:seasocks_logger",
+ "//aos/time",
+ "//aos/util:phased_loop",
+ "//frc971/autonomous:auto_queue",
+ "//third_party/seasocks",
+ "//y2016/control_loops/superstructure:superstructure_queue",
+ "//y2016/queues:ball_detector",
+ "//y2016/vision:vision_queue",
+ ],
)
diff --git a/y2016/dashboard/dashboard.cc b/y2016/dashboard/dashboard.cc
index 5f0a33f..04e91f6 100644
--- a/y2016/dashboard/dashboard.cc
+++ b/y2016/dashboard/dashboard.cc
@@ -13,9 +13,10 @@
#include "aos/init.h"
#include "aos/logging/logging.h"
+#include "aos/mutex/mutex.h"
+#include "aos/seasocks/seasocks_logger.h"
#include "aos/time/time.h"
#include "aos/util/phased_loop.h"
-#include "aos/mutex/mutex.h"
#include "frc971/autonomous/auto.q.h"
@@ -261,32 +262,6 @@
data_collector_thread_.join();
}
-SeasocksLogger::SeasocksLogger(Level min_level_to_log)
- : PrintfLogger(min_level_to_log) {}
-
-void SeasocksLogger::log(Level level, const char *message) {
- // Convert Seasocks error codes to AOS.
- log_level aos_level;
- switch (level) {
- case seasocks::Logger::INFO:
- aos_level = INFO;
- break;
- case seasocks::Logger::WARNING:
- aos_level = WARNING;
- break;
- case seasocks::Logger::ERROR:
- case seasocks::Logger::SEVERE:
- aos_level = ERROR;
- break;
- case seasocks::Logger::DEBUG:
- case seasocks::Logger::ACCESS:
- default:
- aos_level = DEBUG;
- break;
- }
- LOG(aos_level, "Seasocks: %s\n", message);
-}
-
} // namespace dashboard
} // namespace y2016
@@ -297,7 +272,7 @@
::aos::InitNRT();
::seasocks::Server server(::std::shared_ptr<seasocks::Logger>(
- new ::y2016::dashboard::SeasocksLogger(seasocks::Logger::INFO)));
+ new ::aos::seasocks::SeasocksLogger(::seasocks::Logger::Level::Info)));
::y2016::dashboard::SocketHandler socket_handler;
server.addWebSocketHandler(
diff --git a/y2016/vision/BUILD b/y2016/vision/BUILD
index 33ffbbc..99c50fd 100644
--- a/y2016/vision/BUILD
+++ b/y2016/vision/BUILD
@@ -145,6 +145,10 @@
gtk_dependent_cc_binary(
name = "debug_receiver",
srcs = ["debug_receiver.cc"],
+ restricted_to = [
+ "//tools:k8",
+ "//tools:armhf-debian",
+ ],
visibility = ["//visibility:public"],
deps = [
":blob_filters",
diff --git a/y2016/vision/tools/BUILD b/y2016/vision/tools/BUILD
index 763328d..edbfca5 100644
--- a/y2016/vision/tools/BUILD
+++ b/y2016/vision/tools/BUILD
@@ -1,17 +1,22 @@
-load('//tools/build_rules:gtk_dependent.bzl', 'gtk_dependent_cc_binary', 'gtk_dependent_cc_library')
+load("//tools/build_rules:gtk_dependent.bzl", "gtk_dependent_cc_binary", "gtk_dependent_cc_library")
-gtk_dependent_cc_binary(name = "blob_stream_replay",
- srcs = ["blob_stream_replay.cc"],
- deps = [
- "//aos/vision/image:reader",
- "//aos/vision/image:jpeg_routines",
- "//aos/vision/image:image_stream",
- "//aos/vision/events:epoll_events",
- "//aos/vision/events:gtk_event",
- "//aos/vision/events:tcp_server",
- "//aos/vision/debug:debug_window",
- "//aos/vision/blob:range_image",
- "//aos/vision/blob:stream_view",
- "//y2016/vision:blob_filters",
- ],
+gtk_dependent_cc_binary(
+ name = "blob_stream_replay",
+ srcs = ["blob_stream_replay.cc"],
+ restricted_to = [
+ "//tools:k8",
+ "//tools:armhf-debian",
+ ],
+ deps = [
+ "//aos/vision/blob:range_image",
+ "//aos/vision/blob:stream_view",
+ "//aos/vision/debug:debug_window",
+ "//aos/vision/events:epoll_events",
+ "//aos/vision/events:gtk_event",
+ "//aos/vision/events:tcp_server",
+ "//aos/vision/image:image_stream",
+ "//aos/vision/image:jpeg_routines",
+ "//aos/vision/image:reader",
+ "//y2016/vision:blob_filters",
+ ],
)
diff --git a/y2019/BUILD b/y2019/BUILD
index f2150ed..c49e7c4 100644
--- a/y2019/BUILD
+++ b/y2019/BUILD
@@ -136,6 +136,7 @@
"//frc971/control_loops/drivetrain:drivetrain_queue",
"//frc971/control_loops/drivetrain:localizer_queue",
"//y2019/control_loops/drivetrain:drivetrain_base",
+ "//y2019/control_loops/drivetrain:target_selector_queue",
"//y2019/control_loops/superstructure:superstructure_queue",
"@com_google_protobuf//:protobuf",
],
diff --git a/y2019/actors/BUILD b/y2019/actors/BUILD
index e772718..ee70772 100644
--- a/y2019/actors/BUILD
+++ b/y2019/actors/BUILD
@@ -17,9 +17,11 @@
cc_library(
name = "autonomous_action_lib",
srcs = [
+ "auto_splines.cc",
"autonomous_actor.cc",
],
hdrs = [
+ "auto_splines.h",
"autonomous_actor.h",
],
deps = [
diff --git a/y2019/actors/auto_splines.cc b/y2019/actors/auto_splines.cc
new file mode 100644
index 0000000..57aba4e
--- /dev/null
+++ b/y2019/actors/auto_splines.cc
@@ -0,0 +1,141 @@
+#include "y2019/actors/auto_splines.h"
+
+#include "frc971/control_loops/control_loops.q.h"
+
+namespace y2019 {
+namespace actors {
+
+::frc971::MultiSpline AutonomousSplines::HabToFarRocket() {
+ ::frc971::MultiSpline spline;
+ ::frc971::Constraint longitudinal_constraint;
+ ::frc971::Constraint lateral_constraint;
+ ::frc971::Constraint voltage_constraint;
+ ::frc971::Constraint velocity_constraint;
+
+ longitudinal_constraint.constraint_type = 1;
+ longitudinal_constraint.value = 1.5;
+
+ lateral_constraint.constraint_type = 2;
+ lateral_constraint.value = 1.0;
+
+ voltage_constraint.constraint_type = 3;
+ voltage_constraint.value = 11.0;
+
+ // Note: This velocity constraint is currently too late in the spline to
+ // actually do anything.
+ velocity_constraint.constraint_type = 4;
+ velocity_constraint.value = 0.5;
+ velocity_constraint.start_distance = 7.5;
+ velocity_constraint.end_distance = 10.0;
+
+ spline.spline_count = 1;
+ spline.spline_x = {{1.0, 2.0, 4.0, 7.8, 7.8, 6.53}};
+ spline.spline_y = {{1.5, 1.5, 1.5, 1.5, 3.0, 3.47}};
+ spline.constraints = {{longitudinal_constraint, lateral_constraint,
+ voltage_constraint, velocity_constraint}};
+ return spline;
+}
+
+::frc971::MultiSpline AutonomousSplines::FarRockettoHP() {
+ ::frc971::MultiSpline spline;
+ ::frc971::Constraint longitudinal_constraint;
+ ::frc971::Constraint lateral_constraint;
+ ::frc971::Constraint voltage_constraint;
+ ::frc971::Constraint velocity_constraint;
+
+ longitudinal_constraint.constraint_type = 1;
+ longitudinal_constraint.value = 1.5;
+
+ lateral_constraint.constraint_type = 2;
+ lateral_constraint.value = 1.0;
+
+ voltage_constraint.constraint_type = 3;
+ voltage_constraint.value = 11.0;
+
+ velocity_constraint.constraint_type = 4;
+ velocity_constraint.value = 0.5;
+ velocity_constraint.start_distance = 7.5;
+ velocity_constraint.end_distance = 10.0;
+
+ spline.spline_count = 1;
+ spline.spline_x = {{6.53, 7.8, 7.8, 4.0, 2.0, 0.4}};
+ spline.spline_y = {{3.47, 3.0, 1.5, 3.0, 3.4, 3.4}};
+ spline.constraints = {{longitudinal_constraint, lateral_constraint,
+ voltage_constraint, velocity_constraint}};
+ return spline;
+}
+
+::frc971::MultiSpline AutonomousSplines::HPToNearRocket() {
+ ::frc971::MultiSpline spline;
+ ::frc971::Constraint longitudinal_constraint;
+ ::frc971::Constraint lateral_constraint;
+ ::frc971::Constraint voltage_constraint;
+ ::frc971::Constraint velocity_constraint;
+
+ longitudinal_constraint.constraint_type = 1;
+ longitudinal_constraint.value = 1.0;
+
+ lateral_constraint.constraint_type = 2;
+ lateral_constraint.value = 1.0;
+
+ voltage_constraint.constraint_type = 3;
+ voltage_constraint.value = 11.0;
+
+ velocity_constraint.constraint_type = 4;
+ velocity_constraint.value = 0.5;
+ velocity_constraint.start_distance = 2.7;
+ velocity_constraint.end_distance = 10.0;
+
+ spline.spline_count = 1;
+ spline.spline_x = {{1.5, 2.0, 3.0, 4.0, 4.5, 5.12}};
+ spline.spline_y = {{3.4, 3.4, 3.4, 3.0, 3.0, 3.43}};
+ spline.constraints = {{longitudinal_constraint, lateral_constraint,
+ voltage_constraint, velocity_constraint}};
+ return spline;
+}
+
+::frc971::MultiSpline AutonomousSplines::BasicSSpline() {
+ ::frc971::MultiSpline spline;
+ ::frc971::Constraint longitudinal_constraint;
+ ::frc971::Constraint lateral_constraint;
+ ::frc971::Constraint voltage_constraint;
+
+ longitudinal_constraint.constraint_type = 1;
+ longitudinal_constraint.value = 1.0;
+
+ lateral_constraint.constraint_type = 2;
+ lateral_constraint.value = 1.0;
+
+ voltage_constraint.constraint_type = 3;
+ voltage_constraint.value = 6.0;
+
+ spline.spline_count = 1;
+ const float startx = 0.4;
+ const float starty = 3.4;
+ spline.spline_x = {{0.0f + startx, 0.6f + startx, 0.6f + startx,
+ 0.4f + startx, 0.4f + startx, 1.0f + startx}};
+ spline.spline_y = {{starty - 0.0f, starty - 0.0f, starty - 0.3f,
+ starty - 0.7f, starty - 1.0f, starty - 1.0f}};
+ spline.constraints = {
+ {longitudinal_constraint, lateral_constraint, voltage_constraint}};
+ return spline;
+}
+
+::frc971::MultiSpline AutonomousSplines::StraightLine() {
+ ::frc971::MultiSpline spline;
+ ::frc971::Constraint contraints;
+
+ contraints.constraint_type = 0;
+ contraints.value = 0.0;
+ contraints.start_distance = 0.0;
+ contraints.end_distance = 0.0;
+
+ spline.spline_count = 1;
+ spline.spline_x = {{-12.3, -11.9, -11.5, -11.1, -10.6, -10.0}};
+ spline.spline_y = {{1.25, 1.25, 1.25, 1.25, 1.25, 1.25}};
+ spline.constraints = {{contraints}};
+ return spline;
+}
+
+} // namespace actors
+} // namespace y2019
diff --git a/y2019/actors/auto_splines.h b/y2019/actors/auto_splines.h
new file mode 100644
index 0000000..d093b99
--- /dev/null
+++ b/y2019/actors/auto_splines.h
@@ -0,0 +1,33 @@
+#ifndef Y2019_ACTORS_AUTO_SPLINES_H_
+#define Y2019_ACTORS_AUTO_SPLINES_H_
+
+#include "frc971/control_loops/control_loops.q.h"
+/*
+
+ The cooridinate system for the autonomous splines is the same as the spline
+ python generator and drivetrain spline systems.
+
+*/
+
+namespace y2019 {
+namespace actors {
+
+class AutonomousSplines {
+ public:
+ // A spline that does an 's' cause that's what he wanted.
+ static ::frc971::MultiSpline BasicSSpline();
+
+ // Straight
+ static ::frc971::MultiSpline StraightLine();
+
+ // HP to near side rocket
+ static ::frc971::MultiSpline HPToNearRocket();
+
+ static ::frc971::MultiSpline HabToFarRocket();
+ static ::frc971::MultiSpline FarRockettoHP();
+};
+
+} // namespace actors
+} // namespace y2019
+
+#endif // Y2019_ACTORS_AUTO_SPLINES_H_
diff --git a/y2019/actors/autonomous_actor.cc b/y2019/actors/autonomous_actor.cc
index c14ef3c..41a70fd 100644
--- a/y2019/actors/autonomous_actor.cc
+++ b/y2019/actors/autonomous_actor.cc
@@ -10,6 +10,7 @@
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
#include "frc971/control_loops/drivetrain/localizer.q.h"
+#include "y2019/actors/auto_splines.h"
#include "y2019/control_loops/drivetrain/drivetrain_base.h"
namespace y2019 {
@@ -26,10 +27,6 @@
.count();
}
-constexpr bool is_left = false;
-
-constexpr double turn_scalar = is_left ? 1.0 : -1.0;
-
} // namespace
AutonomousActor::AutonomousActor(
@@ -37,7 +34,8 @@
: frc971::autonomous::BaseAutonomousActor(
s, control_loops::drivetrain::GetDrivetrainConfig()) {}
-void AutonomousActor::Reset() {
+void AutonomousActor::Reset(bool is_left) {
+ const double turn_scalar = is_left ? 1.0 : -1.0;
elevator_goal_ = 0.01;
wrist_goal_ = -M_PI / 2.0;
intake_goal_ = -1.2;
@@ -59,6 +57,7 @@
localizer_resetter->x = 1.0;
localizer_resetter->y = 1.5 * turn_scalar;
localizer_resetter->theta = M_PI;
+ localizer_resetter->theta_uncertainty = 0.0000001;
if (!localizer_resetter.Send()) {
LOG(ERROR, "Failed to reset localizer.\n");
}
@@ -84,8 +83,15 @@
bool AutonomousActor::RunAction(
const ::frc971::autonomous::AutonomousActionParams ¶ms) {
monotonic_clock::time_point start_time = monotonic_clock::now();
- LOG(INFO, "Starting autonomous action with mode %" PRId32 "\n", params.mode);
- Reset();
+ const bool is_left = params.mode == 0;
+
+ {
+ LOG(INFO, "Starting autonomous action with mode %" PRId32 " %s\n",
+ params.mode, is_left ? "left" : "right");
+ }
+ const double turn_scalar = is_left ? 1.0 : -1.0;
+
+ Reset(is_left);
// Grab the disk, wait until we have vacuum, then jump
set_elevator_goal(0.01);
@@ -115,7 +121,7 @@
StartDrive(0.0, -0.35 * turn_scalar, kDrive, kTurn);
LOG(INFO, "Elevator up\n");
- set_elevator_goal(0.01);
+ set_elevator_goal(0.78);
SendSuperstructureGoal();
if (!WaitForDriveDone()) return true;
diff --git a/y2019/actors/autonomous_actor.h b/y2019/actors/autonomous_actor.h
index 82e1aeb..38db070 100644
--- a/y2019/actors/autonomous_actor.h
+++ b/y2019/actors/autonomous_actor.h
@@ -26,7 +26,7 @@
const ::frc971::autonomous::AutonomousActionParams ¶ms) override;
private:
- void Reset();
+ void Reset(bool is_left);
double elevator_goal_ = 0.0;
double wrist_goal_ = 0.0;
diff --git a/y2019/constants.cc b/y2019/constants.cc
index ba737dd..477209e 100644
--- a/y2019/constants.cc
+++ b/y2019/constants.cc
@@ -145,7 +145,7 @@
r->camera_noise_parameters = {.max_viewable_distance = 10.0,
.heading_noise = 0.1,
.nominal_distance_noise = 0.15,
- .nominal_skew_noise = 0.45,
+ .nominal_skew_noise = 0.75,
.nominal_height_noise = 0.01};
// Deliberately make FOV a bit large so that we are overly conservative in
@@ -178,10 +178,10 @@
break;
case kCompTeamNumber:
- elevator_params->zeroing_constants.measured_absolute_position = 0.160736;
+ elevator_params->zeroing_constants.measured_absolute_position = 0.152217;
elevator->potentiometer_offset =
-0.075017 + 0.015837 + 0.009793 - 0.012017 + 0.019915 + 0.010126 +
- 0.005541 + 0.006088 - 0.039687 + 0.005843;
+ 0.005541 + 0.006088 - 0.039687 + 0.005843 + 0.009007;
intake->zeroing_constants.measured_absolute_position = 1.860016;
@@ -194,16 +194,16 @@
break;
case kPracticeTeamNumber:
- elevator_params->zeroing_constants.measured_absolute_position = 0.147809;
- elevator->potentiometer_offset = -0.022320 + 0.020567 - 0.022355 - 0.006497 + 0.019690;
+ elevator_params->zeroing_constants.measured_absolute_position = 0.131806;
+ elevator->potentiometer_offset = -0.022320 + 0.020567 - 0.022355 - 0.006497 + 0.019690 + 0.009151 - 0.007513 + 0.007311;
- intake->zeroing_constants.measured_absolute_position = 1.756847;
+ intake->zeroing_constants.measured_absolute_position = 1.928755;
wrist_params->zeroing_constants.measured_absolute_position = 0.192576;
wrist->potentiometer_offset = -4.200894 - 0.187134;
- stilts_params->zeroing_constants.measured_absolute_position = 0.043580;
- stilts->potentiometer_offset = -0.093820 + 0.0124 - 0.008334 + 0.004507;
+ stilts_params->zeroing_constants.measured_absolute_position = 0.050550;
+ stilts->potentiometer_offset = -0.093820 + 0.0124 - 0.008334 + 0.004507 - 0.007973 + -0.001221;
FillCameraPoses(vision::PracticeBotTeensyId(), &r->cameras);
break;
@@ -315,42 +315,42 @@
constexpr double kPortZ = 1.00;
constexpr double kDiscRadius = InchToMeters(19.0 / 2.0);
- // radius to use for placing the ball (not necessarily the radius of the ball
- // itself...).
- constexpr double kBallRadius = 0.05;
constexpr Target::GoalType kBothGoal = Target::GoalType::kBoth;
constexpr Target::GoalType kBallGoal = Target::GoalType::kBalls;
constexpr Target::GoalType kDiscGoal = Target::GoalType::kHatches;
constexpr Target::GoalType kNoneGoal = Target::GoalType::kNone;
+ using TargetType = Target::TargetType;
const Target far_side_cargo_bay(
{{kFarSideCargoBayX, kSideCargoBayY, kNormalZ}, kSideCargoBayTheta},
- kDiscRadius, kBothGoal);
+ kDiscRadius, TargetType::kFarSideCargoBay, kBothGoal);
const Target mid_side_cargo_bay(
{{kMidSideCargoBayX, kSideCargoBayY, kNormalZ}, kSideCargoBayTheta},
- kDiscRadius, kBothGoal);
+ kDiscRadius, TargetType::kMidSideCargoBay, kBothGoal);
const Target near_side_cargo_bay(
{{kNearSideCargoBayX, kSideCargoBayY, kNormalZ}, kSideCargoBayTheta},
- kDiscRadius, kBothGoal);
+ kDiscRadius, TargetType::kNearSideCargoBay, kBothGoal);
const Target face_cargo_bay(
{{kFaceCargoBayX, kFaceCargoBayY, kNormalZ}, kFaceCargoBayTheta},
- kDiscRadius, kBothGoal);
+ kDiscRadius, TargetType::kFaceCargoBay, kBothGoal);
+ // The rocket port, since it is only for balls, has no meaningful radius
+ // to work with (and is over-ridden with zero in target_selector).
const Target rocket_port(
- {{kRocketPortX, kRocketPortY, kPortZ}, kRocketPortTheta}, kBallRadius,
- kBallGoal);
+ {{kRocketPortX, kRocketPortY, kPortZ}, kRocketPortTheta}, 0.0,
+ TargetType::kRocketPortal, kBallGoal);
const Target rocket_near(
{{kRocketNearX, kRocketHatchY, kNormalZ}, kRocketNearTheta}, kDiscRadius,
- kDiscGoal);
+ TargetType::kNearRocket, kDiscGoal);
const Target rocket_far(
{{kRocketFarX, kRocketHatchY, kNormalZ}, kRocketFarTheta}, kDiscRadius,
- kDiscGoal);
+ TargetType::kFarRocket, kDiscGoal);
const Target hp_slot({{0.0, kHpSlotY, kNormalZ}, kHpSlotTheta}, 0.00,
- kBothGoal);
+ TargetType::kHPSlot, kBothGoal);
const ::std::array<Target, 8> quarter_field_targets{
{far_side_cargo_bay, mid_side_cargo_bay, near_side_cargo_bay,
diff --git a/y2019/control_loops/drivetrain/BUILD b/y2019/control_loops/drivetrain/BUILD
index 5a4dd40..49cda13 100644
--- a/y2019/control_loops/drivetrain/BUILD
+++ b/y2019/control_loops/drivetrain/BUILD
@@ -84,6 +84,14 @@
)
queue_library(
+ name = "target_selector_queue",
+ srcs = [
+ "target_selector.q",
+ ],
+ visibility = ["//visibility:public"],
+)
+
+queue_library(
name = "camera_queue",
srcs = [
"camera.q",
@@ -126,9 +134,11 @@
hdrs = ["target_selector.h"],
deps = [
":camera",
+ ":target_selector_queue",
"//frc971/control_loops:pose",
"//frc971/control_loops/drivetrain:localizer",
"//y2019:constants",
+ "//y2019/control_loops/superstructure:superstructure_queue",
],
)
@@ -138,6 +148,7 @@
deps = [
":target_selector",
"//aos/testing:googletest",
+ "//aos/testing:test_shm",
],
)
diff --git a/y2019/control_loops/drivetrain/camera.h b/y2019/control_loops/drivetrain/camera.h
index 73079c9..e21bf87 100644
--- a/y2019/control_loops/drivetrain/camera.h
+++ b/y2019/control_loops/drivetrain/camera.h
@@ -48,9 +48,24 @@
// Spots for both (cargo ship, human loading).
kBoth,
};
+ // Which target this is within a given field quadrant:
+ enum class TargetType {
+ kHPSlot,
+ kFaceCargoBay,
+ kNearSideCargoBay,
+ kMidSideCargoBay,
+ kFarSideCargoBay,
+ kNearRocket,
+ kFarRocket,
+ kRocketPortal,
+ };
TypedTarget(const Pose &pose, double radius = 0,
+ TargetType target_type = TargetType::kHPSlot,
GoalType goal_type = GoalType::kBoth)
- : pose_(pose), radius_(radius), goal_type_(goal_type) {}
+ : pose_(pose),
+ radius_(radius),
+ target_type_(target_type),
+ goal_type_(goal_type) {}
TypedTarget() {}
Pose pose() const { return pose_; }
Pose *mutable_pose() { return &pose_; }
@@ -60,6 +75,8 @@
double radius() const { return radius_; }
GoalType goal_type() const { return goal_type_; }
void set_goal_type(GoalType goal_type) { goal_type_ = goal_type; }
+ TargetType target_type() const { return target_type_; }
+ void set_target_type(TargetType target_type) { target_type_ = target_type; }
// Get a list of points for plotting. These points should be plotted on
// an x/y plane in the global frame with lines connecting the points.
@@ -89,6 +106,7 @@
// TODO(james): We may actually want a non-zero (possibly negative?) number
// here for balls.
double radius_ = 0.0;
+ TargetType target_type_ = TargetType::kHPSlot;
GoalType goal_type_ = GoalType::kBoth;
}; // class TypedTarget
diff --git a/y2019/control_loops/drivetrain/camera_test.cc b/y2019/control_loops/drivetrain/camera_test.cc
index 347e84c..f9b6e8d 100644
--- a/y2019/control_loops/drivetrain/camera_test.cc
+++ b/y2019/control_loops/drivetrain/camera_test.cc
@@ -8,7 +8,8 @@
// Check that a Target's basic operations work.
TEST(TargetTest, BasicTargetTest) {
- Target target({{1, 2, 3}, M_PI / 2.0}, 1.234, Target::GoalType::kHatches);
+ Target target({{1, 2, 3}, M_PI / 2.0}, 1.234,
+ Target::TargetType::kFaceCargoBay, Target::GoalType::kHatches);
EXPECT_EQ(1.0, target.pose().abs_pos().x());
EXPECT_EQ(2.0, target.pose().abs_pos().y());
@@ -16,6 +17,7 @@
EXPECT_EQ(M_PI / 2.0, target.pose().abs_theta());
EXPECT_EQ(1.234, target.radius());
EXPECT_EQ(Target::GoalType::kHatches, target.goal_type());
+ EXPECT_EQ(Target::TargetType::kFaceCargoBay, target.target_type());
EXPECT_FALSE(target.occluded());
target.set_occluded(true);
diff --git a/y2019/control_loops/drivetrain/event_loop_localizer.cc b/y2019/control_loops/drivetrain/event_loop_localizer.cc
index 9403b2e..889133f 100644
--- a/y2019/control_loops/drivetrain/event_loop_localizer.cc
+++ b/y2019/control_loops/drivetrain/event_loop_localizer.cc
@@ -25,22 +25,28 @@
}
EventLoopLocalizer::EventLoopLocalizer(
- const ::frc971::control_loops::drivetrain::DrivetrainConfig<double>
- &dt_config,
+ const ::frc971::control_loops::drivetrain::DrivetrainConfig<double> &
+ dt_config,
::aos::EventLoop *event_loop)
: event_loop_(event_loop),
cameras_(MakeCameras(&robot_pose_)),
- localizer_(dt_config, &robot_pose_) {
+ localizer_(dt_config, &robot_pose_),
+ target_selector_(event_loop) {
localizer_.ResetInitialState(::aos::monotonic_clock::now(),
Localizer::State::Zero(), localizer_.P());
- ResetPosition(::aos::monotonic_clock::now(), 0.5, 3.4, 0.0);
+ ResetPosition(::aos::monotonic_clock::now(), 0.5, 3.4, 0.0, 0.0, true);
frame_fetcher_ = event_loop_->MakeFetcher<CameraFrame>(
".y2019.control_loops.drivetrain.camera_frames");
}
void EventLoopLocalizer::Reset(::aos::monotonic_clock::time_point now,
- const Localizer::State &state) {
- localizer_.ResetInitialState(now, state, localizer_.P());
+ const Localizer::State &state,
+ double theta_uncertainty) {
+ Localizer::StateSquare newP = localizer_.P();
+ if (theta_uncertainty > 0.0) {
+ newP(StateIdx::kTheta, StateIdx::kTheta) = theta_uncertainty;
+ }
+ localizer_.ResetInitialState(now, state, newP);
}
void EventLoopLocalizer::Update(
diff --git a/y2019/control_loops/drivetrain/event_loop_localizer.h b/y2019/control_loops/drivetrain/event_loop_localizer.h
index 6d5ca29..183e817 100644
--- a/y2019/control_loops/drivetrain/event_loop_localizer.h
+++ b/y2019/control_loops/drivetrain/event_loop_localizer.h
@@ -34,15 +34,18 @@
::aos::EventLoop *event_loop);
void Reset(::aos::monotonic_clock::time_point t,
- const Localizer::State &state);
+ const Localizer::State &state, double theta_uncertainty);
void ResetPosition(::aos::monotonic_clock::time_point t, double x, double y,
- double theta) override {
+ double theta, double theta_uncertainty,
+ bool reset_theta) override {
// When we reset the state, we want to keep the encoder positions intact, so
// we copy from the original state and reset everything else.
Localizer::State new_state = localizer_.X_hat();
new_state.x() = x;
new_state.y() = y;
- new_state(2, 0) = theta;
+ if (reset_theta) {
+ new_state(2, 0) = theta;
+ }
// Velocity terms.
new_state(4, 0) = 0.0;
new_state(6, 0) = 0.0;
@@ -50,7 +53,8 @@
new_state(7, 0) = 0.0;
new_state(8, 0) = 0.0;
new_state(9, 0) = 0.0;
- Reset(t, new_state);
+
+ Reset(t, new_state, theta_uncertainty);
}
void Update(const ::Eigen::Matrix<double, 2, 1> &U,
diff --git a/y2019/control_loops/drivetrain/localized_drivetrain_test.cc b/y2019/control_loops/drivetrain/localized_drivetrain_test.cc
index b405588..c6928e0 100644
--- a/y2019/control_loops/drivetrain/localized_drivetrain_test.cc
+++ b/y2019/control_loops/drivetrain/localized_drivetrain_test.cc
@@ -71,7 +71,7 @@
localizer_state;
localizer_state.setZero();
localizer_state.block<3, 1>(0, 0) = xytheta;
- localizer_.Reset(monotonic_clock::now(), localizer_state);
+ localizer_.Reset(monotonic_clock::now(), localizer_state, 0.0);
}
void RunIteration() {
diff --git a/y2019/control_loops/drivetrain/localizer.h b/y2019/control_loops/drivetrain/localizer.h
index 58b6901..1571fec 100644
--- a/y2019/control_loops/drivetrain/localizer.h
+++ b/y2019/control_loops/drivetrain/localizer.h
@@ -100,7 +100,7 @@
// The threshold to use for completely rejecting potentially bad target
// matches.
// TODO(james): Tune
- static constexpr Scalar kRejectionScore = 1000000.0;
+ static constexpr Scalar kRejectionScore = 1.0;
// Checks that the targets coming in make some sense--mostly to prevent NaNs
// or the such from propagating.
diff --git a/y2019/control_loops/drivetrain/localizer_test.cc b/y2019/control_loops/drivetrain/localizer_test.cc
index 281abdc..d008d54 100644
--- a/y2019/control_loops/drivetrain/localizer_test.cc
+++ b/y2019/control_loops/drivetrain/localizer_test.cc
@@ -410,7 +410,7 @@
// interest here are that we (a) stop adding disturbances at the very end of
// the trajectory, to allow us to actually converge to the goal, and (b)
// scale disturbances by the corruent velocity.
- if (GetParam().disturb && i % 50 == 0) {
+ if (GetParam().disturb && i % 75 == 0) {
// Scale the disturbance so that when we have near-zero velocity we don't
// have much disturbance.
double disturbance_scale = ::std::min(
@@ -478,7 +478,7 @@
GetParam().estimate_tolerance);
// Check that none of the states that we actually care about (x/y/theta, and
// wheel positions/speeds) are too far off, individually:
- EXPECT_LT(estimate_err.template topRows<7>().cwiseAbs().maxCoeff(),
+ EXPECT_LT(estimate_err.template topRows<3>().cwiseAbs().maxCoeff(),
GetParam().estimate_tolerance / 3.0)
<< "Estimate error: " << estimate_err.transpose();
Eigen::Matrix<double, 5, 1> final_trajectory_state;
@@ -582,7 +582,7 @@
.finished(),
/*noisify=*/false,
/*disturb=*/true,
- /*estimate_tolerance=*/2e-2,
+ /*estimate_tolerance=*/2.5e-2,
/*goal_tolerance=*/0.15,
}),
// Add noise and some initial error in addition:
@@ -597,7 +597,7 @@
.finished(),
/*noisify=*/true,
/*disturb=*/true,
- /*estimate_tolerance=*/0.15,
+ /*estimate_tolerance=*/0.2,
/*goal_tolerance=*/0.5,
}),
// Try another spline, just in case the one I was using is special for
@@ -614,7 +614,9 @@
.finished(),
/*noisify=*/true,
/*disturb=*/false,
- /*estimate_tolerance=*/0.25,
+ // TODO(james): Improve tests so that we aren't constantly
+ // readjusting the tolerances up.
+ /*estimate_tolerance=*/0.3,
/*goal_tolerance=*/0.7,
})));
diff --git a/y2019/control_loops/drivetrain/target_selector.cc b/y2019/control_loops/drivetrain/target_selector.cc
index b7b7448..7b6918a 100644
--- a/y2019/control_loops/drivetrain/target_selector.cc
+++ b/y2019/control_loops/drivetrain/target_selector.cc
@@ -5,17 +5,35 @@
constexpr double TargetSelector::kFakeFov;
-TargetSelector::TargetSelector()
+TargetSelector::TargetSelector(::aos::EventLoop *event_loop)
: front_viewer_({&robot_pose_, {0.0, 0.0, 0.0}, 0.0}, kFakeFov, fake_noise_,
constants::Field().targets(), {}),
back_viewer_({&robot_pose_, {0.0, 0.0, 0.0}, M_PI}, kFakeFov, fake_noise_,
- constants::Field().targets(), {}) {}
+ constants::Field().targets(), {}),
+ hint_fetcher_(event_loop->MakeFetcher<drivetrain::TargetSelectorHint>(
+ ".y2019.control_loops.drivetrain.target_selector_hint")),
+ superstructure_goal_fetcher_(event_loop->MakeFetcher<
+ superstructure::SuperstructureQueue::Goal>(
+ ".y2019.control_loops.superstructure.superstructure_queue.goal")) {}
bool TargetSelector::UpdateSelection(const ::Eigen::Matrix<double, 5, 1> &state,
double command_speed) {
if (::std::abs(command_speed) < kMinDecisionSpeed) {
return false;
}
+ if (superstructure_goal_fetcher_.Fetch()) {
+ ball_mode_ = superstructure_goal_fetcher_->suction.gamepiece_mode == 0;
+ }
+ if (hint_fetcher_.Fetch()) {
+ LOG_STRUCT(DEBUG, "selector_hint", *hint_fetcher_);
+ // suggested_target is unsigned so we don't check for >= 0.
+ if (hint_fetcher_->suggested_target < 4) {
+ target_hint_ =
+ static_cast<SelectionHint>(hint_fetcher_->suggested_target);
+ } else {
+ LOG(ERROR, "Got invalid suggested target.\n");
+ }
+ }
*robot_pose_.mutable_pos() << state.x(), state.y(), 0.0;
robot_pose_.set_theta(state(2, 0));
::aos::SizedArray<FakeCamera::TargetView,
@@ -40,12 +58,37 @@
// of the field).
// TODO(james): Support ball vs. hatch mode filtering.
if (view.target->goal_type() == Target::GoalType::kNone ||
- view.target->goal_type() == Target::GoalType::kBalls) {
+ view.target->goal_type() == (ball_mode_ ? Target::GoalType::kHatches
+ : Target::GoalType::kBalls)) {
continue;
}
+ switch (target_hint_) {
+ case SelectionHint::kNearShip:
+ if (view.target->target_type() !=
+ Target::TargetType::kNearSideCargoBay) {
+ continue;
+ }
+ break;
+ case SelectionHint::kMidShip:
+ if (view.target->target_type() !=
+ Target::TargetType::kMidSideCargoBay) {
+ continue;
+ }
+ break;
+ case SelectionHint::kFarShip:
+ if (view.target->target_type() !=
+ Target::TargetType::kFarSideCargoBay) {
+ continue;
+ }
+ break;
+ case SelectionHint::kNone:
+ default:
+ break;
+ }
if (view.noise.distance < largest_target_noise) {
target_pose_ = view.target->pose();
- target_radius_ = view.target->radius();
+ // If we are in ball mode, use a radius of zero.
+ target_radius_ = ball_mode_ ? 0.0 : view.target->radius();
largest_target_noise = view.noise.distance;
}
}
diff --git a/y2019/control_loops/drivetrain/target_selector.h b/y2019/control_loops/drivetrain/target_selector.h
index 7d09306..0086f5d 100644
--- a/y2019/control_loops/drivetrain/target_selector.h
+++ b/y2019/control_loops/drivetrain/target_selector.h
@@ -5,6 +5,8 @@
#include "frc971/control_loops/drivetrain/localizer.h"
#include "y2019/constants.h"
#include "y2019/control_loops/drivetrain/camera.h"
+#include "y2019/control_loops/drivetrain/target_selector.q.h"
+#include "y2019/control_loops/superstructure/superstructure.q.h"
namespace y2019 {
namespace control_loops {
@@ -27,7 +29,16 @@
typedef TypedCamera<y2019::constants::Field::kNumTargets,
/*num_obstacles=*/0, double> FakeCamera;
- TargetSelector();
+ enum class SelectionHint {
+ // No hint
+ kNone = 0,
+ // Cargo ship bays
+ kNearShip = 1,
+ kMidShip = 2,
+ kFarShip = 3,
+ };
+
+ TargetSelector(::aos::EventLoop *event_loop);
bool UpdateSelection(const ::Eigen::Matrix<double, 5, 1> &state,
double command_speed) override;
@@ -36,10 +47,10 @@
double TargetRadius() const override { return target_radius_; }
private:
- static constexpr double kFakeFov = M_PI * 0.7;
+ static constexpr double kFakeFov = M_PI * 0.9;
// Longitudinal speed at which the robot must be going in order for us to make
// a decision.
- static constexpr double kMinDecisionSpeed = 0.7; // m/s
+ static constexpr double kMinDecisionSpeed = 0.3; // m/s
Pose robot_pose_;
Pose target_pose_;
double target_radius_;
@@ -54,6 +65,14 @@
.nominal_height_noise = 0};
FakeCamera front_viewer_;
FakeCamera back_viewer_;
+
+ ::aos::Fetcher<drivetrain::TargetSelectorHint> hint_fetcher_;
+ ::aos::Fetcher<superstructure::SuperstructureQueue::Goal>
+ superstructure_goal_fetcher_;
+
+ // Whether we are currently in ball mode.
+ bool ball_mode_ = false;
+ SelectionHint target_hint_ = SelectionHint::kNone;
};
} // namespace control_loops
diff --git a/y2019/control_loops/drivetrain/target_selector.q b/y2019/control_loops/drivetrain/target_selector.q
new file mode 100644
index 0000000..c917d39
--- /dev/null
+++ b/y2019/control_loops/drivetrain/target_selector.q
@@ -0,0 +1,12 @@
+package y2019.control_loops.drivetrain;
+
+// A message to provide information to the target selector about what it should
+message TargetSelectorHint {
+ // Which target we should go for:
+ // 0 implies no selection, we should just default to whatever.
+ // 1, 2, and 3 imply the near, middle, and far targets.
+ // These should match the SelectionHint enum in target_selector.h.
+ uint8_t suggested_target;
+};
+
+queue TargetSelectorHint target_selector_hint;
diff --git a/y2019/control_loops/drivetrain/target_selector_test.cc b/y2019/control_loops/drivetrain/target_selector_test.cc
index 20bf19a..aa655e6 100644
--- a/y2019/control_loops/drivetrain/target_selector_test.cc
+++ b/y2019/control_loops/drivetrain/target_selector_test.cc
@@ -1,6 +1,8 @@
#include "y2019/control_loops/drivetrain/target_selector.h"
+#include "aos/testing/test_shm.h"
#include "gtest/gtest.h"
+#include "y2019/control_loops/superstructure/superstructure.q.h"
namespace y2019 {
namespace control_loops {
@@ -8,12 +10,15 @@
typedef ::frc971::control_loops::TypedPose<double> Pose;
typedef ::Eigen::Matrix<double, 5, 1> State;
+using SelectionHint = TargetSelector::SelectionHint;
namespace {
// Accessors to get some useful particular targets on the field:
Pose HPSlotLeft() { return constants::Field().targets()[7].pose(); }
Pose CargoNearLeft() { return constants::Field().targets()[2].pose(); }
Pose RocketHatchFarLeft() { return constants::Field().targets()[6].pose(); }
+Pose RocketPortal() { return constants::Field().targets()[4].pose(); }
+double HatchRadius() { return constants::Field().targets()[6].radius(); }
} // namespace
// Tests the target selector with:
@@ -23,14 +28,40 @@
// -If (1) is true, the pose we expect to get back.
struct TestParams {
State state;
+ bool ball_mode;
+ SelectionHint selection_hint;
double command_speed;
bool expect_target;
Pose expected_pose;
+ double expected_radius;
};
-class TargetSelectorParamTest : public ::testing::TestWithParam<TestParams> {};
+class TargetSelectorParamTest : public ::testing::TestWithParam<TestParams> {
+ protected:
+ virtual void TearDown() override {
+ ::y2019::control_loops::superstructure::superstructure_queue.goal.Clear();
+ ::y2019::control_loops::drivetrain::target_selector_hint.Clear();
+ }
+ ::aos::ShmEventLoop event_loop_;
+
+ private:
+ ::aos::testing::TestSharedMemory my_shm_;
+};
TEST_P(TargetSelectorParamTest, ExpectReturn) {
- TargetSelector selector;
+ TargetSelector selector(&event_loop_);
+ {
+ auto super_goal =
+ ::y2019::control_loops::superstructure::superstructure_queue.goal
+ .MakeMessage();
+ super_goal->suction.gamepiece_mode = GetParam().ball_mode ? 0 : 1;
+ ASSERT_TRUE(super_goal.Send());
+ }
+ {
+ auto hint =
+ ::y2019::control_loops::drivetrain::target_selector_hint.MakeMessage();
+ hint->suggested_target = static_cast<int>(GetParam().selection_hint);
+ ASSERT_TRUE(hint.Send());
+ }
bool expect_target = GetParam().expect_target;
const State state = GetParam().state;
ASSERT_EQ(expect_target,
@@ -49,6 +80,8 @@
<< " but got " << actual_pos.transpose() << " with the robot at "
<< state.transpose();
EXPECT_EQ(expected_angle, actual_angle);
+ EXPECT_EQ(GetParam().expected_radius, selector.TargetRadius());
+ EXPECT_EQ(expected_angle, actual_angle);
}
}
@@ -57,42 +90,82 @@
::testing::Values(
// When we are far away from anything, we should not register any
// targets:
- TestParams{
- (State() << 0.0, 0.0, 0.0, 1.0, 1.0).finished(), 1.0, false, {}},
+ TestParams{(State() << 0.0, 0.0, 0.0, 1.0, 1.0).finished(),
+ /*ball_mode=*/false,
+ SelectionHint::kNone,
+ 1.0,
+ false,
+ {},
+ /*expected_radius=*/0.0},
// Aim for a human-player spot; at low speeds we should not register
// anything.
TestParams{(State() << 4.0, 2.0, M_PI, 0.05, 0.05).finished(),
+ /*ball_mode=*/false,
+ SelectionHint::kNone,
0.05,
false,
- {}},
+ {},
+ /*expected_radius=*/0.0},
TestParams{(State() << 4.0, 2.0, M_PI, -0.05, -0.05).finished(),
+ /*ball_mode=*/false,
+ SelectionHint::kNone,
-0.05,
false,
- {}},
- TestParams{(State() << 4.0, 2.0, M_PI, 0.5, 0.5).finished(), 1.0, true,
- HPSlotLeft()},
+ {},
+ /*expected_radius=*/0.0},
+ TestParams{(State() << 4.0, 2.0, M_PI, 0.5, 0.5).finished(),
+ /*ball_mode=*/false, SelectionHint::kNone, 1.0, true,
+ HPSlotLeft(), /*expected_radius=*/0.0},
// Put ourselves between the rocket and cargo ship; we should see the
// hatches driving one direction and the near cargo ship port the other.
// We also command a speed opposite the current direction of motion and
// confirm that that behaves as expected.
- TestParams{(State() << 6.0, 2.0, -M_PI_2, -0.5, -0.5).finished(), 1.0,
- true, CargoNearLeft()},
- TestParams{(State() << 6.0, 2.0, M_PI_2, 0.5, 0.5).finished(), -1.0,
- true, CargoNearLeft()},
- TestParams{(State() << 6.0, 2.0, -M_PI_2, 0.5, 0.5).finished(), -1.0,
- true, RocketHatchFarLeft()},
- TestParams{(State() << 6.0, 2.0, M_PI_2, -0.5, -0.5).finished(), 1.0,
- true, RocketHatchFarLeft()},
+ TestParams{(State() << 6.0, 2.0, -M_PI_2, -0.5, -0.5).finished(),
+ /*ball_mode=*/false, SelectionHint::kNone, 1.0, true,
+ CargoNearLeft(), /*expected_radius=*/HatchRadius()},
+ TestParams{(State() << 6.0, 2.0, M_PI_2, 0.5, 0.5).finished(),
+ /*ball_mode=*/false, SelectionHint::kNone, -1.0, true,
+ CargoNearLeft(), /*expected_radius=*/HatchRadius()},
+ TestParams{(State() << 6.0, 2.0, -M_PI_2, 0.5, 0.5).finished(),
+ /*ball_mode=*/false, SelectionHint::kNone, -1.0, true,
+ RocketHatchFarLeft(), /*expected_radius=*/HatchRadius()},
+ TestParams{(State() << 6.0, 2.0, M_PI_2, -0.5, -0.5).finished(),
+ /*ball_mode=*/false, SelectionHint::kNone, 1.0, true,
+ RocketHatchFarLeft(), /*expected_radius=*/HatchRadius()},
// And we shouldn't see anything spinning in place:
TestParams{(State() << 6.0, 2.0, M_PI_2, -0.5, 0.5).finished(),
+ /*ball_mode=*/false,
+ SelectionHint::kNone,
0.0,
false,
- {}},
+ {},
+ /*expected_radius=*/0.0},
// Drive backwards off the field--we should not see anything.
TestParams{(State() << -0.1, 0.0, 0.0, -0.5, -0.5).finished(),
+ /*ball_mode=*/false,
+ SelectionHint::kNone,
-1.0,
false,
- {}}));
+ {},
+ /*expected_radius=*/0.0},
+ // In ball mode, we should be able to see the portal, and get zero
+ // radius.
+ TestParams{(State() << 6.0, 2.0, M_PI_2, 0.5, 0.5).finished(),
+ /*ball_mode=*/true,
+ SelectionHint::kNone,
+ 1.0,
+ true,
+ RocketPortal(),
+ /*expected_radius=*/0.0},
+ // Reversing direction should get cargo ship with zero radius.
+ TestParams{(State() << 6.0, 2.0, M_PI_2, 0.5, 0.5).finished(),
+ /*ball_mode=*/true,
+ SelectionHint::kNone,
+ -1.0,
+ true,
+ CargoNearLeft(),
+ /*expected_radius=*/0.0}
+ ));
} // namespace testing
} // namespace control_loops
diff --git a/y2019/control_loops/python/elevator.py b/y2019/control_loops/python/elevator.py
index 5859814..0a4e208 100755
--- a/y2019/control_loops/python/elevator.py
+++ b/y2019/control_loops/python/elevator.py
@@ -31,15 +31,20 @@
kalman_q_voltage=35.0,
kalman_r_position=0.05)
+kElevatorBall = copy.copy(kElevator)
+kElevatorBall.q_pos = 0.15
+kElevatorBall.q_vel = 1.5
+
kElevatorModel = copy.copy(kElevator)
kElevatorModel.mass = carriage_mass + first_stage_mass + 1.0
+
def main(argv):
if FLAGS.plot:
R = numpy.matrix([[1.5], [0.0]])
- linear_system.PlotKick(kElevator, R, plant_params=kElevatorModel)
+ linear_system.PlotKick(kElevatorBall, R, plant_params=kElevatorModel)
linear_system.PlotMotion(
- kElevator, R, max_velocity=5.0, plant_params=kElevatorModel)
+ kElevatorBall, R, max_velocity=5.0, plant_params=kElevatorModel)
# Write the generated constants out to a file.
if len(argv) != 5:
@@ -48,8 +53,8 @@
)
else:
namespaces = ['y2019', 'control_loops', 'superstructure', 'elevator']
- linear_system.WriteLinearSystem(kElevator, argv[1:3], argv[3:5],
- namespaces)
+ linear_system.WriteLinearSystem([kElevator, kElevatorBall, kElevator],
+ argv[1:3], argv[3:5], namespaces)
if __name__ == '__main__':
diff --git a/y2019/control_loops/python/wrist.py b/y2019/control_loops/python/wrist.py
index 66b7b26..127def7 100755
--- a/y2019/control_loops/python/wrist.py
+++ b/y2019/control_loops/python/wrist.py
@@ -29,7 +29,7 @@
name='Wrist',
motor=control_loop.BAG(),
G=(6.0 / 60.0) * (20.0 / 100.0) * (24.0 / 84.0),
- J=0.27,
+ J=0.30,
q_pos=0.20,
q_vel=5.0,
kalman_q_pos=0.12,
@@ -37,6 +37,14 @@
kalman_q_voltage=4.0,
kalman_r_position=0.05)
+kWristBall = copy.copy(kWrist)
+kWristBall.J = 0.4007
+kWristBall.q_pos = 0.55
+kWristBall.q_vel = 5.0
+
+kWristPanel = copy.copy(kWrist)
+kWristPanel.J = 0.446
+
kWristModel = copy.copy(kWrist)
kWristModel.J = 0.1348
@@ -44,8 +52,8 @@
def main(argv):
if FLAGS.plot:
R = numpy.matrix([[numpy.pi / 2.0], [0.0]])
- angular_system.PlotKick(kWrist, R, plant_params=kWristModel)
- angular_system.PlotMotion(kWrist, R, plant_params=kWristModel)
+ angular_system.PlotKick(kWristBall, R, plant_params=kWristBall)
+ angular_system.PlotMotion(kWristBall, R, plant_params=kWristBall)
# Write the generated constants out to a file.
if len(argv) != 5:
@@ -54,8 +62,8 @@
)
else:
namespaces = ['y2019', 'control_loops', 'superstructure', 'wrist']
- angular_system.WriteAngularSystem(kWrist, argv[1:3], argv[3:5],
- namespaces)
+ angular_system.WriteAngularSystem([kWrist, kWristBall, kWristPanel],
+ argv[1:3], argv[3:5], namespaces)
if __name__ == '__main__':
diff --git a/y2019/control_loops/superstructure/collision_avoidance.h b/y2019/control_loops/superstructure/collision_avoidance.h
index 90a45f6..364836a 100644
--- a/y2019/control_loops/superstructure/collision_avoidance.h
+++ b/y2019/control_loops/superstructure/collision_avoidance.h
@@ -59,7 +59,7 @@
static constexpr double kElevatorClearIntakeHeight = 0.4;
// Angle constraints for the wrist when below kElevatorClearDownHeight
- static constexpr double kWristMaxAngle = M_PI / 2.0 + 0.05;
+ static constexpr double kWristMaxAngle = M_PI / 2.0 + 0.15;
static constexpr double kWristMinAngle = -M_PI / 2.0 - 0.25;
// Angles outside of which the intake is fully clear of the wrist.
diff --git a/y2019/control_loops/superstructure/superstructure.cc b/y2019/control_loops/superstructure/superstructure.cc
index a9c7ce1..b6ad9e8 100644
--- a/y2019/control_loops/superstructure/superstructure.cc
+++ b/y2019/control_loops/superstructure/superstructure.cc
@@ -83,6 +83,19 @@
}
}
+ if (unsafe_goal) {
+ if (!unsafe_goal->suction.grab_piece) {
+ wrist_.set_controller_index(0);
+ elevator_.set_controller_index(0);
+ } else if (unsafe_goal->suction.gamepiece_mode == 0) {
+ wrist_.set_controller_index(1);
+ elevator_.set_controller_index(1);
+ } else {
+ wrist_.set_controller_index(2);
+ elevator_.set_controller_index(2);
+ }
+ }
+
// TODO(theo) move these up when Iterate() is split
// update the goals
collision_avoidance_.UpdateGoal(status, unsafe_goal);
@@ -103,10 +116,16 @@
} else if (::frc971::control_loops::drivetrain_queue.status.get() &&
::frc971::control_loops::drivetrain_queue.status
->line_follow_logging.frozen) {
- // Vision align is flashing white.
+ // Vision align is flashing white for button pressed, purple for target
+ // acquired.
++line_blink_count_;
if (line_blink_count_ < 20) {
- SendColors(1.0, 1.0, 1.0);
+ if (::frc971::control_loops::drivetrain_queue.status
+ ->line_follow_logging.have_target) {
+ SendColors(1.0, 0.0, 1.0);
+ } else {
+ SendColors(1.0, 1.0, 1.0);
+ }
} else {
// And then flash with green if we have a game piece.
if (status->has_piece) {
diff --git a/y2019/control_loops/superstructure/superstructure.q b/y2019/control_loops/superstructure/superstructure.q
index d5c8a73..f78bd5a 100644
--- a/y2019/control_loops/superstructure/superstructure.q
+++ b/y2019/control_loops/superstructure/superstructure.q
@@ -72,6 +72,12 @@
// Position of the stilts, 0 when retracted (defualt), positive lifts robot.
.frc971.PotAndAbsolutePosition stilts;
+
+ // True if the platform detection sensors detect the platform directly
+ // below the robot right behind the left and right wheels. Useful for
+ // determining when the robot is all the way on the platform.
+ bool platform_left_detect;
+ bool platform_right_detect;
};
message Output {
diff --git a/y2019/image_streamer/flip_image.cc b/y2019/image_streamer/flip_image.cc
index 2db20b2..48a18c5 100644
--- a/y2019/image_streamer/flip_image.cc
+++ b/y2019/image_streamer/flip_image.cc
@@ -10,7 +10,9 @@
::cimg_library::CImg<unsigned char> image;
image.load_jpeg_buffer((JOCTET *)(input), input_size);
if (flip) {
- image.mirror("xy");
+ image.rotate(90);
+ } else {
+ image.rotate(270);
}
image.save_jpeg_buffer(buffer, *buffer_size, 80);
diff --git a/y2019/jevois/BUILD b/y2019/jevois/BUILD
index afca4ef..599bcba 100644
--- a/y2019/jevois/BUILD
+++ b/y2019/jevois/BUILD
@@ -189,7 +189,6 @@
"cobs.h",
],
deps = [
- "//aos/logging",
"//third_party/GSL",
],
)
diff --git a/y2019/jevois/camera/BUILD b/y2019/jevois/camera/BUILD
index e6e33c5..bf716a0 100644
--- a/y2019/jevois/camera/BUILD
+++ b/y2019/jevois/camera/BUILD
@@ -5,19 +5,21 @@
srcs = ["reader.cc"],
hdrs = ["reader.h"],
deps = [
- "//aos/vision/image:reader",
+ "//aos/time",
"//aos/vision/image:camera_params",
"//aos/vision/image:image_types",
- "//aos/logging",
- "//aos/time",
+ "//aos/vision/image:reader",
+ "@com_github_google_glog//:glog",
],
)
cc_library(
name = "image_stream",
+ srcs = ["image_stream.cc"],
hdrs = ["image_stream.h"],
deps = [
- "//aos/vision/events:epoll_events",
":reader",
+ "//aos/logging",
+ "//aos/vision/events:epoll_events",
],
)
diff --git a/y2019/jevois/camera/image_stream.cc b/y2019/jevois/camera/image_stream.cc
new file mode 100644
index 0000000..29a1513
--- /dev/null
+++ b/y2019/jevois/camera/image_stream.cc
@@ -0,0 +1,18 @@
+#include "y2019/jevois/camera/image_stream.h"
+
+#include "aos/logging/logging.h"
+
+namespace y2019 {
+namespace camera {
+
+void ImageStreamEvent::ProcessHelper(
+ aos::vision::DataRef data, aos::monotonic_clock::time_point timestamp) {
+ if (data.size() < 300) {
+ LOG(INFO, "got bad img of size(%d)\n", static_cast<int>(data.size()));
+ return;
+ }
+ ProcessImage(data, timestamp);
+}
+
+} // namespace camera
+} // namespace y2019
diff --git a/y2019/jevois/camera/image_stream.h b/y2019/jevois/camera/image_stream.h
index 62661c6..dc52bd5 100644
--- a/y2019/jevois/camera/image_stream.h
+++ b/y2019/jevois/camera/image_stream.h
@@ -1,5 +1,5 @@
-#ifndef _AOS_VISION_IMAGE_IMAGE_STREAM_H_
-#define _AOS_VISION_IMAGE_IMAGE_STREAM_H_
+#ifndef Y2019_JEVOIS_CAMERA_IMAGE_STREAM_H_
+#define Y2019_JEVOIS_CAMERA_IMAGE_STREAM_H_
#include "aos/vision/events/epoll_events.h"
#include "aos/vision/image/camera_params.pb.h"
@@ -33,23 +33,22 @@
: ImageStreamEvent(GetCamera(fname, this, params)) {}
void ProcessHelper(aos::vision::DataRef data,
- aos::monotonic_clock::time_point timestamp) {
- if (data.size() < 300) {
- LOG(INFO, "got bad img of size(%d)\n", static_cast<int>(data.size()));
- return;
- }
- ProcessImage(data, timestamp);
- }
+ aos::monotonic_clock::time_point timestamp);
virtual void ProcessImage(aos::vision::DataRef data,
aos::monotonic_clock::time_point timestamp) = 0;
void ReadEvent() override { reader_->HandleFrame(); }
+ bool SetExposure(int abs_exp) {
+ return reader_->SetCameraControl(V4L2_CID_EXPOSURE_ABSOLUTE,
+ "V4L2_CID_EXPOSURE_ABSOLUTE", abs_exp);
+ }
+
private:
std::unique_ptr<Reader> reader_;
};
-} // namespace vision
-} // namespace aos
+} // namespace camera
+} // namespace y2019
-#endif // _AOS_VISION_DEBUG_IMAGE_STREAM_H_
+#endif // Y2019_JEVOIS_CAMERA_IMAGE_STREAM_H_
diff --git a/y2019/jevois/camera/reader.cc b/y2019/jevois/camera/reader.cc
index 25b5a3f..14faa24 100644
--- a/y2019/jevois/camera/reader.cc
+++ b/y2019/jevois/camera/reader.cc
@@ -12,8 +12,8 @@
#include <sys/types.h>
#include <unistd.h>
-#include "aos/logging/logging.h"
#include "aos/time/time.h"
+#include "glog/logging.h"
#define CLEAR(x) memset(&(x), 0, sizeof(x))
@@ -45,29 +45,27 @@
: dev_name_(dev_name), process_(std::move(process)), params_(params) {
struct stat st;
if (stat(dev_name.c_str(), &st) == -1) {
- PLOG(FATAL, "Cannot identify '%s'", dev_name.c_str());
+ PLOG(FATAL) << "Cannot identify '" << dev_name << "'";
}
if (!S_ISCHR(st.st_mode)) {
- PLOG(FATAL, "%s is no device\n", dev_name.c_str());
+ PLOG(FATAL) << dev_name << " is no device";
}
fd_ = open(dev_name.c_str(), O_RDWR /* required */ | O_NONBLOCK, 0);
if (fd_ == -1) {
- PLOG(FATAL, "Cannot open '%s'", dev_name.c_str());
+ PLOG(FATAL) << "Cannot open '" << dev_name << "'";
}
Init();
InitMMap();
- LOG(INFO, "Bat Vision Successfully Initialized.\n");
+ LOG(INFO) << "Bat Vision Successfully Initialized.";
}
void Reader::QueueBuffer(v4l2_buffer *buf) {
if (xioctl(fd_, VIDIOC_QBUF, buf) == -1) {
- PLOG(WARNING,
- "ioctl VIDIOC_QBUF(%d, %p)."
- " losing buf #%" PRIu32 "\n",
- fd_, &buf, buf->index);
+ PLOG(WARNING) << "ioctl VIDIOC_QBUF(" << fd_ << ", " << &buf
+ << "). losing buf #" << buf->index;
} else {
++queued_;
}
@@ -81,7 +79,7 @@
if (xioctl(fd_, VIDIOC_DQBUF, &buf) == -1) {
if (errno != EAGAIN) {
- PLOG(ERROR, "ioctl VIDIOC_DQBUF(%d, %p)", fd_, &buf);
+ PLOG(ERROR) << "ioctl VIDIOC_DQBUF(" << fd_ << ", " << &buf << ")";
}
return;
}
@@ -110,15 +108,15 @@
buf.memory = V4L2_MEMORY_MMAP;
buf.index = n;
if (xioctl(fd_, VIDIOC_QUERYBUF, &buf) == -1) {
- PLOG(FATAL, "ioctl VIDIOC_QUERYBUF(%d, %p)", fd_, &buf);
+ PLOG(FATAL) << "ioctl VIDIOC_QUERYBUF(" << fd_ << ", " << &buf << ")";
}
buffers_[n].length = buf.length;
buffers_[n].start = mmap(NULL, buf.length, PROT_READ | PROT_WRITE,
MAP_SHARED, fd_, buf.m.offset);
if (buffers_[n].start == MAP_FAILED) {
- PLOG(FATAL,
- "mmap(NULL, %zd, PROT_READ | PROT_WRITE, MAP_SHARED, %d, %jd)",
- (size_t)buf.length, fd_, static_cast<intmax_t>(buf.m.offset));
+ PLOG(FATAL) << "mmap(NULL, " << buf.length
+ << ", PROT_READ | PROT_WRITE, MAP_SHARED, " << fd_ << ", "
+ << buf.m.offset << ")";
}
}
}
@@ -131,14 +129,14 @@
req.memory = V4L2_MEMORY_MMAP;
if (xioctl(fd_, VIDIOC_REQBUFS, &req) == -1) {
if (EINVAL == errno) {
- LOG(FATAL, "%s does not support memory mapping\n", dev_name_.c_str());
+ LOG(FATAL) << dev_name_ << " does not support memory mapping\n";
} else {
- PLOG(FATAL, "ioctl VIDIOC_REQBUFS(%d, %p)\n", fd_, &req);
+ LOG(FATAL) << "ioctl VIDIOC_REQBUFS(" << fd_ << ", " << &req << ")";
}
}
queued_ = kNumBuffers;
if (req.count != kNumBuffers) {
- LOG(FATAL, "Insufficient buffer memory on %s\n", dev_name_.c_str());
+ LOG(FATAL) << "Insufficient buffer memory on " << dev_name_;
}
}
@@ -153,11 +151,11 @@
r = xioctl(fd_, 0xc00c561b, &getArg);
if (r == 0) {
if (getArg.value == value) {
- LOG(DEBUG, "Camera control %s was already %d\n", name, getArg.value);
+ VLOG(1) << "Camera control " << name << " was already " << getArg.value;
return true;
}
} else if (errno == EINVAL) {
- LOG(DEBUG, "Camera control %s is invalid\n", name);
+ VLOG(1) << "Camera control " << name << " is invalid";
errno = 0;
return false;
}
@@ -167,12 +165,12 @@
// Jevois wants this incorrect number below:.
r = xioctl(fd_, 0xc00c561c, &setArg);
if (r == 0) {
- LOG(DEBUG, "Set camera control %s from %d to %d\n", name, getArg.value,
- value);
+ VLOG(1) << "Set camera control " << name << " from " << getArg.value
+ << " to " << value;
return true;
}
- LOG(DEBUG, "Couldn't set camera control %s to %d", name, value);
+ VLOG(1) << "Couldn't set camera control " << name << " to " << value;
errno = 0;
return false;
}
@@ -181,16 +179,16 @@
v4l2_capability cap;
if (xioctl(fd_, VIDIOC_QUERYCAP, &cap) == -1) {
if (EINVAL == errno) {
- LOG(FATAL, "%s is no V4L2 device\n", dev_name_.c_str());
+ LOG(FATAL) << dev_name_ << " is no V4L2 device";
} else {
- PLOG(FATAL, "ioctl VIDIOC_QUERYCAP(%d, %p)", fd_, &cap);
+ PLOG(FATAL) << "ioctl VIDIOC_QUERYCAP(" << fd_ << ", " << &cap << ")";
}
}
if (!(cap.capabilities & V4L2_CAP_VIDEO_CAPTURE)) {
- LOG(FATAL, "%s is no video capture device\n", dev_name_.c_str());
+ LOG(FATAL) << dev_name_ << " is no video capture device";
}
if (!(cap.capabilities & V4L2_CAP_STREAMING)) {
- LOG(FATAL, "%s does not support streaming i/o\n", dev_name_.c_str());
+ LOG(FATAL) << dev_name_ << " does not support streaming i/o";
}
int camidx = -1;
@@ -208,8 +206,7 @@
}
if (xioctl(fd_, VIDIOC_S_INPUT, &camidx) == -1) {
- LOG(FATAL, "ioctl VIDIOC_S_INPUT(%d) failed with %d: %s\n", fd_, errno,
- strerror(errno));
+ PLOG(FATAL) << "ioctl VIDIOC_S_INPUT(" << fd_ << ") failed";
}
printf("camera idx: %d\n", camidx);
@@ -220,8 +217,7 @@
fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
if (xioctl(fd_, VIDIOC_G_FMT, &fmt) == -1) {
- LOG(FATAL, "ioctl VIDIC_G_FMT(%d, %p) failed with %d: %s\n", fd_, &fmt,
- errno, strerror(errno));
+ PLOG(FATAL) << "ioctl VIDIC_G_FMT(" << fd_ << ", " << &fmt << ") failed";
}
fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -231,8 +227,7 @@
fmt.fmt.pix.field = V4L2_FIELD_NONE;
fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
if (xioctl(fd_, VIDIOC_S_FMT, &fmt) == -1) {
- LOG(FATAL, "ioctl VIDIC_S_FMT(%d, %p) failed with %d: %s\n", fd_, &fmt,
- errno, strerror(errno));
+ PLOG(FATAL) << "ioctl VIDIC_S_FMT(" << fd_ << ", " << &fmt << ") failed";
}
/* Note VIDIOC_S_FMT may change width and height. */
@@ -250,21 +245,21 @@
setfps->parm.capture.timeperframe.numerator = 1;
setfps->parm.capture.timeperframe.denominator = params_.fps();
if (xioctl(fd_, VIDIOC_S_PARM, setfps) == -1) {
- PLOG(FATAL, "ioctl VIDIOC_S_PARM(%d, %p)\n", fd_, setfps);
+ PLOG(FATAL) << "ioctl VIDIOC_S_PARM(" << fd_ << ", " << setfps << ")";
}
- LOG(INFO, "framerate ended up at %d/%d\n",
- setfps->parm.capture.timeperframe.numerator,
- setfps->parm.capture.timeperframe.denominator);
+ LOG(INFO) << "framerate ended up at "
+ << setfps->parm.capture.timeperframe.numerator << "/"
+ << setfps->parm.capture.timeperframe.denominator;
for (int j = 0; j < 2; ++j) {
if (!SetCameraControl(V4L2_CID_EXPOSURE_AUTO, "V4L2_CID_EXPOSURE_AUTO",
V4L2_EXPOSURE_MANUAL)) {
- LOG(FATAL, "Failed to set exposure\n");
+ LOG(FATAL) << "Failed to set exposure";
}
if (!SetCameraControl(V4L2_CID_EXPOSURE_ABSOLUTE,
"V4L2_CID_EXPOSURE_ABSOLUTE", params_.exposure())) {
- LOG(FATAL, "Failed to set exposure\n");
+ LOG(FATAL) << "Failed to set exposure";
}
sleep(1);
}
@@ -274,7 +269,7 @@
struct v4l2_format fmt;
fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
if (xioctl(fd_, VIDIOC_G_FMT, &fmt) == -1) {
- PLOG(FATAL, "ioctl VIDIC_G_FMT(%d, %p)\n", fd_, &fmt);
+ PLOG(FATAL) << "ioctl VIDIC_G_FMT(" << fd_ << ", " << &fmt << ")";
}
return aos::vision::ImageFormat{(int)fmt.fmt.pix.width,
@@ -282,7 +277,7 @@
}
void Reader::Start() {
- LOG(DEBUG, "queueing buffers for the first time\n");
+ VLOG(1) << "queueing buffers for the first time";
v4l2_buffer buf;
for (unsigned int i = 0; i < kNumBuffers; ++i) {
CLEAR(buf);
@@ -291,11 +286,11 @@
buf.index = i;
QueueBuffer(&buf);
}
- LOG(DEBUG, "done with first queue\n");
+ VLOG(1) << "done with first queue";
v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
if (xioctl(fd_, VIDIOC_STREAMON, &type) == -1) {
- PLOG(FATAL, "ioctl VIDIOC_STREAMON(%d, %p)\n", fd_, &type);
+ PLOG(FATAL) << "ioctl VIDIOC_STREAMON(" << fd_ << ", " << &type << ")";
}
}
diff --git a/y2019/jevois/camera/reader.h b/y2019/jevois/camera/reader.h
index 53d83c7..c5498fe 100644
--- a/y2019/jevois/camera/reader.h
+++ b/y2019/jevois/camera/reader.h
@@ -33,10 +33,11 @@
}
int fd() { return fd_; }
+ bool SetCameraControl(uint32_t id, const char *name, int value);
+
private:
void QueueBuffer(v4l2_buffer *buf);
void InitMMap();
- bool SetCameraControl(uint32_t id, const char *name, int value);
void Init();
void Start();
void MMapBuffers();
diff --git a/y2019/jevois/cobs.h b/y2019/jevois/cobs.h
index 112873d..0e92ed6 100644
--- a/y2019/jevois/cobs.h
+++ b/y2019/jevois/cobs.h
@@ -7,12 +7,6 @@
#include <array>
#include "third_party/GSL/include/gsl/gsl"
-#ifdef __linux__
-#include "aos/logging/logging.h"
-#else
-#define CHECK(...)
-#define CHECK_LE(...)
-#endif
// This file contains code for encoding and decoding Consistent Overhead Byte
// Stuffing data. <http://www.stuartcheshire.org/papers/cobsforton.pdf> has
@@ -101,14 +95,18 @@
gsl::span<const char> input,
std::array<char, CobsMaxEncodedSize(max_decoded_size)> *output_buffer) {
static_assert(max_decoded_size > 0, "Empty buffers not supported");
- CHECK_LE(static_cast<size_t>(input.size()), max_decoded_size);
+ if (static_cast<size_t>(input.size()) > max_decoded_size) {
+ __builtin_trap();
+ }
auto input_pointer = input.begin();
auto output_pointer = output_buffer->begin();
auto code_pointer = output_pointer;
++output_pointer;
uint8_t code = 1;
while (input_pointer < input.end()) {
- CHECK(output_pointer < output_buffer->end());
+ if (output_pointer >= output_buffer->end()) {
+ __builtin_trap();
+ }
if (*input_pointer == 0u) {
*code_pointer = code;
code_pointer = output_pointer;
@@ -128,7 +126,9 @@
++input_pointer;
}
*code_pointer = code;
- CHECK(output_pointer <= output_buffer->end());
+ if (output_pointer > output_buffer->end()) {
+ __builtin_trap();
+ }
return gsl::span<char>(*output_buffer)
.subspan(0, output_pointer - output_buffer->begin());
}
@@ -137,8 +137,10 @@
gsl::span<char> CobsDecode(gsl::span<const char> input,
std::array<char, max_decoded_size> *output_buffer) {
static_assert(max_decoded_size > 0, "Empty buffers not supported");
- CHECK_LE(static_cast<size_t>(input.size()),
- CobsMaxEncodedSize(max_decoded_size));
+ if (static_cast<size_t>(input.size()) >
+ CobsMaxEncodedSize(max_decoded_size)) {
+ __builtin_trap();
+ }
auto input_pointer = input.begin();
auto output_pointer = output_buffer->begin();
while (input_pointer < input.end()) {
diff --git a/y2019/jevois/structures.h b/y2019/jevois/structures.h
index 9c74b11..fcf1ebe 100644
--- a/y2019/jevois/structures.h
+++ b/y2019/jevois/structures.h
@@ -144,6 +144,8 @@
// Send As, which triggers the bootstrap script to drop directly into USB
// mode.
kAs,
+ // Log camera images
+ kLog,
};
// This is all the information sent from the Teensy to each camera.
diff --git a/y2019/jevois/teensy.cc b/y2019/jevois/teensy.cc
index 570892f..58d1570 100644
--- a/y2019/jevois/teensy.cc
+++ b/y2019/jevois/teensy.cc
@@ -308,6 +308,8 @@
last_frames_.clear();
}
+ bool HaveLatestFrames() const { return !last_frames_.empty(); }
+
private:
struct FrameData {
aos::SizedArray<Target, 3> targets;
@@ -695,19 +697,26 @@
}
{
bool made_transfer = false;
- if (!first) {
+ const bool have_old_frames = frame_queue.HaveLatestFrames();
+ {
+ const auto new_transfer = frame_queue.MakeTransfer();
DisableInterrupts disable_interrupts;
- made_transfer =
- !SpiQueue::global_instance->HaveTransfer(disable_interrupts);
+ if (!first) {
+ made_transfer =
+ !SpiQueue::global_instance->HaveTransfer(disable_interrupts);
+ }
+ // If we made a transfer just now, then new_transfer might contain
+ // duplicate targets, in which case don't use it.
+ if (!have_old_frames || !made_transfer) {
+ SpiQueue::global_instance->UpdateTransfer(new_transfer,
+ disable_interrupts);
+ }
}
+ // If we made a transfer, then make sure we aren't remembering any
+ // in-flight frames.
if (made_transfer) {
frame_queue.RemoveLatestFrames();
}
- const auto transfer = frame_queue.MakeTransfer();
- {
- DisableInterrupts disable_interrupts;
- SpiQueue::global_instance->UpdateTransfer(transfer, disable_interrupts);
- }
}
{
const auto now = aos::monotonic_clock::now();
@@ -765,6 +774,10 @@
printf("Sending USB mode\n");
stdin_camera_command = CameraCommand::kUsb;
break;
+ case 'l':
+ printf("Log mode\n");
+ stdin_camera_command = CameraCommand::kLog;
+ break;
case 'n':
printf("Sending normal mode\n");
stdin_camera_command = CameraCommand::kNormal;
@@ -789,6 +802,7 @@
printf("UART board commands:\n");
printf(" p: Send passthrough mode\n");
printf(" u: Send USB mode\n");
+ printf(" l: Send Log mode\n");
printf(" n: Send normal mode\n");
printf(" a: Send all-'a' mode\n");
printf(" c: Dump camera configuration\n");
diff --git a/y2019/joystick_reader.cc b/y2019/joystick_reader.cc
index 54d2694..a4c2428 100644
--- a/y2019/joystick_reader.cc
+++ b/y2019/joystick_reader.cc
@@ -22,11 +22,13 @@
#include "frc971/control_loops/drivetrain/localizer.q.h"
#include "y2019/control_loops/drivetrain/drivetrain_base.h"
+#include "y2019/control_loops/drivetrain/target_selector.q.h"
#include "y2019/control_loops/superstructure/superstructure.q.h"
#include "y2019/status_light.q.h"
#include "y2019/vision.pb.h"
using ::y2019::control_loops::superstructure::superstructure_queue;
+using ::y2019::control_loops::drivetrain::target_selector_hint;
using ::frc971::control_loops::drivetrain::localizer_control;
using ::aos::input::driver_station::ButtonLocation;
using ::aos::input::driver_station::ControlBit;
@@ -42,17 +44,17 @@
using google::protobuf::StringPrintf;
-const ButtonLocation kSuctionBall(3, 13);
-const ButtonLocation kSuctionHatch(3, 12);
-const ButtonLocation kDeployStilt(3, 8);
-const ButtonLocation kHalfStilt(3, 6);
-const ButtonLocation kFallOver(3, 9);
-
struct ElevatorWristPosition {
double elevator;
double wrist;
};
+const ButtonLocation kSuctionBall(4, 2);
+const ButtonLocation kSuctionHatch(3, 15);
+const ButtonLocation kDeployStilt(4, 1);
+const ButtonLocation kHalfStilt(4, 3);
+const ButtonLocation kFallOver(3, 16);
+
const ButtonLocation kRocketForwardLower(5, 1);
const ButtonLocation kRocketForwardMiddle(5, 2);
const ButtonLocation kRocketForwardUpper(5, 4);
@@ -76,13 +78,29 @@
const ButtonLocation kPanelHPIntakeBackward(5, 5);
const ButtonLocation kRelease(2, 4);
-const ButtonLocation kResetLocalizerLeftForwards(3, 14);
-const ButtonLocation kResetLocalizerLeftBackwards(4, 12);
+// Reuse quickturn for the cancel button.
+const ButtonLocation kCancelAutoMode(2, 3);
+const ButtonLocation kReleaseButtonBoard(3, 4);
+const ButtonLocation kResetLocalizerLeftForwards(3, 10);
+const ButtonLocation kResetLocalizerLeftBackwards(3, 9);
-const ButtonLocation kResetLocalizerRightForwards(4, 1);
-const ButtonLocation kResetLocalizerRightBackwards(4, 11);
+const ButtonLocation kResetLocalizerRightForwards(3, 8);
+const ButtonLocation kResetLocalizerRightBackwards(3, 7);
+
+const ButtonLocation kResetLocalizerLeft(3, 11);
+const ButtonLocation kResetLocalizerRight(3, 13);
+
+const ButtonLocation kNearCargoHint(3, 3);
+const ButtonLocation kMidCargoHint(3, 5);
+const ButtonLocation kFarCargoHint(3, 6);
+
+const JoystickAxis kCargoSelectorY(5, 6);
+const JoystickAxis kCargoSelectorX(5, 5);
+
+const ButtonLocation kCameraLog(3, 14);
const ElevatorWristPosition kStowPos{0.36, 0.0};
+const ElevatorWristPosition kClimbPos{0.0, M_PI / 4.0};
const ElevatorWristPosition kPanelHPIntakeForwrdPos{0.01, M_PI / 2.0};
const ElevatorWristPosition kPanelHPIntakeBackwardPos{0.015, -M_PI / 2.0};
@@ -99,32 +117,31 @@
const ElevatorWristPosition kPanelCargoForwardPos{0.0, M_PI / 2.0};
const ElevatorWristPosition kPanelCargoBackwardPos{0.0, -M_PI / 2.0};
-const ElevatorWristPosition kBallForwardLowerPos{0.42, M_PI / 2.0};
-const ElevatorWristPosition kBallBackwardLowerPos{0.14, -M_PI / 2.0};
+const ElevatorWristPosition kBallForwardLowerPos{0.21, 1.27};
+const ElevatorWristPosition kBallBackwardLowerPos{0.43, -1.99};
-const ElevatorWristPosition kBallForwardMiddlePos{1.16, 1.546};
-const ElevatorWristPosition kBallBackwardMiddlePos{0.90, -1.546};
+const ElevatorWristPosition kBallForwardMiddlePos{0.925, 1.21};
+const ElevatorWristPosition kBallBackwardMiddlePos{1.19, -1.98};
const ElevatorWristPosition kBallForwardUpperPos{1.51, 0.961};
const ElevatorWristPosition kBallBackwardUpperPos{1.44, -1.217};
-const ElevatorWristPosition kBallCargoForwardPos{0.739044, 1.353};
-const ElevatorWristPosition kBallCargoBackwardPos{0.868265, -1.999};
+const ElevatorWristPosition kBallCargoForwardPos{0.59, 1.2};
+const ElevatorWristPosition kBallCargoBackwardPos{0.868265, -2.1};
const ElevatorWristPosition kBallHPIntakeForwardPos{0.55, 1.097};
const ElevatorWristPosition kBallHPIntakeBackwardPos{0.89, -2.018};
-const ElevatorWristPosition kBallIntakePos{0.29, 2.14};
+const ElevatorWristPosition kBallIntakePos{0.309, 2.13};
class Reader : public ::aos::input::ActionJoystickInput {
public:
Reader(::aos::EventLoop *event_loop)
: ::aos::input::ActionJoystickInput(
event_loop,
- ::y2019::control_loops::drivetrain::GetDrivetrainConfig()) {
- // Set teleop to immediately resume after auto ends for sandstorm mode.
- set_run_teleop_in_auto(true);
-
+ ::y2019::control_loops::drivetrain::GetDrivetrainConfig(),
+ {.run_teleop_in_auto = true,
+ .cancel_auto_button = kCancelAutoMode}) {
const uint16_t team = ::aos::network::GetTeamNumber();
superstructure_queue.goal.FetchLatest();
if (superstructure_queue.goal.get()) {
@@ -148,7 +165,7 @@
superstructure_queue.status.FetchLatest();
if (!superstructure_queue.status.get() ||
!superstructure_queue.position.get()) {
- LOG(ERROR, "Got no superstructure status packet.\n");
+ LOG(ERROR, "Got no superstructure status or position packet.\n");
return;
}
@@ -158,6 +175,56 @@
auto new_superstructure_goal = superstructure_queue.goal.MakeMessage();
+ {
+ auto target_hint = target_selector_hint.MakeMessage();
+ if (data.IsPressed(kNearCargoHint)) {
+ target_hint->suggested_target = 1;
+ } else if (data.IsPressed(kMidCargoHint)) {
+ target_hint->suggested_target = 2;
+ } else if (data.IsPressed(kFarCargoHint)) {
+ target_hint->suggested_target = 3;
+ } else {
+ const double cargo_joy_y = data.GetAxis(kCargoSelectorY);
+ const double cargo_joy_x = data.GetAxis(kCargoSelectorX);
+ if (cargo_joy_y > 0.5) {
+ target_hint->suggested_target = 1;
+ } else if (cargo_joy_y < -0.5) {
+ target_hint->suggested_target = 3;
+ } else if (::std::abs(cargo_joy_x) > 0.5) {
+ target_hint->suggested_target = 2;
+ } else {
+ target_hint->suggested_target = 0;
+ }
+ }
+ if (!target_hint.Send()) {
+ LOG(ERROR, "Failed to send target selector hint.\n");
+ }
+ }
+
+ if (data.PosEdge(kResetLocalizerLeft)) {
+ auto localizer_resetter = localizer_control.MakeMessage();
+ // Start at the left feeder station.
+ localizer_resetter->x = 0.6;
+ localizer_resetter->y = 3.4;
+ localizer_resetter->keep_current_theta = true;
+
+ if (!localizer_resetter.Send()) {
+ LOG(ERROR, "Failed to reset localizer.\n");
+ }
+ }
+
+ if (data.PosEdge(kResetLocalizerRight)) {
+ auto localizer_resetter = localizer_control.MakeMessage();
+ // Start at the left feeder station.
+ localizer_resetter->x = 0.6;
+ localizer_resetter->y = -3.4;
+ localizer_resetter->keep_current_theta = true;
+
+ if (!localizer_resetter.Send()) {
+ LOG(ERROR, "Failed to reset localizer.\n");
+ }
+ }
+
if (data.PosEdge(kResetLocalizerLeftForwards)) {
auto localizer_resetter = localizer_control.MakeMessage();
// Start at the left feeder station.
@@ -206,11 +273,27 @@
}
}
+ if (data.PosEdge(kRelease) &&
+ monotonic_now >
+ last_release_button_press_ + ::std::chrono::milliseconds(500)) {
+ if (superstructure_queue.status->has_piece) {
+ release_mode_ = ReleaseButtonMode::kRelease;
+ } else {
+ release_mode_ = ReleaseButtonMode::kBallIntake;
+ }
+ }
+
+ if (data.IsPressed(kRelease)) {
+ last_release_button_press_ = monotonic_now;
+ }
+
if (data.IsPressed(kSuctionBall)) {
grab_piece_ = true;
} else if (data.IsPressed(kSuctionHatch)) {
grab_piece_ = true;
- } else if (data.IsPressed(kRelease) ||
+ } else if ((release_mode_ == ReleaseButtonMode::kRelease &&
+ data.IsPressed(kRelease)) ||
+ data.IsPressed(kReleaseButtonBoard) ||
!superstructure_queue.status->has_piece) {
grab_piece_ = false;
}
@@ -221,7 +304,10 @@
new_superstructure_goal->intake.unsafe_goal = -1.2;
new_superstructure_goal->roller_voltage = 0.0;
- const bool kDoBallIntake = data.GetAxis(kBallIntake) > 0.9;
+ const bool kDoBallIntake =
+ (!climbed_ && release_mode_ == ReleaseButtonMode::kBallIntake &&
+ data.IsPressed(kRelease)) ||
+ data.GetAxis(kBallIntake) > 0.9;
const bool kDoBallOutake = data.GetAxis(kBallOutake) > 0.9;
if (data.IsPressed(kPanelSwitch)) {
@@ -296,7 +382,7 @@
if (switch_ball_) {
if (kDoBallOutake ||
(kDoBallIntake &&
- monotonic_now < last_not_has_piece_ + chrono::milliseconds(100))) {
+ monotonic_now < last_not_has_piece_ + chrono::milliseconds(200))) {
new_superstructure_goal->intake.unsafe_goal = 0.959327;
}
@@ -315,32 +401,52 @@
constexpr double kDeployStiltPosition = 0.5;
- // TODO(sabina): max height please?
if (data.IsPressed(kFallOver)) {
new_superstructure_goal->stilts.unsafe_goal = 0.71;
new_superstructure_goal->stilts.profile_params.max_velocity = 0.65;
new_superstructure_goal->stilts.profile_params.max_acceleration = 1.25;
- } else if (data.IsPressed(kDeployStilt)) {
+ } else if (data.IsPressed(kHalfStilt)) {
+ was_above_ = false;
+ new_superstructure_goal->stilts.unsafe_goal = 0.345;
+ new_superstructure_goal->stilts.profile_params.max_velocity = 0.65;
+ } else if (data.IsPressed(kDeployStilt) || was_above_) {
new_superstructure_goal->stilts.unsafe_goal = kDeployStiltPosition;
new_superstructure_goal->stilts.profile_params.max_velocity = 0.65;
new_superstructure_goal->stilts.profile_params.max_acceleration = 2.0;
- } else if (data.IsPressed(kHalfStilt)) {
- new_superstructure_goal->stilts.unsafe_goal = 0.345;
- new_superstructure_goal->stilts.profile_params.max_velocity = 0.65;
} else {
new_superstructure_goal->stilts.unsafe_goal = 0.005;
new_superstructure_goal->stilts.profile_params.max_velocity = 0.65;
new_superstructure_goal->stilts.profile_params.max_acceleration = 2.0;
}
+ if (superstructure_queue.status->stilts.position > 0.1) {
+ elevator_wrist_pos_ = kClimbPos;
+ climbed_ = true;
+ new_superstructure_goal->wrist.profile_params.max_acceleration = 10;
+ new_superstructure_goal->elevator.profile_params.max_acceleration = 6;
+ }
+
+ // If we've been asked to go above deploy and made it up that high, latch
+ // was_above.
+ if (new_superstructure_goal->stilts.unsafe_goal > kDeployStiltPosition &&
+ superstructure_queue.status->stilts.position >= kDeployStiltPosition) {
+ was_above_ = true;
+ } else if ((superstructure_queue.position->platform_left_detect ||
+ superstructure_queue.position->platform_right_detect) &&
+ !data.IsPressed(kDeployStilt) && !data.IsPressed(kFallOver)) {
+ // TODO(austin): Should make this && rather than ||
+ was_above_ = false;
+ }
+
if (superstructure_queue.status->stilts.position > kDeployStiltPosition &&
new_superstructure_goal->stilts.unsafe_goal == kDeployStiltPosition) {
new_superstructure_goal->stilts.profile_params.max_velocity = 0.30;
new_superstructure_goal->stilts.profile_params.max_acceleration = 0.75;
}
-
- if (data.IsPressed(kRelease)) {
+ if ((release_mode_ == ReleaseButtonMode::kRelease &&
+ data.IsPressed(kRelease)) ||
+ data.IsPressed(kReleaseButtonBoard)) {
grab_piece_ = false;
}
@@ -368,15 +474,46 @@
video_tx_->Send(vision_control_);
last_vision_control_ = monotonic_now;
}
+
+ {
+ auto camera_log_message = camera_log.MakeMessage();
+ camera_log_message->log = data.IsPressed(kCameraLog);
+ LOG_STRUCT(DEBUG, "camera_log", *camera_log_message);
+ camera_log_message.Send();
+ }
}
private:
+ uint32_t GetAutonomousMode() override {
+ ::frc971::autonomous::auto_mode.FetchLatest();
+ if (::frc971::autonomous::auto_mode.get() == nullptr) {
+ LOG(WARNING, "no auto mode values\n");
+ return 0;
+ }
+ return ::frc971::autonomous::auto_mode->mode;
+ }
+
+ // Bool to track if we've been above the deploy position. Once this bool is
+ // set, don't let the stilts retract until we see the platform.
+ bool was_above_ = false;
+
// Current goals here.
ElevatorWristPosition elevator_wrist_pos_ = kStowPos;
bool grab_piece_ = false;
bool switch_ball_ = false;
+ bool climbed_ = false;
+
+ enum class ReleaseButtonMode {
+ kBallIntake,
+ kRelease,
+ };
+
+ ReleaseButtonMode release_mode_ = ReleaseButtonMode::kRelease;
+ aos::monotonic_clock::time_point last_release_button_press_ =
+ aos::monotonic_clock::min_time;
+
VisionControl vision_control_;
::std::unique_ptr<ProtoTXUdpSocket<VisionControl>> video_tx_;
::aos::monotonic_clock::time_point last_vision_control_ =
diff --git a/y2019/status_light.q b/y2019/status_light.q
index f84ed28..c26de88 100644
--- a/y2019/status_light.q
+++ b/y2019/status_light.q
@@ -8,3 +8,9 @@
};
queue StatusLight status_light;
+
+message CameraLog {
+ bool log;
+};
+
+queue CameraLog camera_log;
diff --git a/y2019/vision/BUILD b/y2019/vision/BUILD
index 344e4da..c7f0009 100644
--- a/y2019/vision/BUILD
+++ b/y2019/vision/BUILD
@@ -34,6 +34,16 @@
tools = [":constants_formatting"],
)
+cc_library(
+ name = "image_writer",
+ srcs = ["image_writer.cc"],
+ hdrs = ["image_writer.h"],
+ deps = [
+ "//aos/vision/image:image_types",
+ "@com_github_google_glog//:glog",
+ ],
+)
+
sh_test(
name = "constants_formatting_test",
srcs = ["constants_formatting_test.sh"],
@@ -92,9 +102,8 @@
srcs = ["target_sender.cc"],
restricted_to = VISION_TARGETS,
deps = [
+ ":image_writer",
":target_finder",
- "//aos/logging",
- "//aos/logging:implementations",
"//aos/vision/blob:codec",
"//aos/vision/blob:find_blob",
"//aos/vision/events:epoll_events",
@@ -105,6 +114,7 @@
"//y2019/jevois:uart",
"//y2019/jevois/camera:image_stream",
"//y2019/jevois/camera:reader",
+ "@com_github_google_glog//:glog",
"@com_google_ceres_solver//:ceres",
],
)
diff --git a/y2019/vision/calibrate.sh b/y2019/vision/calibrate.sh
index 24118ed..7b7ba4f 100755
--- a/y2019/vision/calibrate.sh
+++ b/y2019/vision/calibrate.sh
@@ -21,9 +21,9 @@
--tape_direction_x=-1.0 \
--tape_direction_y=0.0 \
--beginning_tape_measure_reading=11 \
- --image_count=75 \
+ --image_count=69 \
--constants=constants.cc \
- --prefix data/cam10_0/debug_viewer_jpeg_
+ --prefix data/cam10_1/debug_viewer_jpeg_
calibration \
--camera_id 6 \
diff --git a/y2019/vision/constants.cc b/y2019/vision/constants.cc
index 36694f8..fabe75c 100644
--- a/y2019/vision/constants.cc
+++ b/y2019/vision/constants.cc
@@ -133,20 +133,20 @@
CameraCalibration camera_10 = {
{
- -0.190556 / 180.0 * M_PI, 345.022, 0.468494 / 180.0 * M_PI,
+ -0.305107 / 180.0 * M_PI, 336.952, -0.0804389 / 180.0 * M_PI,
},
{
- {{-4.83005 * kInchesToMeters, 2.95565 * kInchesToMeters,
- 33.3624 * kInchesToMeters}},
- 182.204 / 180.0 * M_PI,
+ {{-5.64467 * kInchesToMeters, 2.41348 * kInchesToMeters,
+ 33.1669 * kInchesToMeters}},
+ 181.598 / 180.0 * M_PI,
},
{
10,
{{-12.5 * kInchesToMeters, 0.0}},
{{-1 * kInchesToMeters, 0.0}},
11,
- "data/cam10_0/debug_viewer_jpeg_",
- 75,
+ "data/cam10_1/debug_viewer_jpeg_",
+ 69,
}};
CameraCalibration camera_14 = {
diff --git a/y2019/vision/debug_viewer.cc b/y2019/vision/debug_viewer.cc
index 3c174b4..c8d8234 100644
--- a/y2019/vision/debug_viewer.cc
+++ b/y2019/vision/debug_viewer.cc
@@ -80,6 +80,7 @@
}
bool HandleBlobs(BlobList imgs, ImageFormat fmt) override {
+ const CameraGeometry camera_geometry = GetCamera(FLAGS_camera)->geometry;
imgs_last_ = imgs;
fmt_last_ = fmt;
// reset for next drawing cycle
@@ -174,11 +175,32 @@
// Check that our current results match possible solutions.
results = target_finder_.FilterResults(results, 0, draw_results_);
if (draw_results_) {
- for (const IntermediateResult &res : results) {
- DrawTarget(res, {0, 255, 0});
+ for (const IntermediateResult &result : results) {
+ ::std::cout << "Found target x: "
+ << camera_geometry.location[0] +
+ ::std::cos(camera_geometry.heading +
+ result.extrinsics.r2) *
+ result.extrinsics.z
+ << ::std::endl;
+ ::std::cout << "Found target y: "
+ << camera_geometry.location[1] +
+ ::std::sin(camera_geometry.heading +
+ result.extrinsics.r2) *
+ result.extrinsics.z
+ << ::std::endl;
+ ::std::cout << "Found target z: "
+ << camera_geometry.location[2] + result.extrinsics.y
+ << ::std::endl;
+ DrawTarget(result, {0, 255, 0});
}
}
+ int desired_exposure;
+ if (target_finder_.TestExposure(results, &desired_exposure)) {
+ printf("Switching exposure to %d.\n", desired_exposure);
+ SetExposure(desired_exposure);
+ }
+
// If the target list is not empty then we found a target.
return !results.empty();
}
@@ -320,11 +342,11 @@
BlobList imgs_last_;
ImageFormat fmt_last_;
bool draw_select_blob_ = false;
- bool draw_contours_ = false;
- bool draw_raw_poly_ = false;
+ bool draw_contours_ = true;
+ bool draw_raw_poly_ = true;
bool draw_components_ = false;
bool draw_raw_target_ = false;
- bool draw_raw_IR_ = false;
+ bool draw_raw_IR_ = true;
bool draw_results_ = true;
};
diff --git a/y2019/vision/image_writer.cc b/y2019/vision/image_writer.cc
new file mode 100644
index 0000000..51e2c60
--- /dev/null
+++ b/y2019/vision/image_writer.cc
@@ -0,0 +1,40 @@
+#include <fstream>
+#include <sys/stat.h>
+
+#include "glog/logging.h"
+#include "y2019/vision/image_writer.h"
+
+namespace y2019 {
+namespace vision {
+
+ImageWriter::ImageWriter() {
+ LOG(INFO) << "Initializing image writer";
+ SetDirPath();
+}
+
+void ImageWriter::WriteImage(::aos::vision::DataRef data) {
+ LOG(INFO) << "Writing image " << image_count_;
+ std::ofstream ofs(
+ dir_path_ + file_prefix_ + std::to_string(image_count_) + ".yuyv",
+ std::ofstream::out);
+ ofs << data;
+ ofs.close();
+ ++image_count_;
+}
+
+void ImageWriter::SetDirPath() {
+ ::std::string base_path = "/jevois/data/run_";
+ for (int i = 0;; ++i) {
+ struct stat st;
+ std::string option = base_path + std::to_string(i);
+ if (stat(option.c_str(), &st) != 0) {
+ file_prefix_ = option + "/";
+ LOG(INFO) << "Writing to " << file_prefix_.c_str();
+ mkdir(file_prefix_.c_str(), 0777);
+ break;
+ }
+ }
+}
+
+} // namespace vision
+} // namespace y2019
diff --git a/y2019/vision/image_writer.h b/y2019/vision/image_writer.h
new file mode 100644
index 0000000..f33cca7
--- /dev/null
+++ b/y2019/vision/image_writer.h
@@ -0,0 +1,29 @@
+#ifndef Y2019_VISION_IMAGE_WRITER_H_
+#define Y2019_VISION_IMAGE_WRITER_H_
+
+#include <string>
+
+#include "aos/vision/image/image_types.h"
+
+namespace y2019 {
+namespace vision {
+
+class ImageWriter {
+ public:
+ ImageWriter();
+
+ void WriteImage(::aos::vision::DataRef data);
+
+ private:
+ void SetDirPath();
+
+ ::std::string file_prefix_ = std::string("debug_viewer_jpeg_");
+ ::std::string dir_path_;
+
+ unsigned int image_count_ = 0;
+};
+
+} // namespace vision
+} // namespace y2017
+
+#endif // Y2019_VISION_IMAGE_WRITER_H_
diff --git a/y2019/vision/server/BUILD b/y2019/vision/server/BUILD
index 180b41e..35449a5 100644
--- a/y2019/vision/server/BUILD
+++ b/y2019/vision/server/BUILD
@@ -1,4 +1,5 @@
load("//aos/seasocks:gen_embedded.bzl", "gen_embedded")
+load("@com_google_protobuf//:protobuf.bzl", "cc_proto_library")
load("//aos/downloader:downloader.bzl", "aos_downloader_dir")
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle")
@@ -21,30 +22,40 @@
aos_downloader_dir(
name = "www_files",
srcs = [
- "//y2019/vision/server/www:visualizer_bundle",
"//y2019/vision/server/www:files",
+ "//y2019/vision/server/www:visualizer_bundle",
],
dir = "www",
visibility = ["//visibility:public"],
)
+cc_proto_library(
+ name = "server_data_proto",
+ srcs = ["server_data.proto"],
+)
+
cc_binary(
name = "server",
srcs = [
"server.cc",
],
data = [
- "//y2019/vision/server/www:visualizer_bundle",
"//y2019/vision/server/www:files",
+ "//y2019/vision/server/www:visualizer_bundle",
],
visibility = ["//visibility:public"],
deps = [
":gen_embedded",
+ ":server_data_proto",
"//aos:init",
"//aos/logging",
+ "//aos/seasocks:seasocks_logger",
"//aos/time",
+ "//frc971/control_loops:pose",
"//frc971/control_loops/drivetrain:drivetrain_queue",
"//third_party/seasocks",
+ "//y2019:constants",
"//y2019/control_loops/drivetrain:camera_queue",
+ "//y2019/control_loops/superstructure:superstructure_queue",
],
)
diff --git a/y2019/vision/server/server.cc b/y2019/vision/server/server.cc
index 0253a4c..0263891 100644
--- a/y2019/vision/server/server.cc
+++ b/y2019/vision/server/server.cc
@@ -2,20 +2,26 @@
#include <sys/types.h>
#include <unistd.h>
#include <array>
+#include <cmath>
#include <memory>
#include <set>
#include <sstream>
#include "aos/init.h"
#include "aos/logging/logging.h"
+#include "aos/seasocks/seasocks_logger.h"
#include "aos/time/time.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
+#include "frc971/control_loops/pose.h"
+#include "google/protobuf/util/json_util.h"
#include "internal/Embedded.h"
-#include "seasocks/PrintfLogger.h"
#include "seasocks/Server.h"
#include "seasocks/StringUtil.h"
#include "seasocks/WebSocket.h"
+#include "y2019/constants.h"
#include "y2019/control_loops/drivetrain/camera.q.h"
+#include "y2019/control_loops/superstructure/superstructure.q.h"
+#include "y2019/vision/server/server_data.pb.h"
namespace y2019 {
namespace vision {
@@ -55,41 +61,10 @@
void WebsocketHandler::SendData(const std::string &data) {
for (seasocks::WebSocket *websocket : connections_) {
- websocket->send(reinterpret_cast<const uint8_t *>(data.data()),
- data.size());
+ websocket->send(data.c_str());
}
}
-// TODO(Brian): Put this somewhere shared.
-class SeasocksLogger : public seasocks::PrintfLogger {
- public:
- SeasocksLogger(Level min_level_to_log) : PrintfLogger(min_level_to_log) {}
- void log(Level level, const char* message) override;
-};
-
-void SeasocksLogger::log(Level level, const char *message) {
- // Convert Seasocks error codes to AOS.
- log_level aos_level;
- switch (level) {
- case seasocks::Logger::INFO:
- aos_level = INFO;
- break;
- case seasocks::Logger::WARNING:
- aos_level = WARNING;
- break;
- case seasocks::Logger::ERROR:
- case seasocks::Logger::SEVERE:
- aos_level = ERROR;
- break;
- case seasocks::Logger::DEBUG:
- case seasocks::Logger::ACCESS:
- default:
- aos_level = DEBUG;
- break;
- }
- LOG(aos_level, "Seasocks: %s\n", message);
-}
-
struct LocalCameraTarget {
double x, y, theta;
};
@@ -123,54 +98,111 @@
void DataThread(seasocks::Server *server, WebsocketHandler *websocket_handler) {
auto &camera_frames = y2019::control_loops::drivetrain::camera_frames;
auto &drivetrain_status = frc971::control_loops::drivetrain_queue.status;
+ auto &superstructure_status =
+ ::y2019::control_loops::superstructure::superstructure_queue.status;
std::array<LocalCameraFrame, 5> latest_frames;
+ std::array<aos::monotonic_clock::time_point, 5> last_target_time;
+ last_target_time.fill(aos::monotonic_clock::epoch());
aos::monotonic_clock::time_point last_send_time = aos::monotonic_clock::now();
+ DebugData debug_data;
while (true) {
camera_frames.FetchNextBlocking();
drivetrain_status.FetchLatest();
- if (!drivetrain_status.get()) {
+ superstructure_status.FetchLatest();
+ if (!drivetrain_status.get() || !superstructure_status.get()) {
// Try again if we don't have any drivetrain statuses.
continue;
}
+ const auto now = aos::monotonic_clock::now();
{
const auto &new_frame = *camera_frames;
+ // TODO(james): Maybe we only want to fill out a new frame if it has
+ // targets or the saved target is > 0.1 sec old? Not sure, but for now
if (new_frame.camera < latest_frames.size()) {
latest_frames[new_frame.camera].capture_time =
aos::monotonic_clock::time_point(
std::chrono::nanoseconds(new_frame.timestamp));
latest_frames[new_frame.camera].targets.clear();
+ if (new_frame.num_targets > 0) {
+ last_target_time[new_frame.camera] =
+ latest_frames[new_frame.camera].capture_time;
+ }
for (int target = 0; target < new_frame.num_targets; ++target) {
latest_frames[new_frame.camera].targets.emplace_back();
- // TODO: Do something useful.
+ const float heading = new_frame.targets[target].heading;
+ const float distance = new_frame.targets[target].distance;
+ latest_frames[new_frame.camera].targets.back().x =
+ ::std::cos(heading) * distance;
+ latest_frames[new_frame.camera].targets.back().y =
+ ::std::sin(heading) * distance;
+ latest_frames[new_frame.camera].targets.back().theta =
+ new_frame.targets[target].skew;
}
}
}
- const auto now = aos::monotonic_clock::now();
+ frc971::control_loops::TypedPose<double> robot_pose(
+ {drivetrain_status->x, drivetrain_status->y, 0},
+ drivetrain_status->theta);
+ for (size_t ii = 0; ii < latest_frames.size(); ++ii) {
+ CameraDebug *camera_debug = debug_data.add_camera_debug();
+ LocalCameraFrame cur_frame = latest_frames[ii];
+ constants::Values::CameraCalibration camera_info =
+ constants::GetValues().cameras[ii];
+ frc971::control_loops::TypedPose<double> camera_pose = camera_info.pose;
+ camera_pose.set_base(&robot_pose);
+
+ camera_debug->set_current_frame_age(
+ ::std::chrono::duration_cast<::std::chrono::duration<double>>(
+ now - cur_frame.capture_time)
+ .count());
+ camera_debug->set_time_since_last_target(
+ ::std::chrono::duration_cast<::std::chrono::duration<double>>(
+ now - last_target_time[ii])
+ .count());
+ for (const auto &target : cur_frame.targets) {
+ frc971::control_loops::TypedPose<double> target_pose(
+ &camera_pose, {target.x, target.y, 0}, target.theta);
+ Pose *pose = camera_debug->add_targets();
+ pose->set_x(target_pose.abs_pos().x());
+ pose->set_y(target_pose.abs_pos().y());
+ pose->set_theta(target_pose.abs_theta());
+ }
+ }
+
if (now > last_send_time + std::chrono::milliseconds(100)) {
last_send_time = now;
- std::ostringstream stream;
- stream << "{\n";
-
- stream << "\"robot\": {";
- stream << "\"x\": " << drivetrain_status->x << ",";
- stream << "\"y\": " << drivetrain_status->y << ",";
- stream << "\"theta\": " << drivetrain_status->theta;
- if (drivetrain_status->line_follow_logging.frozen) {
- stream << "\"target\": {";
- stream << "\"x\": " << drivetrain_status->line_follow_logging.x << ",";
- stream << "\"y\": " << drivetrain_status->line_follow_logging.y << ",";
- stream << "\"theta\": " << drivetrain_status->line_follow_logging.theta;
- stream << "}\n";
+ debug_data.mutable_robot_pose()->set_x(drivetrain_status->x);
+ debug_data.mutable_robot_pose()->set_y(drivetrain_status->y);
+ debug_data.mutable_robot_pose()->set_theta(drivetrain_status->theta);
+ {
+ LineFollowDebug *line_debug = debug_data.mutable_line_follow_debug();
+ line_debug->set_frozen(drivetrain_status->line_follow_logging.frozen);
+ line_debug->set_have_target(
+ drivetrain_status->line_follow_logging.have_target);
+ line_debug->mutable_goal_target()->set_x(
+ drivetrain_status->line_follow_logging.x);
+ line_debug->mutable_goal_target()->set_y(
+ drivetrain_status->line_follow_logging.y);
+ line_debug->mutable_goal_target()->set_theta(
+ drivetrain_status->line_follow_logging.theta);
}
- stream << "}\n";
- stream << "}";
+ Sensors *sensors = debug_data.mutable_sensors();
+ sensors->set_wrist(superstructure_status->wrist.position);
+ sensors->set_elevator(superstructure_status->elevator.position);
+ sensors->set_intake(superstructure_status->intake.position);
+ sensors->set_stilts(superstructure_status->stilts.position);
+
+ ::std::string json;
+ google::protobuf::util::MessageToJsonString(debug_data, &json);
server->execute(
- std::make_shared<UpdateData>(websocket_handler, stream.str()));
+ std::make_shared<UpdateData>(websocket_handler, ::std::move(json)));
+
+ debug_data.Clear();
}
}
}
@@ -185,7 +217,7 @@
aos::InitNRT();
seasocks::Server server(::std::shared_ptr<seasocks::Logger>(
- new y2019::vision::SeasocksLogger(seasocks::Logger::INFO)));
+ new ::aos::seasocks::SeasocksLogger(seasocks::Logger::Level::Info)));
auto websocket_handler = std::make_shared<y2019::vision::WebsocketHandler>();
server.addWebSocketHandler("/ws", websocket_handler);
diff --git a/y2019/vision/server/server_data.proto b/y2019/vision/server/server_data.proto
new file mode 100644
index 0000000..96a5859
--- /dev/null
+++ b/y2019/vision/server/server_data.proto
@@ -0,0 +1,58 @@
+syntax = "proto2";
+
+package y2019.vision;
+
+// Various proto definitions for use with the websocket server for debugging the
+// vision code.
+
+// Representation of a 2D pose on the field, generally referenced off of the
+// center of the driver's station wall with positive X out towards the field and
+// positive Y to the left from the driver's perspective. theta is zero when
+// pointed straight along the positive X axis and increases towards positive Y
+// (counter-clockwise).
+message Pose {
+ optional float x = 1; // meters
+ optional float y = 2; // meters
+ optional float theta = 3; // radians
+}
+
+// Debugging information for the line following.
+message LineFollowDebug {
+ // Pose of the target that we are currently latched onto.
+ optional Pose goal_target = 1;
+ // Whether we are currently in line following mode and so will freeze the
+ // target shortly.
+ optional bool frozen = 2;
+ // Whether we have chosen a target (otherwise, goal_target may be arbitrary).
+ optional bool have_target = 3;
+}
+
+// Data for a single camera at a given instance in time (corresponding to a
+// camera frame).
+message CameraDebug {
+ // The time that has passed, in seconds, since we last got a frame with a
+ // target in it.
+ optional float time_since_last_target = 1;
+ // The age of the most recent frame and the one that contains the targets included below.
+ optional float current_frame_age = 2;
+ // Target Pose is relative to the camera, *not* the field, so (0, 0) is at the
+ // camera.
+ repeated Pose targets = 3;
+}
+
+// Data for the current sensor values.
+message Sensors {
+ // Superstructure calibrated positions.
+ optional float wrist = 1;
+ optional float elevator = 2;
+ optional float intake = 3;
+ optional float stilts = 4;
+}
+
+// The overall package of data that we send to the webpage.
+message DebugData {
+ optional Pose robot_pose = 1;
+ optional LineFollowDebug line_follow_debug = 2;
+ repeated CameraDebug camera_debug = 3;
+ optional Sensors sensors = 4;
+}
diff --git a/y2019/vision/server/www/BUILD b/y2019/vision/server/www/BUILD
index 937b495..428dd41 100644
--- a/y2019/vision/server/www/BUILD
+++ b/y2019/vision/server/www/BUILD
@@ -6,7 +6,7 @@
filegroup(
name = "files",
srcs = glob([
- "**/*",
+ "**/*.html",
]),
)
@@ -14,7 +14,20 @@
name = "visualizer",
srcs = glob([
"*.ts",
- ]),
+ ]) + ["camera_constants.ts"],
+)
+
+cc_binary(
+ name = "generate_camera",
+ srcs = ["generate_camera.cc"],
+ deps = ["//y2019:constants"],
+)
+
+genrule(
+ name = "gen_cam_ts",
+ outs = ["camera_constants.ts"],
+ cmd = "$(location :generate_camera) $@",
+ tools = [":generate_camera"],
)
rollup_bundle(
diff --git a/y2019/vision/server/www/field.ts b/y2019/vision/server/www/field.ts
index 8cb1282..591b291 100644
--- a/y2019/vision/server/www/field.ts
+++ b/y2019/vision/server/www/field.ts
@@ -1,4 +1,4 @@
-import {IN_TO_M, FT_TO_M} from './constants';
+import {FT_TO_M, IN_TO_M} from './constants';
const CENTER_FIELD_X = 27 * FT_TO_M + 1.125 * IN_TO_M;
@@ -29,20 +29,40 @@
const HP_Y = ((26 * 12 + 10.5) / 2 - 25.9) * IN_TO_M;
const HP_THETA = Math.PI;
-export function drawField(ctx : CanvasRenderingContext2D) : void {
+const HAB_LENGTH = 4 * FT_TO_M;
+const HALF_HAB_3_WIDTH = 2 * FT_TO_M;
+const HAB_2_WIDTH = (3 * 12 + 4) * IN_TO_M;
+const HALF_HAB_1_WIDTH = (6 * 12 + 3.25) * IN_TO_M;
+const HAB_1_LENGTH = (3 * 12 + 11.25) * IN_TO_M;
+
+const DEPOT_WIDTH = (12 + 10.625) * IN_TO_M;
+
+export function drawField(ctx: CanvasRenderingContext2D): void {
drawTargets(ctx);
+ drawHab(ctx);
}
-function drawHab(ctx : CanvasRenderingContext2D) : void {
- ctx.fillstyle = 'rgb(100,100,100)';
- const habLeft = 5 * FT_TO_M;
- const habWidth = 5 * FT_TO_M;
- const habTop = -5 * FT_TO_M;
- const habHeight = 10 * FT_TO_M;
- ctx.fillRect(habLeft,habTop,habWidth,habHeight);
+function drawHab(ctx: CanvasRenderingContext2D): void {
+ drawHalfHab(ctx);
+ ctx.save();
+
+ ctx.scale(1, -1);
+ drawHalfHab(ctx);
+
+ ctx.restore();
}
-function drawTargets(ctx : CanvasRenderingContext2D) : void {
+function drawHalfHab(ctx: CanvasRenderingContext2D): void {
+ ctx.fillStyle = 'rgb(50, 50, 50)';
+ ctx.fillRect(0, 0, HAB_LENGTH, HALF_HAB_3_WIDTH);
+ ctx.fillStyle = 'rgb(100, 100, 100)';
+ ctx.fillRect(0, HALF_HAB_3_WIDTH, HAB_LENGTH, HAB_2_WIDTH);
+ ctx.fillStyle = 'rgb(200, 200, 200)';
+ ctx.fillRect(HAB_LENGTH, 0, HAB_1_LENGTH, HALF_HAB_1_WIDTH);
+ ctx.strokeRect(0, HALF_HAB_3_WIDTH + HAB_2_WIDTH, HAB_LENGTH, DEPOT_WIDTH);
+}
+
+function drawTargets(ctx: CanvasRenderingContext2D): void {
drawHalfCargo(ctx);
drawRocket(ctx);
drawHP(ctx);
@@ -56,11 +76,11 @@
ctx.restore();
}
-function drawHP(ctx : CanvasRenderingContext2D) : void {
+function drawHP(ctx: CanvasRenderingContext2D): void {
drawTarget(ctx, 0, HP_Y, HP_THETA);
}
-function drawRocket(ctx : CanvasRenderingContext2D) : void {
+function drawRocket(ctx: CanvasRenderingContext2D): void {
drawTarget(ctx, ROCKET_PORT_X, ROCKET_PORT_Y, ROCKET_PORT_THETA);
drawTarget(ctx, ROCKET_NEAR_X, ROCKET_HATCH_Y, ROCKET_NEAR_THETA);
@@ -68,7 +88,7 @@
drawTarget(ctx, ROCKET_FAR_X, ROCKET_HATCH_Y, ROCKET_FAR_THETA);
}
-function drawHalfCargo(ctx : CanvasRenderingContext2D) : void {
+function drawHalfCargo(ctx: CanvasRenderingContext2D): void {
drawTarget(ctx, FAR_CARGO_X, SIDE_CARGO_Y, SIDE_CARGO_THETA);
drawTarget(ctx, MID_CARGO_X, SIDE_CARGO_Y, SIDE_CARGO_THETA);
@@ -78,7 +98,8 @@
drawTarget(ctx, FACE_CARGO_X, FACE_CARGO_Y, FACE_CARGO_THETA);
}
-export function drawTarget(ctx : CanvasRenderingContext2D, x: number, y: number, theta: number) : void {
+export function drawTarget(
+ ctx: CanvasRenderingContext2D, x: number, y: number, theta: number): void {
ctx.save();
ctx.translate(x, y);
ctx.rotate(theta);
diff --git a/y2019/vision/server/www/generate_camera.cc b/y2019/vision/server/www/generate_camera.cc
new file mode 100644
index 0000000..757ce69
--- /dev/null
+++ b/y2019/vision/server/www/generate_camera.cc
@@ -0,0 +1,35 @@
+#include "y2019/constants.h"
+#include "y2019/vision/constants.h"
+
+#include <fstream>
+#include <iostream>
+
+namespace y2019 {
+namespace vision {
+void DumpPose(std::basic_ostream<char> *o, const vision::CameraGeometry &pose) {
+ *o << "{x: " << pose.location[0] << ", y: " << pose.location[1]
+ << ", theta: " << pose.heading << "}";
+}
+void DumpTypescriptConstants(const char *fname) {
+ ::std::ofstream out_file(fname);
+ out_file << "export const CAMERA_POSES = [\n";
+ for (size_t ii = 0; ii < constants::Values::kNumCameras; ++ii) {
+ out_file << " ";
+ // TODO(james): Decide how to manage visualization for practice and code
+ // bots.
+ DumpPose(&out_file,
+ GetCamera(CameraSerialNumbers(CompBotTeensyId())[ii])->geometry);
+ out_file << ",\n";
+ }
+ out_file << "];\n";
+}
+} // namespace constants
+} // namespace y2019
+
+int main(int argc, char *argv[]) {
+ if (argc != 2) {
+ ::std::cout << "Must provide a filename for output as an argument\n";
+ return 1;
+ }
+ ::y2019::vision::DumpTypescriptConstants(argv[1]);
+}
diff --git a/y2019/vision/server/www/index.html b/y2019/vision/server/www/index.html
index 4e6e316..c970ce1 100644
--- a/y2019/vision/server/www/index.html
+++ b/y2019/vision/server/www/index.html
@@ -2,9 +2,69 @@
<html>
<head>
<title>Vision Debug Server</title>
+ <style type="text/css">
+ * {margin: 0; padding: 0;}
+ #field {
+ float: left;
+ display: inline-block;
+ border: 1px solid;
+ }
+ #debugdata {
+ float: right;
+ display: inline-block;
+ }
+ .dof_container {
+ padding: 5px;
+ overflow: hidden;
+ }
+ .dof_name {
+ float: left;
+ padding-right: 15px;
+ display: inline-block;
+ }
+ .dof {
+ float: right;
+ display: inline-block;
+ }
+ </style>
</head>
<body style="overflow:hidden">
- <canvas id="field" style="border: 1px solid"></canvas>
+ <div style="overflow:hidden">
+ <canvas id="field"></canvas>
+ <div id="debugdata">
+ <div class="dof_container">
+ <div class="dof_name">
+ wrist
+ </div>
+ <div id="wrist" class="dof">
+ </div>
+ </div>
+
+ <div class="dof_container">
+ <div class="dof_name">
+ elevator
+ </div>
+ <div id="elevator" class="dof">
+ </div>
+ </div>
+
+ <div class="dof_container">
+ <div class="dof_name">
+ intake
+ </div>
+ <div id="intake" class="dof">
+ </div>
+ </div>
+
+ <div class="dof_container">
+ <div class="dof_name">
+ stilts
+ </div>
+ <div id="stilts" class="dof">
+ </div>
+ </div>
+ </div>
+ </div>
</body>
<script src="visualizer_bundle.min.js"></script>
</html>
diff --git a/y2019/vision/server/www/main.ts b/y2019/vision/server/www/main.ts
index 1b3bbf0..1f90527 100644
--- a/y2019/vision/server/www/main.ts
+++ b/y2019/vision/server/www/main.ts
@@ -1,8 +1,6 @@
-import {FT_TO_M, FIELD_WIDTH} from './constants';
+import {FIELD_WIDTH, FT_TO_M} from './constants';
import {drawField, drawTarget} from './field';
-import {drawRobot} from './robot';
-
-const FIELD_WIDTH = 27 * FT_TO_M;
+import {drawRobot, Frame} from './robot';
function main(): void {
const vis = new Visualiser();
@@ -14,63 +12,108 @@
private theta = 0;
private drawLocked = false;
- private lockedX = 0;
- private lockedY = 0;
- private lockedTheta = 0;
+ private targetLocked = false;
+ private targetX = 0;
+ private targetY = 0;
+ private targetTheta = 0;
+ private cameraFrames : Frame[];
+
+ private wrist: number = -1;
+ private elevator: number = -1;
+ private intake: number = -1;
+ private stilts: number = -1;
+
+ private wrist_div: HTMLDivElement;
+ private elevator_div: HTMLDivElement;
+ private intake_div: HTMLDivElement;
+ private stilts_div: HTMLDivElement;
constructor() {
const canvas = <HTMLCanvasElement>document.getElementById('field');
+ this.wrist_div = <HTMLDivElement>document.getElementById('wrist');
+ this.elevator_div = <HTMLDivElement>document.getElementById('elevator');
+ this.intake_div = <HTMLDivElement>document.getElementById('intake');
+ this.stilts_div = <HTMLDivElement>document.getElementById('stilts');
+
const ctx = canvas.getContext('2d');
const server = location.host;
- const socket = new WebSocket(`ws://${server}/ws`);
- const reader = new FileReader();
- reader.addEventListener('loadend', (e) => {
- const text = e.srcElement.result;
- const j = JSON.parse(text);
- this.x = j.robot.x;
- this.y = j.robot.y;
- this.theta = j.robot.theta;
-
- if(j.target) {
- this.drawLocked = true;
- this.lockedX = j.target.x;
- this.lockedY = j.target.y;
- this.lockedTheta = j.target.theta;
- }
- });
- socket.addEventListener('message', (event) => {
- reader.readAsText(event.data);
- });
+ this.initWebSocket(server);
window.requestAnimationFrame(() => this.draw(ctx));
}
- reset(ctx : CanvasRenderingContext2D) : void {
- ctx.setTransform(1,0,0,1,0,0);
+ initWebSocket(server: string): void {
+ const socket = new WebSocket(`ws://${server}/ws`);
+ this.cameraFrames = [];
+
+ socket.addEventListener('message', (event) => {
+ const j = JSON.parse(event.data);
+ this.x = j.robotPose.x;
+ this.y = j.robotPose.y;
+ this.theta = j.robotPose.theta;
+
+ if (j.lineFollowDebug) {
+ this.targetLocked =
+ j.lineFollowDebug.frozen && j.lineFollowDebug.haveTarget;
+ this.targetX = j.lineFollowDebug.goalTarget.x;
+ this.targetY = j.lineFollowDebug.goalTarget.y;
+ this.targetTheta = j.lineFollowDebug.goalTarget.theta;
+ }
+ this.cameraFrames = j.cameraDebug;
+
+ this.wrist = j.sensors.wrist;
+ this.elevator = j.sensors.elevator;
+ this.intake = j.sensors.intake;
+ this.stilts = j.sensors.stilts;
+ });
+ socket.addEventListener('close', (event) => {
+ setTimeout(() => {
+ this.initWebSocket(server);
+ }, 1000);
+ });
+ }
+
+ reset(ctx: CanvasRenderingContext2D): void {
+ ctx.setTransform(1, 0, 0, 1, 0, 0);
const size = Math.min(window.innerHeight, window.innerWidth) * 0.98;
ctx.canvas.height = size;
ctx.canvas.width = size;
- ctx.clearRect(0,0,size,size);
+ ctx.clearRect(0, 0, size, size);
- ctx.translate(size/2, size);
+ ctx.translate(size / 2, size);
ctx.rotate(-Math.PI / 2);
ctx.scale(1, -1);
const M_TO_PX = size / FIELD_WIDTH
ctx.scale(M_TO_PX, M_TO_PX);
ctx.lineWidth = 1 / M_TO_PX;
+
+ this.wrist_div.textContent = "";
+ this.elevator_div.textContent = "";
+ this.intake_div.textContent = "";
+ this.stilts_div.textContent = "";
}
- draw(ctx : CanvasRenderingContext2D) : void {
+ draw(ctx: CanvasRenderingContext2D): void {
this.reset(ctx);
drawField(ctx);
- drawRobot(ctx, this.x, this.y, this.theta);
- if (this.drawLocked) {
- ctx.save();
+ drawRobot(ctx, this.x, this.y, this.theta, this.cameraFrames);
+ ctx.save();
+ ctx.lineWidth = 2.0 * ctx.lineWidth;
+ if (this.targetLocked) {
+ ctx.strokeStyle = 'blue';
+ } else {
ctx.strokeStyle = 'red';
- drawTarget(ctx, this.lockedX, this.lockedY, this.lockedTheta);
- ctx.restore();
}
+ drawTarget(ctx, this.targetX, this.targetY, this.targetTheta);
+ ctx.restore();
+
+ // Now update the superstructure positions.
+ this.wrist_div.textContent = this.wrist.toFixed(3);
+ this.elevator_div.textContent = this.elevator.toFixed(3);
+ this.intake_div.textContent = this.intake.toFixed(3);
+ this.stilts_div.textContent = this.stilts.toFixed(3);
+
window.requestAnimationFrame(() => this.draw(ctx));
}
}
diff --git a/y2019/vision/server/www/robot.ts b/y2019/vision/server/www/robot.ts
index bc1f47f..a106d5f 100644
--- a/y2019/vision/server/www/robot.ts
+++ b/y2019/vision/server/www/robot.ts
@@ -1,9 +1,45 @@
-import {IN_TO_M, FT_TO_M} from './constants';
+import {CAMERA_POSES} from './camera_constants';
+import {FT_TO_M, IN_TO_M} from './constants';
+import {drawTarget} from './field';
const ROBOT_WIDTH = 25 * IN_TO_M;
const ROBOT_LENGTH = 31 * IN_TO_M;
+const CAMERA_SCALE = 0.2;
-export function drawRobot(ctx : CanvasRenderingContext2D, x : number, y : number, theta : number) : void {
+interface Pose {
+ x : number;
+ y : number;
+ theta: number;
+}
+
+export interface Frame {
+ timeSinceLastTarget : number;
+ currentFrameAge : number;
+ targets : Pose[];
+}
+
+function drawCamera(
+ ctx: CanvasRenderingContext2D, pose: Pose, frame: Frame): void {
+ ctx.save();
+ ctx.translate(pose.x, pose.y);
+ ctx.rotate(pose.theta);
+ if (frame.timeSinceLastTarget > 0.25) {
+ ctx.strokeStyle = 'red';
+ } else {
+ ctx.strokeStyle = 'green';
+ }
+ ctx.beginPath();
+ ctx.moveTo(0, 0);
+ ctx.lineTo(CAMERA_SCALE, CAMERA_SCALE);
+ ctx.lineTo(CAMERA_SCALE, -CAMERA_SCALE);
+ ctx.closePath();
+ ctx.stroke();
+ ctx.restore();
+}
+
+export function drawRobot(
+ ctx: CanvasRenderingContext2D, x: number, y: number, theta: number,
+ cameraFrames: Frame[]): void {
ctx.save();
ctx.translate(x, y);
ctx.rotate(theta);
@@ -11,11 +47,31 @@
ctx.fillStyle = 'blue';
ctx.fillRect(-ROBOT_LENGTH / 2, -ROBOT_WIDTH / 2, ROBOT_LENGTH, ROBOT_WIDTH);
- ctx.moveTo(ROBOT_LENGTH / 2, -ROBOT_WIDTH/2);
+ ctx.beginPath();
+ ctx.strokeStyle = 'black';
+ ctx.moveTo(ROBOT_LENGTH / 2, -ROBOT_WIDTH / 2);
ctx.lineTo(ROBOT_LENGTH / 2 + 0.1, 0);
- ctx.lineTo(ROBOT_LENGTH / 2, ROBOT_WIDTH/2);
+ ctx.lineTo(ROBOT_LENGTH / 2, ROBOT_WIDTH / 2);
ctx.closePath();
ctx.stroke();
+ ctx.lineWidth = 3.0 * ctx.lineWidth;
+ for (let ii of [0, 1, 2, 3, 4]) {
+ if (ii < cameraFrames.length) {
+ drawCamera(ctx, CAMERA_POSES[ii], cameraFrames[ii]);
+ }
+ }
ctx.restore();
+
+ ctx.save();
+ ctx.lineWidth = 3.0 * ctx.lineWidth;
+ ctx.strokeStyle = 'yellow';
+ for (let frame of cameraFrames) {
+ if (frame.targets) {
+ for (let target of frame.targets) {
+ drawTarget(ctx, target.x, target.y, target.theta);
+ }
+ }
+ }
+ ctx.restore();
}
diff --git a/y2019/vision/target_finder.cc b/y2019/vision/target_finder.cc
index 3a4c9b0..f6e5ac4 100644
--- a/y2019/vision/target_finder.cc
+++ b/y2019/vision/target_finder.cc
@@ -1,13 +1,18 @@
#include "y2019/vision/target_finder.h"
#include "aos/vision/blob/hierarchical_contour_merge.h"
+#include "ceres/ceres.h"
using namespace aos::vision;
namespace y2019 {
namespace vision {
-TargetFinder::TargetFinder() : target_template_(Target::MakeTemplate()) {}
+TargetFinder::TargetFinder()
+ : target_template_(Target::MakeTemplate()),
+ ceres_context_(ceres::Context::Create()) {}
+
+TargetFinder::~TargetFinder() {}
aos::vision::RangeImage TargetFinder::Threshold(aos::vision::ImagePtr image) {
const uint8_t threshold_value = GetThresholdValue();
@@ -513,7 +518,12 @@
// Closer targets can have a higher error because they are bigger.
const double acceptable_error =
std::max(2 * (75 - 12 * result->extrinsics.z), 75.0);
- if (result->solver_error < acceptable_error) {
+ if (!result->good_corners) {
+ if (verbose) {
+ printf("Rejecting a target with bad corners: (%f, %f)\n",
+ result->solver_error, result->backup_solver_error);
+ }
+ } else if (result->solver_error < acceptable_error) {
if (verbose) {
printf("Using an 8 point solve: %f < %f \n", result->solver_error,
acceptable_error);
@@ -545,13 +555,20 @@
filtered.emplace_back(updatable_result);
}
}
+
+ // Sort the target list so that the widest (ie closest) target is first.
+ sort(filtered.begin(), filtered.end(),
+ [](const IntermediateResult &a, const IntermediateResult &b)
+ -> bool { return a.target_width > b.target_width; });
+
frame_count_++;
if (!filtered.empty()) {
valid_result_count_++;
}
if (print_rate > 0 && frame_count_ > print_rate) {
- LOG(INFO, "Found (%zu / %zu)(%.2f) targets.\n", valid_result_count_,
- frame_count_, (double)valid_result_count_ / (double)frame_count_);
+ LOG(INFO) << "Found (" << valid_result_count_ << " / " << frame_count_
+ << ")(" << ((double)valid_result_count_ / (double)frame_count_)
+ << " targets.";
frame_count_ = 0;
valid_result_count_ = 0;
}
@@ -559,5 +576,61 @@
return filtered;
}
+bool TargetFinder::TestExposure(const std::vector<IntermediateResult> &results,
+ int *desired_exposure) {
+ // TODO(ben): Add these values to config file.
+ constexpr double low_dist = 0.8;
+ constexpr double high_dist = 2.0;
+ constexpr int low_exposure = 60;
+ constexpr int mid_exposure = 300;
+ constexpr int high_exposure = 500;
+
+ bool needs_update = false;
+ if (results.size() > 0) {
+ // We are seeing a target so lets use an exposure
+ // based on the distance to that target.
+ // First result should always be the closest target.
+ if (results[0].extrinsics.z < low_dist) {
+ *desired_exposure = low_exposure;
+ } else if (results[0].extrinsics.z > high_dist) {
+ *desired_exposure = high_exposure;
+ } else {
+ *desired_exposure = mid_exposure;
+ }
+ if (*desired_exposure != current_exposure_) {
+ needs_update = true;
+ current_exposure_ = *desired_exposure;
+ }
+ } else {
+ // We don't see a target, but part of the problem might
+ // be the exposure setting. Lets try changing it and see
+ // if things get better.
+ const int offset = std::rand() % 10;
+
+ // At random with 3/X probability try a higher or lower.
+ if (offset == 0) {
+ if (low_exposure != current_exposure_) {
+ needs_update = true;
+ current_exposure_ = low_exposure;
+ *desired_exposure = low_exposure;
+ }
+ } else if (offset == 1) {
+ if (mid_exposure != current_exposure_) {
+ needs_update = true;
+ current_exposure_ = mid_exposure;
+ *desired_exposure = mid_exposure;
+ }
+ } else if (offset == 2) {
+ if (high_exposure != current_exposure_) {
+ needs_update = true;
+ current_exposure_ = high_exposure;
+ *desired_exposure = high_exposure;
+ }
+ }
+ // If one of our cases is not hit don't change anything.
+ }
+ return needs_update;
+}
+
} // namespace vision
} // namespace y2019
diff --git a/y2019/vision/target_finder.h b/y2019/vision/target_finder.h
index c7de67a..0f1575c 100644
--- a/y2019/vision/target_finder.h
+++ b/y2019/vision/target_finder.h
@@ -1,14 +1,21 @@
#ifndef _Y2019_VISION_TARGET_FINDER_H_
#define _Y2019_VISION_TARGET_FINDER_H_
+#include <memory>
+
+#include "aos/vision/blob/contour.h"
#include "aos/vision/blob/region_alloc.h"
#include "aos/vision/blob/threshold.h"
#include "aos/vision/blob/transpose.h"
-#include "aos/vision/blob/contour.h"
#include "aos/vision/debug/overlay.h"
#include "aos/vision/math/vector.h"
#include "y2019/vision/target_types.h"
+namespace ceres {
+
+class Context;
+
+} // namespace ceres
namespace y2019 {
namespace vision {
@@ -26,6 +33,8 @@
class TargetFinder {
public:
TargetFinder();
+ ~TargetFinder();
+
// Turn a raw image into blob range image.
aos::vision::RangeImage Threshold(aos::vision::ImagePtr image);
@@ -50,6 +59,8 @@
const std::vector<TargetComponent> component_list, bool verbose);
// Given a target solve for the transformation of the template target.
+ //
+ // This is safe to call concurrently.
IntermediateResult ProcessTargetToResult(const Target &target, bool verbose);
// Returns true if a target is good, and false otherwise. Picks the 4 vs 8
@@ -60,6 +71,9 @@
const std::vector<IntermediateResult> &results, uint64_t print_rate,
bool verbose);
+ bool TestExposure(const std::vector<IntermediateResult> &results,
+ int *desired_exposure);
+
// Get the local overlay for debug if we are doing that.
aos::vision::PixelLinesOverlay *GetOverlay() { return &overlay_; }
@@ -88,9 +102,13 @@
ExtrinsicParams default_extrinsics_;
+ const std::unique_ptr<ceres::Context> ceres_context_;
+
// Counts for logging.
size_t frame_count_;
size_t valid_result_count_;
+
+ int current_exposure_ = 0;
};
} // namespace vision
diff --git a/y2019/vision/target_geometry.cc b/y2019/vision/target_geometry.cc
index 91c8848..212759a 100644
--- a/y2019/vision/target_geometry.cc
+++ b/y2019/vision/target_geometry.cc
@@ -6,7 +6,6 @@
#include "aos/util/math.h"
-using ceres::NumericDiffCostFunction;
using ceres::CENTRAL;
using ceres::CostFunction;
using ceres::Problem;
@@ -55,77 +54,6 @@
left.inside, left.bottom}};
}
-Vector<2> Project(Vector<2> pt, const IntrinsicParams &intrinsics,
- const ExtrinsicParams &extrinsics) {
- const double y = extrinsics.y; // height
- const double z = extrinsics.z; // distance
- const double r1 = extrinsics.r1; // skew
- const double r2 = extrinsics.r2; // heading
- const double rup = intrinsics.mount_angle;
- const double rbarrel = intrinsics.barrel_mount;
- const double fl = intrinsics.focal_length;
-
- // Start by translating point in target-space to be at correct height.
- ::Eigen::Matrix<double, 1, 3> pts{pt.x(), pt.y() + y, 0.0};
-
- {
- // Rotate to compensate for skew angle, to get into a frame still at the
- // same (x, y) position as the target but rotated to be facing straight
- // towards the camera.
- const double theta = r1;
- const double s = sin(theta);
- const double c = cos(theta);
- pts = (::Eigen::Matrix<double, 3, 3>() << c, 0, -s, 0, 1, 0, s, 0,
- c).finished() *
- pts.transpose();
- }
-
- // Translate the coordinate frame to have (x, y) centered at the camera, but
- // still oriented to be facing along the line from the camera to the target.
- pts(2) += z;
-
- {
- // Rotate out the heading so that the frame is oriented to line up with the
- // camera's viewpoint in the yaw-axis.
- const double theta = r2;
- const double s = sin(theta);
- const double c = cos(theta);
- pts = (::Eigen::Matrix<double, 3, 3>() << c, 0, -s, 0, 1, 0, s, 0,
- c).finished() *
- pts.transpose();
- }
-
- // TODO: Apply 15 degree downward rotation.
- {
- // Compensate for rotation in the pitch of the camera up/down to get into
- // the coordinate frame lined up with the plane of the camera sensor.
- const double theta = rup;
- const double s = sin(theta);
- const double c = cos(theta);
-
- pts = (::Eigen::Matrix<double, 3, 3>() << 1, 0, 0, 0, c, -s, 0, s,
- c).finished() *
- pts.transpose();
- }
-
- // Compensate for rotation of the barrel of the camera, i.e. about the axis
- // that points straight out from the camera lense, using an AngleAxis instead
- // of manually constructing the rotation matrices because once you get into
- // this frame you no longer need to be masochistic.
- // TODO: Maybe barrel should be extrinsics to allow rocking?
- // Also, in this case, barrel should go above the rotation above?
- pts = ::Eigen::AngleAxis<double>(rbarrel, ::Eigen::Vector3d(0.0, 0.0, 1.0)) *
- pts.transpose();
-
- // TODO: Final image projection.
- const ::Eigen::Matrix<double, 1, 3> res = pts;
-
- // Finally, scale to account for focal length and translate to get into
- // pixel-space.
- const float scale = fl / res.z();
- return Vector<2>(res.x() * scale + 320.0, 240.0 - res.y() * scale);
-}
-
Target Project(const Target &target, const IntrinsicParams &intrinsics,
const ExtrinsicParams &extrinsics) {
Target new_targ;
@@ -150,11 +78,13 @@
IntrinsicParams intrinsics)
: result(result), template_pt(template_pt), intrinsics(intrinsics) {}
- bool operator()(const double *const x, double *residual) const {
- auto extrinsics = ExtrinsicParams::get(x);
- auto pt = result - Project(template_pt, intrinsics, extrinsics);
- residual[0] = pt.x();
- residual[1] = pt.y();
+ template <typename T>
+ bool operator()(const T *const x, T *residual) const {
+ const auto extrinsics = TemplatedExtrinsicParams<T>::get(x);
+ ::Eigen::Matrix<T, 2, 1> pt =
+ Project<T>(ToEigenMatrix<T>(template_pt), intrinsics, extrinsics);
+ residual[0] = result.x() - pt(0, 0);
+ residual[1] = result.y() - pt(1, 0);
return true;
}
@@ -170,15 +100,18 @@
IntrinsicParams intrinsics)
: result(result), template_seg(template_seg), intrinsics(intrinsics) {}
- bool operator()(const double *const x, double *residual) const {
- const auto extrinsics = ExtrinsicParams::get(x);
- const Vector<2> p1 = Project(template_seg.A(), intrinsics, extrinsics);
- const Vector<2> p2 = Project(template_seg.B(), intrinsics, extrinsics);
- // distance from line (P1, P2) to point result
- double dx = p2.x() - p1.x();
- double dy = p2.y() - p1.y();
- double denom = p2.DistanceTo(p1);
- residual[0] = ::std::abs(dy * result.x() - dx * result.y() +
+ template <typename T>
+ bool operator()(const T *const x, T *residual) const {
+ const auto extrinsics = TemplatedExtrinsicParams<T>::get(x);
+ const ::Eigen::Matrix<T, 2, 1> p1 =
+ Project<T>(ToEigenMatrix<T>(template_seg.A()), intrinsics, extrinsics);
+ const ::Eigen::Matrix<T, 2, 1> p2 =
+ Project<T>(ToEigenMatrix<T>(template_seg.B()), intrinsics, extrinsics);
+ // Distance from line(P1, P2) to point result
+ T dx = p2.x() - p1.x();
+ T dy = p2.y() - p1.y();
+ T denom = (p2-p1).norm();
+ residual[0] = ceres::abs(dy * result.x() - dx * result.y() +
p2.x() * p1.y() - p2.y() * p1.x()) /
denom;
return true;
@@ -199,24 +132,28 @@
template_seg_(template_seg),
intrinsics_(intrinsics) {}
- bool operator()(const double *const x, double *residual) const {
- const ExtrinsicParams extrinsics = ExtrinsicParams::get(x);
- const Vector<2> p1 = Project(template_seg_.A(), intrinsics_, extrinsics);
- const Vector<2> p2 = Project(template_seg_.B(), intrinsics_, extrinsics);
+ template <typename T>
+ bool operator()(const T *const x, T *residual) const {
+ const auto extrinsics = TemplatedExtrinsicParams<T>::get(x);
+ const ::Eigen::Matrix<T, 2, 1> p1 = Project<T>(
+ ToEigenMatrix<T>(template_seg_.A()), intrinsics_, extrinsics);
+ const ::Eigen::Matrix<T, 2, 1> p2 = Project<T>(
+ ToEigenMatrix<T>(template_seg_.B()), intrinsics_, extrinsics);
// Construct a vector pointed perpendicular to the line. This vector is
// pointed down out the bottom of the target.
- ::Eigen::Vector2d down_axis(-(p1.y() - p2.y()), p1.x() - p2.x());
+ ::Eigen::Matrix<T, 2, 1> down_axis;
+ down_axis << -(p1.y() - p2.y()), p1.x() - p2.x();
down_axis.normalize();
// Positive means out.
- const double component =
- down_axis.transpose() * (bottom_point_ - p1.GetData().transpose());
+ const T component =
+ down_axis.transpose() * (bottom_point_ - p1);
- if (component > 0) {
+ if (component > T(0)) {
residual[0] = component * 1.0;
} else {
- residual[0] = 0.0;
+ residual[0] = T(0);
}
return true;
}
@@ -236,8 +173,10 @@
double params_4point[ExtrinsicParams::kNumParams];
default_extrinsics_.set(¶ms_4point[0]);
- Problem problem_8point;
- Problem problem_4point;
+ Problem::Options problem_options;
+ problem_options.context = ceres_context_.get();
+ Problem problem_8point(problem_options);
+ Problem problem_4point(problem_options);
::std::array<aos::vision::Vector<2>, 8> target_value = target.ToPointList();
::std::array<aos::vision::Vector<2>, 8> template_value =
@@ -252,18 +191,18 @@
aos::vision::Segment<2> line = Segment<2>(a, a2);
problem_4point.AddResidualBlock(
- new NumericDiffCostFunction<LineCostFunctor, CENTRAL, 1, 4>(
+ new ceres::AutoDiffCostFunction<LineCostFunctor, 1, 4>(
new LineCostFunctor(b, line, intrinsics_)),
NULL, ¶ms_4point[0]);
} else {
problem_4point.AddResidualBlock(
- new NumericDiffCostFunction<PointCostFunctor, CENTRAL, 2, 4>(
+ new ceres::AutoDiffCostFunction<PointCostFunctor, 2, 4>(
new PointCostFunctor(b, a, intrinsics_)),
NULL, ¶ms_4point[0]);
}
problem_8point.AddResidualBlock(
- new NumericDiffCostFunction<PointCostFunctor, CENTRAL, 2, 4>(
+ new ceres::AutoDiffCostFunction<PointCostFunctor, 2, 4>(
new PointCostFunctor(b, a, intrinsics_)),
NULL, ¶ms_8point[0]);
}
@@ -282,7 +221,7 @@
// Now, add a large cost for the bottom point being below the bottom line.
problem_4point.AddResidualBlock(
- new NumericDiffCostFunction<BottomPointCostFunctor, CENTRAL, 1, 4>(
+ new ceres::AutoDiffCostFunction<BottomPointCostFunctor, 1, 4>(
new BottomPointCostFunctor(target.left.bottom_point,
Segment<2>(target_template_.left.outside,
target_template_.left.bottom),
@@ -291,7 +230,7 @@
// Make sure to point the segment the other way so when we do a -pi/2 rotation
// on the line, it points down in target space.
problem_4point.AddResidualBlock(
- new NumericDiffCostFunction<BottomPointCostFunctor, CENTRAL, 1, 4>(
+ new ceres::AutoDiffCostFunction<BottomPointCostFunctor, 1, 4>(
new BottomPointCostFunctor(target.right.bottom_point,
Segment<2>(target_template_.right.bottom,
target_template_.right.outside),
@@ -311,8 +250,68 @@
// Normalize all angles to (-M_PI, M_PI]
IR.extrinsics.r1 = ::aos::math::NormalizeAngle(IR.extrinsics.r1);
IR.extrinsics.r2 = ::aos::math::NormalizeAngle(IR.extrinsics.r2);
- IR.backup_extrinsics.r1 = ::aos::math::NormalizeAngle(IR.backup_extrinsics.r1);
- IR.backup_extrinsics.r2 = ::aos::math::NormalizeAngle(IR.backup_extrinsics.r2);
+ IR.backup_extrinsics.r1 =
+ ::aos::math::NormalizeAngle(IR.backup_extrinsics.r1);
+ IR.backup_extrinsics.r2 =
+ ::aos::math::NormalizeAngle(IR.backup_extrinsics.r2);
+ IR.target_width = target.width();
+
+ // Ok, let's look at how perpendicular the corners are.
+ // Vector from the outside to inside along the top on the left.
+ const ::Eigen::Vector2d top_left_vector =
+ (target.left.top.GetData() - target.left.inside.GetData())
+ .transpose()
+ .normalized();
+ // Vector up the outside of the left target.
+ const ::Eigen::Vector2d outer_left_vector =
+ (target.left.top.GetData() - target.left.outside.GetData())
+ .transpose()
+ .normalized();
+ // Vector up the inside of the left target.
+ const ::Eigen::Vector2d inner_left_vector =
+ (target.left.inside.GetData() - target.left.bottom.GetData())
+ .transpose()
+ .normalized();
+
+ // Vector from the outside to inside along the top on the right.
+ const ::Eigen::Vector2d top_right_vector =
+ (target.right.top.GetData() - target.right.inside.GetData())
+ .transpose()
+ .normalized();
+ // Vector up the outside of the right target.
+ const ::Eigen::Vector2d outer_right_vector =
+ (target.right.top.GetData() - target.right.outside.GetData())
+ .transpose()
+ .normalized();
+ // Vector up the inside of the right target.
+ const ::Eigen::Vector2d inner_right_vector =
+ (target.right.inside.GetData() - target.right.bottom.GetData())
+ .transpose()
+ .normalized();
+
+ // Now dot the vectors and use that to compute angles.
+ // Left side, outside corner.
+ const double left_outer_corner_dot =
+ (outer_left_vector.transpose() * top_left_vector)(0);
+ // Left side, inside corner.
+ const double left_inner_corner_dot =
+ (inner_left_vector.transpose() * top_left_vector)(0);
+ // Right side, outside corner.
+ const double right_outer_corner_dot =
+ (outer_right_vector.transpose() * top_right_vector)(0);
+ // Right side, inside corner.
+ const double right_inner_corner_dot =
+ (inner_right_vector.transpose() * top_right_vector)(0);
+
+ constexpr double kCornerThreshold = 0.35;
+ if (::std::abs(left_outer_corner_dot) < kCornerThreshold &&
+ ::std::abs(left_inner_corner_dot) < kCornerThreshold &&
+ ::std::abs(right_outer_corner_dot) < kCornerThreshold &&
+ ::std::abs(right_inner_corner_dot) < kCornerThreshold) {
+ IR.good_corners = true;
+ } else {
+ IR.good_corners = false;
+ }
if (verbose) {
std::cout << "rup = " << intrinsics_.mount_angle * 180 / M_PI << ";\n";
@@ -334,6 +333,21 @@
std::cout << "z = " << IR.backup_extrinsics.z / kInchesToMeters << ";\n";
std::cout << "r1 = " << IR.backup_extrinsics.r1 * 180 / M_PI << ";\n";
std::cout << "r2 = " << IR.backup_extrinsics.r2 * 180 / M_PI << ";\n";
+
+
+ printf("left upper outer corner angle: %f, top (%f, %f), outer (%f, %f)\n",
+ (outer_left_vector.transpose() * top_left_vector)(0),
+ top_left_vector(0, 0), top_left_vector(1, 0),
+ outer_left_vector(0, 0), outer_left_vector(1, 0));
+ printf("left upper inner corner angle: %f\n",
+ (inner_left_vector.transpose() * top_left_vector)(0));
+
+ printf("right upper outer corner angle: %f, top (%f, %f), outer (%f, %f)\n",
+ (outer_right_vector.transpose() * top_right_vector)(0),
+ top_right_vector(0, 0), top_right_vector(1, 0),
+ outer_right_vector(0, 0), outer_right_vector(1, 0));
+ printf("right upper inner corner angle: %f\n",
+ (inner_right_vector.transpose() * top_right_vector)(0));
}
return IR;
}
diff --git a/y2019/vision/target_sender.cc b/y2019/vision/target_sender.cc
index 3a6fbfe..db33419 100644
--- a/y2019/vision/target_sender.cc
+++ b/y2019/vision/target_sender.cc
@@ -1,18 +1,25 @@
-#include <fstream>
+#include "y2019/vision/target_finder.h"
-#include "aos/logging/implementations.h"
-#include "aos/logging/logging.h"
+#include <condition_variable>
+#include <fstream>
+#include <mutex>
+#include <random>
+#include <thread>
+
#include "aos/vision/blob/codec.h"
#include "aos/vision/blob/find_blob.h"
#include "aos/vision/events/socket_types.h"
#include "aos/vision/events/udp.h"
#include "y2019/jevois/camera/image_stream.h"
#include "y2019/jevois/camera/reader.h"
-
#include "y2019/jevois/serial.h"
#include "y2019/jevois/structures.h"
#include "y2019/jevois/uart.h"
-#include "y2019/vision/target_finder.h"
+#include "y2019/vision/image_writer.h"
+
+// This has to be last to preserve compatibility with other headers using AOS
+// logging.
+#include "glog/logging.h"
using ::aos::events::DataSocket;
using ::aos::events::RXUdpSocket;
@@ -29,7 +36,7 @@
: ImageStreamEvent(fname, params) {}
void ProcessImage(DataRef data, monotonic_clock::time_point monotonic_now) {
- LOG(INFO, "got frame: %d\n", (int)data.size());
+ LOG(INFO) << "got frame: " << data.size();
if (on_frame_) on_frame_(data, monotonic_now);
}
@@ -63,6 +70,96 @@
using aos::vision::ImageRange;
using aos::vision::RangeImage;
using aos::vision::ImageFormat;
+using y2019::vision::TargetFinder;
+using y2019::vision::IntermediateResult;
+using y2019::vision::Target;
+
+class TargetProcessPool {
+ public:
+ // The number of threads we'll use.
+ static constexpr int kThreads = 4;
+
+ TargetProcessPool(TargetFinder *finder);
+ ~TargetProcessPool();
+
+ std::vector<IntermediateResult> Process(std::vector<const Target *> &&inputs,
+ bool verbose);
+
+ private:
+ // The main function for a thread.
+ void RunThread();
+
+ std::array<std::thread, kThreads> threads_;
+ // Coordinates access to results_/inputs_ and coordinates with
+ // condition_variable_.
+ std::mutex mutex_;
+ // Signals changes to results_/inputs_ and quit_.
+ std::condition_variable condition_variable_;
+ bool quit_ = false;
+
+ bool verbose_ = false;
+ std::vector<const Target *> inputs_;
+ std::vector<IntermediateResult> results_;
+
+ TargetFinder *const finder_;
+};
+
+TargetProcessPool::TargetProcessPool(TargetFinder *finder) : finder_(finder) {
+ for (int i = 0; i < kThreads; ++i) {
+ threads_[i] = std::thread([this]() { RunThread(); });
+ }
+}
+
+TargetProcessPool::~TargetProcessPool() {
+ {
+ std::unique_lock<std::mutex> locker(mutex_);
+ quit_ = true;
+ condition_variable_.notify_all();
+ }
+ for (int i = 0; i < kThreads; ++i) {
+ threads_[i].join();
+ }
+}
+
+std::vector<IntermediateResult> TargetProcessPool::Process(
+ std::vector<const Target *> &&inputs, bool verbose) {
+ inputs_ = std::move(inputs);
+ results_.clear();
+ verbose_ = verbose;
+ const size_t number_targets = inputs_.size();
+ {
+ std::unique_lock<std::mutex> locker(mutex_);
+ condition_variable_.notify_all();
+ while (results_.size() < number_targets) {
+ condition_variable_.wait(locker);
+ }
+ }
+ return std::move(results_);
+}
+
+void TargetProcessPool::RunThread() {
+ while (true) {
+ const Target *my_input;
+ {
+ std::unique_lock<std::mutex> locker(mutex_);
+ while (inputs_.empty()) {
+ if (quit_) {
+ return;
+ }
+ condition_variable_.wait(locker);
+ }
+ my_input = inputs_.back();
+ inputs_.pop_back();
+ }
+ IntermediateResult my_output =
+ finder_->ProcessTargetToResult(*my_input, false);
+ {
+ std::unique_lock<std::mutex> locker(mutex_);
+ results_.emplace_back(std::move(my_output));
+ condition_variable_.notify_all();
+ }
+ }
+}
int main(int argc, char **argv) {
(void)argc;
@@ -70,9 +167,8 @@
using namespace y2019::vision;
using frc971::jevois::CameraCommand;
// gflags::ParseCommandLineFlags(&argc, &argv, false);
- ::aos::logging::Init();
- ::aos::logging::AddImplementation(
- new ::aos::logging::StreamLogImplementation(stderr));
+ FLAGS_logtostderr = true;
+ google::InitGoogleLogging(argv[0]);
int itsDev = open_terminos("/dev/ttyS0");
frc971::jevois::CobsPacketizer<frc971::jevois::uart_to_camera_size()> cobs;
@@ -80,61 +176,96 @@
// dup2(itsDev, 1);
// dup2(itsDev, 2);
- TargetFinder finder_;
+ TargetFinder finder;
+ TargetProcessPool process_pool(&finder);
+ ImageWriter writer;
+ uint32_t image_count = 0;
+ bool log_images = false;
aos::vision::CameraParams params0;
- params0.set_exposure(50);
+ params0.set_exposure(60);
params0.set_brightness(40);
params0.set_width(640);
- params0.set_fps(15);
+ params0.set_fps(25);
params0.set_height(480);
+ aos::vision::FastYuyvYPooledThresholder thresholder;
+
+ // A source of psuedorandom numbers which gives different numbers each time we
+ // need to drop targets.
+ std::minstd_rand random_engine;
+
::std::unique_ptr<CameraStream> camera0(
new CameraStream(params0, "/dev/video0"));
camera0->set_on_frame([&](DataRef data,
monotonic_clock::time_point monotonic_now) {
aos::vision::ImageFormat fmt{640, 480};
- aos::vision::BlobList imgs = aos::vision::FindBlobs(
- aos::vision::SlowYuyvYThreshold(fmt, data.data(), 120));
- finder_.PreFilter(&imgs);
- LOG(INFO, "Blobs: (%zu).\n", imgs.size());
+ aos::vision::BlobList imgs =
+ aos::vision::FindBlobs(thresholder.Threshold(fmt, data.data(), 120));
+ finder.PreFilter(&imgs);
+ LOG(INFO) << "Blobs: " << imgs.size();
constexpr bool verbose = false;
::std::vector<Polygon> raw_polys;
for (const RangeImage &blob : imgs) {
// Convert blobs to contours in the corrected space.
- ContourNode* contour = finder_.GetContour(blob);
+ ContourNode *contour = finder.GetContour(blob);
::std::vector<::Eigen::Vector2f> unwarped_contour =
- finder_.UnWarpContour(contour);
+ finder.UnWarpContour(contour);
const Polygon polygon =
- finder_.FindPolygon(::std::move(unwarped_contour), verbose);
+ finder.FindPolygon(::std::move(unwarped_contour), verbose);
if (!polygon.segments.empty()) {
raw_polys.push_back(polygon);
}
}
- LOG(INFO, "Polygons: (%zu).\n", raw_polys.size());
+ LOG(INFO) << "Polygons: " << raw_polys.size();
// Calculate each component side of a possible target.
::std::vector<TargetComponent> target_component_list =
- finder_.FillTargetComponentList(raw_polys, verbose);
- LOG(INFO, "Components: (%zu).\n", target_component_list.size());
+ finder.FillTargetComponentList(raw_polys, verbose);
+ LOG(INFO) << "Components: " << target_component_list.size();
// Put the compenents together into targets.
::std::vector<Target> target_list =
- finder_.FindTargetsFromComponents(target_component_list, verbose);
- LOG(INFO, "Potential Target: (%zu).\n", target_list.size());
+ finder.FindTargetsFromComponents(target_component_list, verbose);
+ static constexpr size_t kMaximumPotentialTargets = 8;
+ LOG(INFO) << "Potential Targets (will filter to "
+ << kMaximumPotentialTargets << "): " << target_list.size();
+
+ // A list of all the indices into target_list which we're going to actually
+ // use.
+ std::vector<int> target_list_indices;
+ target_list_indices.resize(target_list.size());
+ for (size_t i = 0; i < target_list.size(); ++i) {
+ target_list_indices[i] = i;
+ }
+ // Drop random elements until we get sufficiently few of them. We drop
+ // different elements each time to ensure we will see different valid
+ // targets on successive frames, which provides more useful information to
+ // the localization.
+ while (target_list_indices.size() > kMaximumPotentialTargets) {
+ std::uniform_int_distribution<size_t> distribution(
+ 0, target_list_indices.size() - 1);
+ const size_t index = distribution(random_engine);
+ target_list_indices.erase(target_list_indices.begin() + index);
+ }
// Use the solver to generate an intermediate version of our results.
- ::std::vector<IntermediateResult> results;
- for (const Target &target : target_list) {
- results.emplace_back(finder_.ProcessTargetToResult(target, verbose));
+ std::vector<const Target *> inputs;
+ for (size_t index : target_list_indices) {
+ inputs.push_back(&target_list[index]);
}
- LOG(INFO, "Raw Results: (%zu).\n", results.size());
+ std::vector<IntermediateResult> results =
+ process_pool.Process(std::move(inputs), verbose);
+ LOG(INFO) << "Raw Results: " << results.size();
- results = finder_.FilterResults(results, 30, verbose);
- LOG(INFO, "Results: (%zu).\n", results.size());
+ results = finder.FilterResults(results, 30, verbose);
+ LOG(INFO) << "Results: " << results.size();
- // TODO: Select top 3 (randomly?)
+ int desired_exposure;
+ if (finder.TestExposure(results, &desired_exposure)) {
+ camera0->SetExposure(desired_exposure);
+ }
frc971::jevois::CameraFrame frame{};
@@ -149,8 +280,8 @@
frame.age = std::chrono::duration_cast<frc971::jevois::camera_duration>(
aos::monotonic_clock::now() - monotonic_now);
- // If we succeed in writing our delimiter, then write out the rest of the
- // frame. If not, no point in continuing.
+ // If we succeed in writing our delimiter, then write out the rest of
+ // the frame. If not, no point in continuing.
if (write(itsDev, "\0", 1) == 1) {
const auto serialized_frame = frc971::jevois::UartPackToTeensy(frame);
// We don't really care if this succeeds or not. If it fails for some
@@ -160,9 +291,16 @@
write(itsDev, serialized_frame.data(), serialized_frame.size());
if (n != (ssize_t)serialized_frame.size()) {
- LOG(INFO, "Some problem happened");
+ LOG(INFO) << "Some problem happened";
}
}
+
+ if (log_images) {
+ if ((image_count % 5) == 0) {
+ writer.WriteImage(data);
+ }
+ ++image_count;
+ }
});
aos::events::EpollLoop loop;
@@ -176,7 +314,6 @@
char data[kBufferSize];
ssize_t n = read(itsDev, &data[0], kBufferSize);
if (n >= 1) {
- LOG(INFO, "Serial bytes: %zd", n);
cobs.ParseData(gsl::span<const char>(&data[0], n));
auto packet = cobs.received_packet();
if (!packet.empty()) {
@@ -184,7 +321,7 @@
frc971::jevois::UartUnpackToCamera(packet);
if (calibration_question) {
const auto &calibration = *calibration_question;
- IntrinsicParams *intrinsics = finder_.mutable_intrinsics();
+ IntrinsicParams *intrinsics = finder.mutable_intrinsics();
intrinsics->mount_angle = calibration.calibration(0, 0);
intrinsics->focal_length = calibration.calibration(0, 1);
intrinsics->barrel_mount = calibration.calibration(0, 2);
@@ -192,6 +329,10 @@
switch (calibration.camera_command) {
case CameraCommand::kNormal:
case CameraCommand::kAs:
+ log_images = false;
+ break;
+ case CameraCommand::kLog:
+ log_images = true;
break;
case CameraCommand::kUsb:
return 0;
@@ -199,7 +340,7 @@
return system("touch /tmp/do_not_export_sd_card");
}
} else {
- printf("bad frame\n");
+ fprintf(stderr, "bad frame\n");
}
cobs.clear_received_packet();
}
diff --git a/y2019/vision/target_types.h b/y2019/vision/target_types.h
index 8ee1f4c..990debc 100644
--- a/y2019/vision/target_types.h
+++ b/y2019/vision/target_types.h
@@ -1,6 +1,8 @@
#ifndef _Y2019_VISION_TARGET_TYPES_H_
#define _Y2019_VISION_TARGET_TYPES_H_
+#include "Eigen/Dense"
+
#include "aos/vision/math/segment.h"
#include "aos/vision/math/vector.h"
#include "y2019/vision/constants.h"
@@ -46,6 +48,8 @@
TargetComponent left;
TargetComponent right;
+ double width() const { return left.inside.DistanceTo(right.inside); }
+
// Returns a target. The resulting target is in meters with 0, 0 centered
// between the upper inner corners of the two pieces of tape, y being up and x
// being to the right.
@@ -54,28 +58,29 @@
std::array<aos::vision::Vector<2>, 8> ToPointList() const;
};
-struct ExtrinsicParams {
+template <typename Scalar>
+struct TemplatedExtrinsicParams {
static constexpr size_t kNumParams = 4;
// Height of the target
- double y = 18.0 * 0.0254;
+ Scalar y = Scalar(18.0 * 0.0254);
// Distance to the target
- double z = 23.0 * 0.0254;
+ Scalar z = Scalar(23.0 * 0.0254);
// Skew of the target relative to the line-of-sight from the camera to the
// target.
- double r1 = 1.0 / 180 * M_PI;
+ Scalar r1 = Scalar(1.0 / 180 * M_PI);
// Heading from the camera to the target, relative to the center of the view
// from the camera.
- double r2 = -1.0 / 180 * M_PI;
+ Scalar r2 = Scalar(-1.0 / 180 * M_PI);
- void set(double *data) {
+ void set(Scalar *data) {
data[0] = y;
data[1] = z;
data[2] = r1;
data[3] = r2;
}
- static ExtrinsicParams get(const double *data) {
- ExtrinsicParams out;
+ static TemplatedExtrinsicParams get(const Scalar *data) {
+ TemplatedExtrinsicParams out;
out.y = data[0];
out.z = data[1];
out.r1 = data[2];
@@ -84,10 +89,18 @@
}
};
+using ExtrinsicParams = TemplatedExtrinsicParams<double>;
+
// Projects a point from idealized template space to camera space.
+template <typename Extrinsics>
aos::vision::Vector<2> Project(aos::vision::Vector<2> pt,
- const IntrinsicParams &intrinsics,
- const ExtrinsicParams &extrinsics);
+ const IntrinsicParams &intrinsics,
+ const Extrinsics &extrinsics);
+
+template <typename T, typename Extrinsics>
+::Eigen::Matrix<T, 2, 1> Project(::Eigen::Matrix<T, 2, 1> pt,
+ const IntrinsicParams &intrinsics,
+ const Extrinsics &extrinsics);
Target Project(const Target &target, const IntrinsicParams &intrinsics,
const ExtrinsicParams &extrinsics);
@@ -98,6 +111,9 @@
struct IntermediateResult {
ExtrinsicParams extrinsics;
+ // Width of the target in pixels. Distance from inner most points.
+ double target_width;
+
// Error from solver calulations.
double solver_error;
@@ -105,6 +121,8 @@
ExtrinsicParams backup_extrinsics;
double backup_solver_error;
+
+ bool good_corners;
};
// Final foramtting ready for output on the wire.
@@ -128,6 +146,96 @@
float skew;
};
+template<typename T>
+::Eigen::Matrix<T, 2, 1> ToEigenMatrix(aos::vision::Vector<2> pt) {
+ return (::Eigen::Matrix<T, 2, 1>() << T(pt.x()), T(pt.y())).finished();
+}
+
+template <typename Extrinsics>
+aos::vision::Vector<2> Project(aos::vision::Vector<2> pt,
+ const IntrinsicParams &intrinsics,
+ const Extrinsics &extrinsics) {
+ const ::Eigen::Matrix<double, 2, 1> eigen_pt = ToEigenMatrix<double>(pt);
+ const ::Eigen::Matrix<double, 2, 1> res =
+ Project(eigen_pt, intrinsics, extrinsics);
+ return aos::vision::Vector<2>(res(0, 0), res(1, 0));
+}
+
+template <typename T, typename Extrinsics>
+::Eigen::Matrix<T, 2, 1> Project(::Eigen::Matrix<T, 2, 1> pt,
+ const IntrinsicParams &intrinsics,
+ const Extrinsics &extrinsics) {
+ const T y = extrinsics.y; // height
+ const T z = extrinsics.z; // distance
+ const T r1 = extrinsics.r1; // skew
+ const T r2 = extrinsics.r2; // heading
+ const double rup = intrinsics.mount_angle;
+ const double rbarrel = intrinsics.barrel_mount;
+ const double fl = intrinsics.focal_length;
+
+ // Start by translating point in target-space to be at correct height.
+ ::Eigen::Matrix<T, 3, 1> pts{pt(0, 0), pt(1, 0) + y, T(0.0)};
+
+ {
+ // Rotate to compensate for skew angle, to get into a frame still at the
+ // same (x, y) position as the target but rotated to be facing straight
+ // towards the camera.
+ const T theta = r1;
+ const T s = sin(theta);
+ const T c = cos(theta);
+ pts = (::Eigen::Matrix<T, 3, 3>() << c, T(0), -s, T(0), T(1), T(0), s, T(0),
+ c).finished() *
+ pts;
+ }
+
+ // Translate the coordinate frame to have (x, y) centered at the camera, but
+ // still oriented to be facing along the line from the camera to the target.
+ pts(2) += z;
+
+ {
+ // Rotate out the heading so that the frame is oriented to line up with the
+ // camera's viewpoint in the yaw-axis.
+ const T theta = r2;
+ const T s = sin(theta);
+ const T c = cos(theta);
+ pts = (::Eigen::Matrix<T, 3, 3>() << c, T(0), -s, T(0), T(1), T(0), s, T(0),
+ c).finished() *
+ pts;
+ }
+
+ // TODO: Apply 15 degree downward rotation.
+ {
+ // Compensate for rotation in the pitch of the camera up/down to get into
+ // the coordinate frame lined up with the plane of the camera sensor.
+ const double theta = rup;
+ const T s = T(sin(theta));
+ const T c = T(cos(theta));
+
+ pts = (::Eigen::Matrix<T, 3, 3>() << T(1), T(0), T(0), T(0), c, -s, T(0), s,
+ c).finished() *
+ pts;
+ }
+
+ // Compensate for rotation of the barrel of the camera, i.e. about the axis
+ // that points straight out from the camera lense, using an AngleAxis instead
+ // of manually constructing the rotation matrices because once you get into
+ // this frame you no longer need to be masochistic.
+ // TODO: Maybe barrel should be extrinsics to allow rocking?
+ // Also, in this case, barrel should go above the rotation above?
+ pts = ::Eigen::AngleAxis<T>(T(rbarrel),
+ ::Eigen::Matrix<T, 3, 1>(T(0), T(0), T(1))) *
+ pts;
+
+ // TODO: Final image projection.
+ const ::Eigen::Matrix<T, 3, 1> res = pts;
+
+ // Finally, scale to account for focal length and translate to get into
+ // pixel-space.
+ const T scale = fl / res.z();
+ return ::Eigen::Matrix<T, 2, 1>(res.x() * scale + 320.0,
+ 240.0 - res.y() * scale);
+}
+
} // namespace vision
} // namespace y2019
diff --git a/y2019/vision/tools/deploy.sh b/y2019/vision/tools/deploy.sh
index c7c46ca..2538239 100755
--- a/y2019/vision/tools/deploy.sh
+++ b/y2019/vision/tools/deploy.sh
@@ -45,16 +45,24 @@
sleep 5
-if udevadm info -a -n /dev/sda | grep JeVois -q;
-then
- echo "Jevois at /dev/sda"
+JEVOIS_SD=
+for SD in /dev/sd[a-z]; do
+ if udevadm info -a -n "${SD}" | grep JeVois -q; then
+ echo "Jevois at ${SD}"
+ JEVOIS_SD="${SD}"
+ break
+ fi
+done
+if [[ -z ${JEVOIS_SD} ]]; then
+ echo "Failed to find Jevois. Stopping now"
+ exit 1
fi
if ! mount | grep "${TARGET_DIR}" -q
then
sudo mkdir -p "${TARGET_DIR}"
- sudo mount /dev/sda "${TARGET_DIR}"
+ sudo mount "${JEVOIS_SD}" "${TARGET_DIR}"
fi
echo "Waiting for fs ..."
diff --git a/y2019/vision/undistort.py b/y2019/vision/undistort.py
new file mode 100755
index 0000000..9a35d9c
--- /dev/null
+++ b/y2019/vision/undistort.py
@@ -0,0 +1,135 @@
+#!/usr/bin/python
+
+import cv2
+import glob
+import math
+import numpy as np
+import sys
+"""
+Usage:
+ undistort.py [display]
+
+Finds files in /tmp/*.yuyv to compute distortion constants for.
+"""
+
+
+def undist(orig, mtx, dist, newcameramtx, its=1):
+ """
+ This function runs a manual undistort over the entire image to compare to the
+ golden as proof that the algorithm works and the generated constants are correct.
+ """
+ output = np.full(orig.shape, 255, dtype=np.uint8)
+ for i in range(480):
+ for j in range(640):
+ x0 = (i - mtx[1, 2]) / mtx[1, 1]
+ y0 = (j - mtx[0, 2]) / mtx[0, 0]
+ x = x0
+ y = y0
+ for k in range(its):
+ r2 = x * x + y * y
+ coeff = (1 + dist[0, 0] * r2 + dist[0, 1] * math.pow(r2, 2) +
+ dist[0, 4] * math.pow(r2, 3))
+ x = x0 / coeff
+ y = y0 / coeff
+ ip = x * newcameramtx[1, 1] + newcameramtx[1, 2]
+ jp = y * newcameramtx[0, 0] + newcameramtx[0, 2]
+ if ip < 0 or jp < 0 or ip >= 480 or jp >= 640:
+ continue
+ output[int(ip), int(jp)] = orig[i, j]
+ return output
+
+
+def main(argv):
+ # prepare object points, like (0,0,0), (1,0,0), (2,0,0) ....,(6,5,0)
+ objp = np.zeros((6 * 9, 3), np.float32)
+ objp[:, :2] = np.mgrid[0:9, 0:6].T.reshape(-1, 2)
+
+ # Arrays to store object points and image points from all the images.
+ objpoints = [] # 3d point in real world space
+ imgpoints = [] # 2d points in image plane.
+
+ images = glob.glob('/tmp/*.yuyv')
+
+ cols = 640
+ rows = 480
+
+ # Iterate through all the available images
+ for fname in images:
+ fd = open(fname, 'rb')
+ f = np.fromfile(fd, np.uint8, cols * rows * 2)
+ # Convert yuyv color space to single channel grey.
+ grey = f[::2]
+ grey = np.reshape(grey, (rows, cols))
+
+ ret, corners = cv2.findChessboardCorners(grey, (9, 6), None)
+ if ret:
+ objpoints.append(objp)
+ imgpoints.append(corners)
+ # Draw the chessboard with corners marked.
+ if len(argv) > 1 and argv[1] == 'display':
+ rgb = cv2.cvtColor(grey, cv2.COLOR_GRAY2RGB)
+ cv2.drawChessboardCorners(rgb, (9, 6), corners, ret)
+ cv2.imshow('', rgb)
+ cv2.waitKey(0)
+ cv2.destroyAllWindows()
+ fd.close()
+
+ ret, mtx, dist, rvecs, tvecs = cv2.calibrateCamera(
+ objpoints, imgpoints, grey.shape[::-1], None, None)
+ newcameramtx, roi = cv2.getOptimalNewCameraMatrix(mtx, dist, (rows, cols),
+ 1, (rows, cols))
+
+ dist[0, 2] = 0
+ dist[0, 3] = 0
+ print("Formatted for Game Config:")
+ print("""distortion {
+ f_x: %f
+ c_x: %f
+ f_y: %f
+ c_y :%f
+ f_x_prime: %f
+ c_x_prime: %f
+ f_y_prime: %f
+ c_y_prime: %f
+ k_1: %f
+ k_2: %f
+ k_3: %f
+ distortion_iterations: 7
+}""" % (
+ # f_x c_x
+ mtx[0][0],
+ mtx[0][2],
+ # f_y c_y
+ mtx[1][1],
+ mtx[1][2],
+ # f_x c_x prime
+ newcameramtx[0][0],
+ newcameramtx[0][2],
+ # f_y c_y prime
+ newcameramtx[1][1],
+ newcameramtx[1][2],
+ # k_1, k_2, k_3
+ dist[0, 0],
+ dist[0, 1],
+ dist[0, 4]))
+
+ # Draw the original image, open-cv undistort, and our undistort in separate
+ # windows for each available image.
+ if len(argv) > 1 and argv[1] == 'display':
+ for fname in images:
+ fd = open(fname, 'rb')
+ f = np.fromfile(fd, np.uint8, cols * rows * 2)
+ grey_t = f[::2]
+ grey_t = np.reshape(grey_t, (rows, cols))
+ dst_expected = cv2.undistort(grey_t, mtx, dist, None, newcameramtx)
+ dst_actual = undist(grey_t, mtx, dist, newcameramtx, 5)
+ cv2.imshow('orig', grey_t)
+ cv2.imshow('opencv undistort', dst_expected)
+ cv2.imshow('our undistort', dst_actual)
+ cv2.waitKey(0)
+ cv2.destroyAllWindows()
+ fd.close()
+
+
+if __name__ == '__main__':
+ main(sys.argv)
diff --git a/y2019/wpilib_interface.cc b/y2019/wpilib_interface.cc
index fd9df73..17dabde 100644
--- a/y2019/wpilib_interface.cc
+++ b/y2019/wpilib_interface.cc
@@ -198,11 +198,26 @@
stilts_encoder_.set_potentiometer(::std::move(potentiometer));
}
+ void set_platform_left_detect(
+ ::std::unique_ptr<frc::DigitalInput> platform_left_detect) {
+ platform_left_detect_ = ::std::move(platform_left_detect);
+ }
+
+ void set_platform_right_detect(
+ ::std::unique_ptr<frc::DigitalInput> platform_right_detect) {
+ platform_right_detect_ = ::std::move(platform_right_detect);
+ }
+
// Vacuum pressure sensor
void set_vacuum_sensor(int port) {
vacuum_sensor_ = make_unique<frc::AnalogInput>(port);
}
+ // Auto mode switches.
+ void set_autonomous_mode(int i, ::std::unique_ptr<frc::DigitalInput> sensor) {
+ autonomous_modes_.at(i) = ::std::move(sensor);
+ }
+
void RunIteration() override {
{
auto drivetrain_message = drivetrain_queue.position.MakeMessage();
@@ -252,16 +267,38 @@
(vacuum_sensor_->GetVoltage() - kMinVoltage) /
(kMaxVoltage - kMinVoltage);
+ superstructure_message->platform_left_detect =
+ !platform_left_detect_->Get();
+ superstructure_message->platform_right_detect =
+ !platform_right_detect_->Get();
+
superstructure_message.Send();
}
+
+ {
+ auto auto_mode_message = ::frc971::autonomous::auto_mode.MakeMessage();
+ auto_mode_message->mode = 0;
+ for (size_t i = 0; i < autonomous_modes_.size(); ++i) {
+ if (autonomous_modes_[i] && autonomous_modes_[i]->Get()) {
+ auto_mode_message->mode |= 1 << i;
+ }
+ }
+ LOG_STRUCT(DEBUG, "auto mode", *auto_mode_message);
+ auto_mode_message.Send();
+ }
}
private:
::frc971::wpilib::AbsoluteEncoderAndPotentiometer elevator_encoder_,
wrist_encoder_, stilts_encoder_;
+ ::std::unique_ptr<frc::DigitalInput> platform_left_detect_;
+ ::std::unique_ptr<frc::DigitalInput> platform_right_detect_;
+
::std::unique_ptr<frc::AnalogInput> vacuum_sensor_;
+ ::std::array<::std::unique_ptr<frc::DigitalInput>, 2> autonomous_modes_;
+
::frc971::wpilib::AbsoluteEncoder intake_encoder_;
// TODO(sabina): Add wrist and elevator hall effects.
};
@@ -295,10 +332,13 @@
using namespace frc971::jevois;
RoborioToTeensy to_teensy{};
to_teensy.realtime_now = aos::realtime_clock::now();
+ camera_log.FetchLatest();
if (activate_usb_ && !activate_usb_->Get()) {
to_teensy.camera_command = CameraCommand::kUsb;
} else if (activate_passthrough_ && !activate_passthrough_->Get()) {
to_teensy.camera_command = CameraCommand::kCameraPassthrough;
+ } else if (camera_log.get() && camera_log->log) {
+ to_teensy.camera_command = CameraCommand::kLog;
} else {
to_teensy.camera_command = CameraCommand::kNormal;
}
@@ -646,6 +686,12 @@
reader.set_pwm_trigger(true);
reader.set_vacuum_sensor(7);
+ reader.set_platform_right_detect(make_unique<frc::DigitalInput>(6));
+ reader.set_platform_left_detect(make_unique<frc::DigitalInput>(7));
+
+ reader.set_autonomous_mode(0, make_unique<frc::DigitalInput>(22));
+ reader.set_autonomous_mode(0, make_unique<frc::DigitalInput>(23));
+
::std::thread reader_thread(::std::ref(reader));
CameraReader camera_reader;