Skip to content

C: Use hb_string_T in lexer_peek_helpers.c #656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcoroth merged 2 commits into from
Oct 17, 2025
Merged

C: Use hb_string_T in lexer_peek_helpers.c #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
685d496
Use hb_string_T in lexer peek helper
timkaechele Oct 14, 2025
004212f
Refactor peek for method
timkaechele Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions src/include/lexer_peek_helpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,25 @@ typedef struct {
lexer_state_T state;
} lexer_state_snapshot_T;

char lexer_peek(const lexer_T* lexer, int offset);
bool lexer_peek_for_doctype(const lexer_T* lexer, int offset);
bool lexer_peek_for_xml_declaration(const lexer_T* lexer, int offset);
bool lexer_peek_for_cdata_start(const lexer_T* lexer, int offset);
bool lexer_peek_for_cdata_end(const lexer_T* lexer, int offset);
char lexer_peek(const lexer_T* lexer, uint32_t offset);
bool lexer_peek_for_doctype(const lexer_T* lexer, uint32_t offset);
bool lexer_peek_for_xml_declaration(const lexer_T* lexer, uint32_t offset);
bool lexer_peek_for_cdata_start(const lexer_T* lexer, uint32_t offset);
bool lexer_peek_for_cdata_end(const lexer_T* lexer, uint32_t offset);

bool lexer_peek_for_html_comment_start(const lexer_T* lexer, int offset);
bool lexer_peek_for_html_comment_end(const lexer_T* lexer, int offset);
bool lexer_peek_for_html_comment_start(const lexer_T* lexer, uint32_t offset);
bool lexer_peek_for_html_comment_end(const lexer_T* lexer, uint32_t offset);

bool lexer_peek_erb_close_tag(const lexer_T* lexer, int offset);
bool lexer_peek_erb_dash_close_tag(const lexer_T* lexer, int offset);
bool lexer_peek_erb_percent_close_tag(const lexer_T* lexer, int offset);
bool lexer_peek_erb_equals_close_tag(const lexer_T* lexer, int offset);
bool lexer_peek_erb_end(const lexer_T* lexer, int offset);
bool lexer_peek_erb_close_tag(const lexer_T* lexer, uint32_t offset);
bool lexer_peek_erb_dash_close_tag(const lexer_T* lexer, uint32_t offset);
bool lexer_peek_erb_percent_close_tag(const lexer_T* lexer, uint32_t offset);
bool lexer_peek_erb_equals_close_tag(const lexer_T* lexer, uint32_t offset);
bool lexer_peek_erb_end(const lexer_T* lexer, uint32_t offset);

char lexer_backtrack(const lexer_T* lexer, int offset);
char lexer_backtrack(const lexer_T* lexer, uint32_t offset);

bool lexer_peek_for_token_type_after_whitespace(lexer_T* lexer, token_type_T token_type);
bool lexer_peek_for_close_tag_start(const lexer_T* lexer, int offset);
bool lexer_peek_for_close_tag_start(const lexer_T* lexer, uint32_t offset);

lexer_state_snapshot_T lexer_save_state(lexer_T* lexer);
void lexer_restore_state(lexer_T* lexer, lexer_state_snapshot_T snapshot);
Expand Down
66 changes: 32 additions & 34 deletions src/lexer_peek_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,73 +3,71 @@
#include "include/lexer_struct.h"
#include "include/macros.h"
#include "include/token.h"
#include "include/util/hb_string.h"

#include <ctype.h>
#include <stdbool.h>

