Skip to content

Commit

Permalink
everywhere: Reduce log span.
Browse files Browse the repository at this point in the history
  • Loading branch information
@sleepy-monax
sleepy-monax committed Apr 26, 2024
1 parent 7d59e69 commit 554d3b3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 52 deletions.
4 changes: 0 additions & 4 deletions src/impls/impl-darwin/async.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
//
#include <impl-posix/fd.h>
#include <impl-posix/utils.h>
#include <karm-logger/logger.h>
#include <karm-sys/async.h>
#include <karm-sys/time.h>

Expand Down Expand Up @@ -141,8 +140,6 @@ struct DarwinSched :
Async::Task<> sleepAsync(TimeStamp until) override {
struct timespec ts = _computeTimeout(until);

logDebug("sleepAsync: {}s {}ns", ts.tv_sec, ts.tv_nsec);

co_trya$(waitFor({
.ident = 0,
.filter = EVFILT_TIMER,
Expand Down Expand Up @@ -178,7 +175,6 @@ struct DarwinSched :
if (n == 0)
return Ok();

logDebug("got event: {}", ev.filter);

usize id = ev.udata;
auto promise =
Expand Down
9 changes: 9 additions & 0 deletions src/libs/karm-base/rope.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#pragma once

namespace Karm {

template <typename T>
struct Rope {
};

} // namespace Karm
48 changes: 0 additions & 48 deletions src/web/web-xml/parser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ namespace Web::Xml {
Res<Strong<Dom::Document>> Parser::parse(Io::SScan &s, Ns ns) {
// document :: = prolog element Misc *

logDebug("Parsing XML document");

auto doc = makeStrong<Dom::Document>();
try$(_parseProlog(s, *doc));
doc->appendChild(try$(_parseElement(s, ns)));
Expand Down Expand Up @@ -51,7 +49,6 @@ static constexpr auto RE_NAME = RE_NAME_START_CHAR & Re::zeroOrMore(RE_NAME_CHAR
Res<> Parser::_parseS(Io::SScan &s) {
// S ::= (#x20 | #x9 | #xD | #xA)+

logDebug("Parsing whitespace");
s.eat(Re::oneOrMore(RE_S));

return Ok();
Expand All @@ -60,8 +57,6 @@ Res<> Parser::_parseS(Io::SScan &s) {
Res<Str> Parser::_parseName(Io::SScan &s) {
// Name ::= NameStartChar (NameChar)*

logDebug("Parsing name");

auto name = s.token(RE_NAME);
if (isEmpty(name))
return Error::invalidData("expected name");
Expand All @@ -76,8 +71,6 @@ static constexpr auto RE_CHARDATA = Re::negate(Re::single('<', '&'));
Res<> Parser::_parseCharData(Io::SScan &s, StringBuilder &sb) {
// CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*)

logDebug("Parsing character data");

bool any = false;

while (
Expand All @@ -104,8 +97,6 @@ static constexpr auto RE_COMMENT_END = "-->"_re;
Res<Strong<Dom::Comment>> Parser::_parseComment(Io::SScan &s) {
// Comment ::= '<!--' ((Char - '-') | ('-' (Char - '-')))* '-->'

logDebug("Parsing comment");

auto rollback = s.rollbackPoint();

if (not s.skip(RE_COMMENT_START))
Expand Down Expand Up @@ -135,8 +126,6 @@ static constexpr auto RE_PI_END = "?>"_re;
Res<> Parser::_parsePi(Io::SScan &s) {
// PI ::= '<?' PITarget (S (Char* - (Char* '?>' Char*)))? '?>

logDebug("Parsing processing instruction");

auto rollback = s.rollbackPoint();

if (not s.skip(RE_PI_START))
Expand All @@ -159,8 +148,6 @@ Res<> Parser::_parsePi(Io::SScan &s) {
Res<> Parser::_parsePiTarget(Io::SScan &s) {
// PITarget ::= Name - (('X' | 'x') ('M' | 'm') ('L' | 'l'))

logDebug("Parsing processing instruction target");

auto name = try$(_parseName(s));
if (eqCi(name, "xml"s))
return Error::invalidData("expected name to not be 'xml'");
Expand All @@ -175,8 +162,6 @@ Res<> Parser::_parseCDSect(Io::SScan &s, StringBuilder &sb) {
// CData ::= (Char* - (Char* ']]>' Char*))
// CDEnd ::= ']]>'

logDebug("Parsing CDATA section");

auto rollback = s.rollbackPoint();

if (not s.skip("<![CDATA["_re))
Expand All @@ -200,8 +185,6 @@ static constexpr auto RE_XML_DECL_START = "<?xml"_re;
Res<> Parser::_parseVersionInfo(Io::SScan &s) {
// versionInfo ::= S 'version' Eq ("'" VersionNum "'" | '"' VersionNum '"')

logDebug("Parsing version info");

try$(_parseS(s));

if (not s.skip("version"_re))
Expand All @@ -213,8 +196,6 @@ Res<> Parser::_parseVersionInfo(Io::SScan &s) {
Res<> Parser::_parseXmlDecl(Io::SScan &s) {
// XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>'

logDebug("Parsing XML declaration");

if (not s.skip(RE_XML_DECL_START))
return Error::invalidData("expected '<?xml'");

Expand All @@ -226,8 +207,6 @@ Res<> Parser::_parseXmlDecl(Io::SScan &s) {
Res<> Parser::_parseMisc(Io::SScan &s, Dom::Node &parent) {
// Misc ::= Comment | PI | S

logDebug("Parsing miscellaneous");

auto rollback = s.rollbackPoint();

if (s.match(RE_COMMENT_START) != Match::NO) {
Expand All @@ -248,8 +227,6 @@ Res<> Parser::_parseProlog(Io::SScan &s, Dom::Node &parent) {
// prolog ::= XMLDecl? Misc* (doctypedecl Misc*)?
auto rollback = s.rollbackPoint();

logDebug("Parsing prolog");

if (s.match(RE_XML_DECL_START) != Match::NO)
try$(Parser::_parseXmlDecl(s));

Expand All @@ -272,8 +249,6 @@ Res<Strong<Dom::DocumentType>> Parser::_parseDoctype(Io::SScan &s) {
// doctypedecl ::= '<!DOCTYPE' S Name (S ExternalID)? S? ('[' intSubset ']' S?)? '>'
auto rollback = s.rollbackPoint();

logDebug("Parsing doctype declaration");

if (not s.skip(RE_DOCTYPE_START))
return Error::invalidData("expected '<!DOCTYPE'");

Expand Down Expand Up @@ -303,8 +278,6 @@ Res<Strong<Dom::DocumentType>> Parser::_parseDoctype(Io::SScan &s) {
Res<Strong<Dom::Element>> Parser::_parseElement(Io::SScan &s, Ns ns) {
// element ::= EmptyElemTag | STag content ETag

logDebug("Parsing element");

auto rollback = s.rollbackPoint();

if (auto r = _parseEmptyElementTag(s, ns)) {
Expand All @@ -330,8 +303,6 @@ Res<Strong<Dom::Element>> Parser::_parseElement(Io::SScan &s, Ns ns) {
Res<Strong<Dom::Element>> Parser::_parseStartTag(Io::SScan &s, Ns ns) {
// STag ::= '<' Name (S Attribute)* S? '>'

logDebug("Parsing start tag");

auto rollback = s.rollbackPoint();
if (not s.skip('<'))
return Error::invalidData("expected '<'");
Expand All @@ -354,8 +325,6 @@ Res<Strong<Dom::Element>> Parser::_parseStartTag(Io::SScan &s, Ns ns) {
Res<> Parser::_parseAttribute(Io::SScan &s, Ns ns, Dom::Element &el) {
// Attribute ::= Name Eq AttValue

logDebug("Parsing attribute");

auto rollback = s.rollbackPoint();

auto name = try$(_parseName(s));
Expand All @@ -375,8 +344,6 @@ Res<String> Parser::_parseAttValue(Io::SScan &s) {
// AttValue ::= '"' ([^<&"] | Reference)* '"'
// | "'" ([^<&'] | Reference)* "'"

logDebug("Parsing attribute value");

StringBuilder sb;

auto rollback = s.rollbackPoint();
Expand Down Expand Up @@ -405,8 +372,6 @@ Res<String> Parser::_parseAttValue(Io::SScan &s) {
Res<> Parser::_parseEndTag(Io::SScan &s, Dom::Element &el) {
// '</' Name S? '>'

logDebug("Parsing end tag");

auto rollback = s.rollbackPoint();

if (not s.skip("</"_re))
Expand All @@ -428,8 +393,6 @@ Res<> Parser::_parseEndTag(Io::SScan &s, Dom::Element &el) {
Res<> Parser::_parseContentItem(Io::SScan &s, Ns ns, Dom::Element &el) {
// (element | Reference | CDSect | PI | Comment)

logDebug("Parsing content item");

if (auto r = _parseElement(s, ns)) {
el.appendChild(r.unwrap());
return Ok();
Expand All @@ -447,8 +410,6 @@ Res<> Parser::_parseContentItem(Io::SScan &s, Ns ns, Dom::Element &el) {
Res<> Parser::_parseContent(Io::SScan &s, Ns ns, Dom::Element &el) {
// content ::= CharData? ((element | Reference | CDSect | PI | Comment) CharData?)*

logDebug("Parsing content");

try$(_parseText(s, el));
while (_parseContentItem(s, ns, el))
try$(_parseText(s, el));
Expand Down Expand Up @@ -484,8 +445,6 @@ Res<> Parser::_parseText(Io::SScan &s, Dom::Element &el) {
Res<Strong<Dom::Element>> Parser::_parseEmptyElementTag(Io::SScan &s, Ns ns) {
// EmptyElemTag ::= '<' Name (S Attribute)* S? '/>'

logDebug("Parsing empty element tag");

auto rollback = s.rollbackPoint();
if (not s.skip('<'))
return Error::invalidData("expected '<'");
Expand All @@ -509,8 +468,6 @@ Res<Strong<Dom::Element>> Parser::_parseEmptyElementTag(Io::SScan &s, Ns ns) {
Res<Rune> Parser::_parseCharRef(Io::SScan &s) {
// CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';'

logDebug("Parsing character reference");

auto rollback = s.rollbackPoint();

if (not s.skip("&#"_re))
Expand Down Expand Up @@ -540,8 +497,6 @@ Res<Rune> Parser::_parseCharRef(Io::SScan &s) {
Res<Rune> Parser::_parseEntityRef(Io::SScan &s) {
// EntityRef ::= '&' Name ';'

logDebug("Parsing entity reference");

auto rollback = s.rollbackPoint();

if (not s.skip('&'))
Expand Down Expand Up @@ -571,8 +526,6 @@ Res<Rune> Parser::_parseEntityRef(Io::SScan &s) {
Res<Rune> Parser::_parseReference(Io::SScan &s) {
// Reference ::= EntityRef | CharRef

logDebug("Parsing reference");

if (auto r = _parseCharRef(s))
return r;
else if (auto r = _parseEntityRef(s))
Expand All @@ -586,7 +539,6 @@ Res<Rune> Parser::_parseReference(Io::SScan &s) {

Res<> Parser::_parseExternalId(Io::SScan &s, Dom::DocumentType &docType) {
// ExternalID ::= 'SYSTEM' S SystemLiteral | 'PUBLIC' S PubidLiteral S SystemLiteral
logDebug("Parsing external ID");

auto rollback = s.rollbackPoint();

Expand Down

0 comments on commit 554d3b3

Please sign in to comment.