Bruce/tomo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Move unistr header out of tomo header

Browse Source
This commit is contained in:
Bruce Hill 2024-10-25 14:05:07 -04:00
parent 67702b2d77
commit 29d1d74d7a
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
stdlib/patterns.c
View File

@ -67,7 +67,7 @@ static inline bool match_str(TextIter_t *state, int64_t *i, const char *str)
static inline bool match_property(TextIter_t *state, int64_t *i, uc_property_t prop)
{
if (*i >= state->text.length) return false;
ucs4_t grapheme = Text$get_main_grapheme_fast(state, *i);
uint32_t grapheme = Text$get_main_grapheme_fast(state, *i);
// TODO: check every codepoint in the cluster?
if (uc_is_property(grapheme, prop)) {
*i += 1;
@ -80,8 +80,8 @@ static int64_t parse_int(TextIter_t *state, int64_t *i)
{
int64_t value = 0;
for (;; *i += 1) {
ucs4_t grapheme = Text$get_main_grapheme_fast(state, *i);
int digit = uc_digit_value((ucs4_t)grapheme);
uint32_t grapheme = Text$get_main_grapheme_fast(state, *i);
int digit = uc_digit_value(grapheme);
if (digit < 0) break;
if (value >= INT64_MAX/10) break;
value = 10*value + digit;
@ -143,8 +143,8 @@ static int64_t match_email(TextIter_t *state, int64_t index)
// dns-label = 1-63 ([a-zA-Z0-9-] | non-ascii)
if (index > 0) {
ucs4_t prev_codepoint = Text$get_main_grapheme_fast(state, index - 1);
if (uc_is_property_alphabetic((ucs4_t)prev_codepoint))
uint32_t prev_codepoint = Text$get_main_grapheme_fast(state, index - 1);
if (uc_is_property_alphabetic(prev_codepoint))
return -1;
}
@ -310,7 +310,7 @@ static int64_t match_uri(TextIter_t *state, int64_t index)
if (index > 0) {
// Don't match if we're not at a word edge:
ucs4_t prev_codepoint = Text$get_main_grapheme_fast(state, index - 1);
uint32_t prev_codepoint = Text$get_main_grapheme_fast(state, index - 1);
if (uc_is_property_alphabetic(prev_codepoint))
return -1;
}
@ -407,7 +407,7 @@ static int64_t match_newline(TextIter_t *state, int64_t index)
if (index >= state->text.length)
return -1;
ucs4_t grapheme = index >= state->text.length ? 0 : Text$get_main_grapheme_fast(state, index);
uint32_t grapheme = index >= state->text.length ? 0 : Text$get_main_grapheme_fast(state, index);
if (grapheme == '\n')
return 1;
if (grapheme == '\r' && Text$get_grapheme_fast(state, index + 1) == '\n')

1
stdlib/shell.c
View File

@ -2,6 +2,7 @@
#include <errno.h>
#include <stdbool.h>
#include <stdint.h>
#include <unistr.h>
#include "arrays.h"
#include "integers.h"

3
stdlib/text.c
View File

@ -56,6 +56,7 @@
#include <stdlib.h>
#include <sys/param.h>
#include <unistr.h>
#include <unicase.h>
#include <unictype.h>
#include <unigbrk.h>
@ -846,7 +847,7 @@ public int32_t Text$get_grapheme_fast(TextIter_t *state, int64_t index)
return 0;
}
public ucs4_t Text$get_main_grapheme_fast(TextIter_t *state, int64_t index)
public uint32_t Text$get_main_grapheme_fast(TextIter_t *state, int64_t index)
{
return MAIN_GRAPHEME_CODEPOINT(Text$get_grapheme_fast(state, index));
}

3
stdlib/text.h
View File

@ -6,7 +6,6 @@
#include <stdbool.h>
#include <printf.h>
#include <stdint.h>
#include <unistr.h>
#include "datatypes.h"
#include "integers.h"
@ -55,7 +54,7 @@ Array_t Text$lines(Text_t text);
Text_t Text$join(Text_t glue, Array_t pieces);
Text_t Text$repeat(Text_t text, Int_t count);
int32_t Text$get_grapheme_fast(TextIter_t *state, int64_t index);
ucs4_t Text$get_main_grapheme_fast(TextIter_t *state, int64_t index);
uint32_t Text$get_main_grapheme_fast(TextIter_t *state, int64_t index);
static inline int32_t Text$get_grapheme(Text_t text, int64_t index)
{