char lexer_backtrack(const lexer_T* lexer, const int offset) {
char lexer_backtrack(const lexer_T* lexer, uint32_t offset) {
return lexer->source.data[MAX(lexer->current_position - offset, 0)];
}

char lexer_peek(const lexer_T* lexer, const int offset) {
char lexer_peek(const lexer_T* lexer, uint32_t offset) {
return lexer->source.data[MIN(lexer->current_position + offset, lexer->source.length)];
}

bool lexer_peek_for(const lexer_T* lexer, const int offset, const char* pattern, const bool case_insensitive) {
for (int index = 0; pattern[index]; index++) {
const char character = lexer_peek(lexer, offset + index);
bool lexer_peek_for(const lexer_T* lexer, uint32_t offset, hb_string_T pattern, const bool case_insensitive) {
hb_string_T remaining_source = hb_string_slice(lexer->source, lexer->current_position + offset);
remaining_source.length = MIN(pattern.length, remaining_source.length);
Comment on lines +20 to +21
Copy link
Owner

@marcoroth marcoroth Oct 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, this is elegant! 😍


if (case_insensitive) {
if (tolower(character) != tolower(pattern[index])) { return false; }
} else {
if (character != pattern[index]) { return false; }
}
if (case_insensitive) {
return hb_string_equals_case_insensitive(remaining_source, pattern);
} else {
return hb_string_equals(remaining_source, pattern);
}

return true;
}

bool lexer_peek_for_doctype(const lexer_T* lexer, const int offset) {
return lexer_peek_for(lexer, offset, "<!DOCTYPE", true);
bool lexer_peek_for_doctype(const lexer_T* lexer, uint32_t offset) {
return lexer_peek_for(lexer, offset, hb_string_from_c_string("<!DOCTYPE"), true);
}

bool lexer_peek_for_xml_declaration(const lexer_T* lexer, const int offset) {
return lexer_peek_for(lexer, offset, "<?xml", true);
bool lexer_peek_for_xml_declaration(const lexer_T* lexer, uint32_t offset) {
return lexer_peek_for(lexer, offset, hb_string_from_c_string("<?xml"), true);
}

bool lexer_peek_for_cdata_start(const lexer_T* lexer, const int offset) {
return lexer_peek_for(lexer, offset, "<![CDATA[", false);
bool lexer_peek_for_cdata_start(const lexer_T* lexer, uint32_t offset) {
return lexer_peek_for(lexer, offset, hb_string_from_c_string("<![CDATA["), false);
}

bool lexer_peek_for_cdata_end(const lexer_T* lexer, const int offset) {
return lexer_peek_for(lexer, offset, "]]>", false);
bool lexer_peek_for_cdata_end(const lexer_T* lexer, uint32_t offset) {
return lexer_peek_for(lexer, offset, hb_string_from_c_string("]]>"), false);
}

bool lexer_peek_for_html_comment_start(const lexer_T* lexer, const int offset) {
return lexer_peek_for(lexer, offset, "<!--", false);
bool lexer_peek_for_html_comment_start(const lexer_T* lexer, uint32_t offset) {
return lexer_peek_for(lexer, offset, hb_string_from_c_string("<!--"), false);
}

bool lexer_peek_for_html_comment_end(const lexer_T* lexer, const int offset) {
return lexer_peek_for(lexer, offset, "-->", false);
bool lexer_peek_for_html_comment_end(const lexer_T* lexer, uint32_t offset) {
return lexer_peek_for(lexer, offset, hb_string_from_c_string("-->"), false);
}

bool lexer_peek_erb_close_tag(const lexer_T* lexer, const int offset) {
return lexer_peek_for(lexer, offset, "%>", false);
bool lexer_peek_erb_close_tag(const lexer_T* lexer, uint32_t offset) {
return lexer_peek_for(lexer, offset, hb_string_from_c_string("%>"), false);
}

bool lexer_peek_erb_dash_close_tag(const lexer_T* lexer, const int offset) {
return lexer_peek_for(lexer, offset, "-%>", false);
bool lexer_peek_erb_dash_close_tag(const lexer_T* lexer, uint32_t offset) {
return lexer_peek_for(lexer, offset, hb_string_from_c_string("-%>"), false);
}

bool lexer_peek_erb_percent_close_tag(const lexer_T* lexer, const int offset) {
return lexer_peek_for(lexer, offset, "%%>", false);
bool lexer_peek_erb_percent_close_tag(const lexer_T* lexer, uint32_t offset) {
return lexer_peek_for(lexer, offset, hb_string_from_c_string("%%>"), false);
}

bool lexer_peek_erb_equals_close_tag(const lexer_T* lexer, const int offset) {
return lexer_peek_for(lexer, offset, "=%>", false);
bool lexer_peek_erb_equals_close_tag(const lexer_T* lexer, uint32_t offset) {
return lexer_peek_for(lexer, offset, hb_string_from_c_string("=%>"), false);
}

bool lexer_peek_erb_end(const lexer_T* lexer, const int offset) {
bool lexer_peek_erb_end(const lexer_T* lexer, uint32_t offset) {
return (
lexer_peek_erb_close_tag(lexer, offset) || lexer_peek_erb_dash_close_tag(lexer, offset)
|| lexer_peek_erb_percent_close_tag(lexer, offset) || lexer_peek_erb_equals_close_tag(lexer, offset)
Expand Down Expand Up @@ -103,7 +101,7 @@ bool lexer_peek_for_token_type_after_whitespace(lexer_T* lexer, token_type_T tok
return result;
}

bool lexer_peek_for_close_tag_start(const lexer_T* lexer, const int offset) {
bool lexer_peek_for_close_tag_start(const lexer_T* lexer, uint32_t offset) {
if (lexer_peek(lexer, offset) != '<' || lexer_peek(lexer, offset + 1) != '/') { return false; }

int pos = offset + 2;
Expand Down
Loading