mirror of https://github.com/tstack/lnav
[misc] more include shuffling
Improve xpath() error messages Update alt-text in other themespull/1179/head
Tim Stack
10 months ago
parent
6c8a0d1bb7
commit
4f4fd4091f
@ -0,0 +1,162 @@
|
||||
/**
|
||||
* Copyright (c) 2023, Timothy Stack
|
||||
*
|
||||
* 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.
|
||||
* * Neither the name of Timothy Stack nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
|
||||
*/
|
||||
|
||||
#ifndef lnav_base_line_range_hh
|
||||
#define lnav_base_line_range_hh
|
||||
|
||||
#include <string>
|
||||
|
||||
/**
|
||||
* Encapsulates a range in a string.
|
||||
*/
|
||||
struct line_range {
|
||||
enum class unit {
|
||||
bytes,
|
||||
codepoint,
|
||||
};
|
||||
|
||||
int lr_start;
|
||||
int lr_end;
|
||||
unit lr_unit;
|
||||
|
||||
explicit line_range(int start = -1, int end = -1, unit u = unit::bytes)
|
||||
: lr_start(start), lr_end(end), lr_unit(u)
|
||||
{
|
||||
}
|
||||
|
||||
bool is_valid() const { return this->lr_start != -1; }
|
||||
|
||||
int length() const
|
||||
{
|
||||
return this->lr_end == -1 ? INT_MAX : this->lr_end - this->lr_start;
|
||||
}
|
||||
|
||||
bool empty() const { return this->length() == 0; }
|
||||
|
||||
void clear()
|
||||
{
|
||||
this->lr_start = -1;
|
||||
this->lr_end = -1;
|
||||
}
|
||||
|
||||
int end_for_string(const std::string& str) const
|
||||
{
|
||||
return this->lr_end == -1 ? str.length() : this->lr_end;
|
||||
}
|
||||
|
||||
bool contains(int pos) const
|
||||
{
|
||||
return this->lr_start <= pos
|
||||
&& (this->lr_end == -1 || pos < this->lr_end);
|
||||
}
|
||||
|
||||
bool contains(const struct line_range& other) const
|
||||
{
|
||||
return this->contains(other.lr_start)
|
||||
&& (this->lr_end == -1 || other.lr_end <= this->lr_end);
|
||||
}
|
||||
|
||||
bool intersects(const struct line_range& other) const
|
||||
{
|
||||
if (this->contains(other.lr_start)) {
|
||||
return true;
|
||||
}
|
||||
if (other.lr_end > 0 && this->contains(other.lr_end - 1)) {
|
||||
return true;
|
||||
}
|
||||
if (other.contains(this->lr_start)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
line_range intersection(const struct line_range& other) const;
|
||||
|
||||
line_range& shift(int32_t start, int32_t amount);
|
||||
|
||||
void ltrim(const char* str)
|
||||
{
|
||||
while (this->lr_start < this->lr_end && isspace(str[this->lr_start])) {
|
||||
this->lr_start += 1;
|
||||
}
|
||||
}
|
||||
|
||||
bool operator<(const struct line_range& rhs) const
|
||||
{
|
||||
if (this->lr_start < rhs.lr_start) {
|
||||
return true;
|
||||
}
|
||||
if (this->lr_start > rhs.lr_start) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// this->lr_start == rhs.lr_start
|
||||
if (this->lr_end == rhs.lr_end) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// When the start is the same, the longer range has a lower priority
|
||||
// than the shorter range.
|
||||
if (rhs.lr_end == -1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((this->lr_end == -1) || (this->lr_end > rhs.lr_end)) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool operator==(const struct line_range& rhs) const
|
||||
{
|
||||
return (this->lr_start == rhs.lr_start && this->lr_end == rhs.lr_end);
|
||||
}
|
||||
|
||||
const char* substr(const std::string& str) const
|
||||
{
|
||||
if (this->lr_start == -1) {
|
||||
return str.c_str();
|
||||
}
|
||||
return &(str.c_str()[this->lr_start]);
|
||||
}
|
||||
|
||||
size_t sublen(const std::string& str) const
|
||||
{
|
||||
if (this->lr_start == -1) {
|
||||
return str.length();
|
||||
}
|
||||
if (this->lr_end == -1) {
|
||||
return str.length() - this->lr_start;
|
||||
}
|
||||
return this->length();
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -0,0 +1,111 @@
|
||||
/**
|
||||
* Copyright (c) 2023, Timothy Stack
|
||||
*
|
||||
* 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.
|
||||
* * Neither the name of Timothy Stack nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
|
||||
*/
|
||||
|
||||
#ifndef lnav_hasher_hh
|
||||
#define lnav_hasher_hh
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "base/auto_mem.hh"
|
||||
#include "base/intern_string.hh"
|
||||
#include "byte_array.hh"
|
||||
#include "spookyhash/SpookyV2.h"
|
||||
|
||||
class hasher {
|
||||
public:
|
||||
using array_t = byte_array<2, uint64_t>;
|
||||
static constexpr size_t STRING_SIZE = array_t::STRING_SIZE;
|
||||
|
||||
hasher() { this->h_context.Init(0, 0); }
|
||||
|
||||
hasher& update(const std::string& str)
|
||||
{
|
||||
this->h_context.Update(str.data(), str.length());
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
hasher& update(const string_fragment& str)
|
||||
{
|
||||
this->h_context.Update(str.data(), str.length());
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
hasher& update(const char* bits, size_t len)
|
||||
{
|
||||
this->h_context.Update(bits, len);
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
hasher& update(int64_t value)
|
||||
{
|
||||
value = SPOOKYHASH_LITTLE_ENDIAN_64(value);
|
||||
this->h_context.Update(&value, sizeof(value));
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
array_t to_array()
|
||||
{
|
||||
uint64_t h1;
|
||||
uint64_t h2;
|
||||
array_t retval;
|
||||
|
||||
this->h_context.Final(&h1, &h2);
|
||||
*retval.out(0) = SPOOKYHASH_LITTLE_ENDIAN_64(h1);
|
||||
*retval.out(1) = SPOOKYHASH_LITTLE_ENDIAN_64(h2);
|
||||
return retval;
|
||||
}
|
||||
|
||||
void to_string(auto_buffer& buf)
|
||||
{
|
||||
array_t bits = this->to_array();
|
||||
|
||||
bits.to_string(std::back_inserter(buf));
|
||||
}
|
||||
|
||||
std::string to_string()
|
||||
{
|
||||
array_t bits = this->to_array();
|
||||
return bits.to_string();
|
||||
}
|
||||
|
||||
std::string to_uuid_string()
|
||||
{
|
||||
array_t bits = this->to_array();
|
||||
return bits.to_uuid_string();
|
||||
}
|
||||
|
||||
private:
|
||||
SpookyHash h_context;
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -1 +1 @@
|
||||
error: sqlite3_exec failed -- Invalid XPATH expression at offset 5: Unrecognized node test
|
||||
error: sqlite3_exec failed -- lnav-error:{"level":"error","message":{"str":"Invalid XPath expression","attrs":[]},"reason":{"str":"Unrecognized node test","attrs":[]},"snippets":[{"source":"xpath","line":1,"content":{"str":"/abc[\n ^ Unrecognized node test","attrs":[{"start":0,"end":5,"type":"role","value":40},{"start":11,"end":13,"type":"role","value":74},{"start":13,"end":35,"type":"role","value":5},{"start":6,"end":35,"type":"role","value":40},{"start":35,"end":35,"type":"role","value":40}]}}],"help":{"str":"","attrs":[]}}
|
||||
|
||||
@ -1 +1 @@
|
||||
error: sqlite3_exec failed -- Invalid XML document at offset 3: Error parsing start element tag
|
||||
error: sqlite3_exec failed -- lnav-error:{"level":"error","message":{"str":"Invalid XML document","attrs":[]},"reason":{"str":"Error parsing start element tag","attrs":[]},"snippets":[{"source":"xmldoc","line":1,"content":{"str":"<abc\n ^ Error parsing start element tag","attrs":[{"start":0,"end":4,"type":"role","value":40},{"start":8,"end":10,"type":"role","value":74},{"start":10,"end":41,"type":"role","value":5},{"start":5,"end":41,"type":"role","value":40},{"start":41,"end":41,"type":"role","value":40}]}}],"help":{"str":"","attrs":[]}}
|
||||
|
||||
@ -0,0 +1,132 @@
|
||||
<?xml version="1.0"?>
|
||||
<catalog>
|
||||
<book id="bk101">
|
||||
<author>Gambardella, Matthew</author>
|
||||
<title>XML Developer's Guide</title>
|
||||
<genre>Computer</genre>
|
||||
<price>44.95</price>
|
||||
<publish_date>2000-10-01</publish_date>
|
||||
<description>An in-depth look at creating applications
|
||||
with XML.
|
||||
</description>
|
||||
</book>
|
||||
<book id="bk102">
|
||||
<author>Ralls, Kim</author>
|
||||
<title>Midnight Rain</title>
|
||||
<genre>Fantasy</genre>
|
||||
<price>5.95</price>
|
||||
<publish_date>2000-12-16</publish_date>
|
||||
<description>A former architect battles corporate zombies,
|
||||
an evil sorceress, and her own childhood to become queen
|
||||
of the world.
|
||||
</description>
|
||||
</book>
|
||||
<book id="bk103" abc=">
|
||||
<author>Corets, Eva</author>
|
||||
<title>Maeve Ascendant</title>
|
||||
<genre>Fantasy</genre>
|
||||
<price>5.95</price>
|
||||
<publish_date>2000-11-17</publish_date>
|
||||
<description>After the collapse of a nanotechnology
|
||||
society in England, the young survivors lay the
|
||||
foundation for a new society.
|
||||
</description>
|
||||
</book>
|
||||
<book id=" bk104">
|
||||
<author>Corets, Eva</author>
|
||||
<title>Oberon's Legacy</title>
|
||||
<genre>Fantasy</genre>
|
||||
<price>5.95</price>
|
||||
<publish_date>2001-03-10</publish_date>
|
||||
<description>In post-apocalypse England, the mysterious
|
||||
agent known only as Oberon helps to create a new life
|
||||
for the inhabitants of London. Sequel to Maeve
|
||||
Ascendant.
|
||||
</description>
|
||||
</book>
|
||||
<book id="bk105">
|
||||
<author>Corets, Eva</author>
|
||||
<title>The Sundered Grail</title>
|
||||
<genre>Fantasy</genre>
|
||||
<price>5.95</price>
|
||||
<publish_date>2001-09-10</publish_date>
|
||||
<description>The two daughters of Maeve, half-sisters,
|
||||
battle one another for control of England. Sequel to
|
||||
Oberon's Legacy.
|
||||
</description>
|
||||
</book>
|
||||
<book id="bk106">
|
||||
<author>Randall, Cynthia</author>
|
||||
<title>Lover Birds</title>
|
||||
<genre>Romance</genre>
|
||||
<price>4.95</price>
|
||||
<publish_date>2000-09-02</publish_date>
|
||||
<description>When Carla meets Paul at an ornithology
|
||||
conference, tempers fly as feathers get ruffled.
|
||||
</description>
|
||||
</book>
|
||||
<book id="bk107">
|
||||
<author>Thurman, Paula</author>
|
||||
<title>Splish Splash</title>
|
||||
<genre>Romance</genre>
|
||||
<price>4.95</price>
|
||||
<publish_date>2000-11-02</publish_date>
|
||||
<description>A deep sea diver finds true love twenty
|
||||
thousand leagues beneath the sea.
|
||||
</description>
|
||||
</book>
|
||||
<book id="bk108">
|
||||
<author>Knorr, Stefan</author>
|
||||
<title>Creepy Crawlies</title>
|
||||
<genre>Horror</genre>
|
||||
<price>4.95</price>
|
||||
<publish_date>2000-12-06</publish_date>
|
||||
<description>An anthology of horror stories about roaches,
|
||||
centipedes, scorpions and other insects.
|
||||
</description>
|
||||
</book>
|
||||
<book id="bk109">
|
||||
<author>Kress, Peter</author>
|
||||
<title>Paradox Lost</title>
|
||||
<genre>Science Fiction</genre>
|
||||
<price>6.95</price>
|
||||
<publish_date>2000-11-02</publish_date>
|
||||
<description>After an inadvertant trip through a Heisenberg
|
||||
Uncertainty Device, James Salway discovers the problems
|
||||
of being quantum.
|
||||
</description>
|
||||
</book>
|
||||
<book id="bk110">
|
||||
<author>O'Brien, Tim</author>
|
||||
<title>Microsoft .NET: The Programming Bible</title>
|
||||
<genre>Computer</genre>
|
||||
<price>36.95</price>
|
||||
<publish_date>2000-12-09</publish_date>
|
||||
<description>Microsoft's .NET initiative is explored in
|
||||
detail in this deep programmer's reference.
|
||||
</description>
|
||||
</book>
|
||||
<book id="bk111">
|
||||
<author>O'Brien, Tim</author>
|
||||
<title>MSXML3: A Comprehensive Guide</title>
|
||||
<genre>Computer</genre>
|
||||
<price>36.95</price>
|
||||
<publish_date>2000-12-01</publish_date>
|
||||
<description>The Microsoft MSXML3 parser is covered in
|
||||
detail, with attention to XML DOM interfaces, XSLT processing,
|
||||
SAX and more.
|
||||
</description>
|
||||
</book>
|
||||
<book id="bk112">
|
||||
<author>Galos, Mike</author>
|
||||
<title>Visual Studio 7: A Comprehensive Guide</title>
|
||||
<genre>Computer</genre>
|
||||
<price>49.95</price>
|
||||
<publish_date>2001-04-16</publish_date>
|
||||
<description>Microsoft Visual Studio 7 is explored in depth,
|
||||
looking at how Visual Basic, Visual C++, C#, and ASP+ are
|
||||
integrated into a comprehensive development
|
||||
environment.
|
||||
</description>
|
||||
</book>
|
||||
</catalog>
|
||||
Loading…
Reference in New Issue