Skip to content

Replaced old deref syntax with the new one; upated stubborn #4

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

Open
worstprgr wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Replaced old deref syntax with the new one; upated stubborn #4

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
fe0b6d7
Updated module stubborn to the latest version of Aug 3, 2025
worstprgr Jan 17, 2026
63d8baa
Removed deprecation warnings as of Jai version beta 0.2.024; Replaced…
worstprgr Jan 17, 2026
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
18 changes: 9 additions & 9 deletions compile.jai
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ compile :: (pattern: string, parse_flags := ParseFlags.LikePerl) -> Regexp, succ
uninit(*regexp);
return .{}, false;
}
#if REGEXP_DEBUG print("Compiled suffix:\n%\n", to_string(<<regexp.prog));
#if REGEXP_DEBUG print("Compiled suffix:\n%\n", to_string(regexp.prog));

regexp.num_capture_groups = compute_num_captures(regexp.suffix_regexp);
// // @ToDo: For one-pass NFA
Expand Down Expand Up @@ -72,12 +72,12 @@ make_patch_list :: (p: int) -> PatchList {
patch :: (inst: *[..] Inst, l: PatchList, p: int) {
head := l.head;
while head != 0 {
ip := *(<<inst)[head>>1];
ip := *(inst.*)[head>>1];
if head & 1 {
head = ip.out1;
ip.out1 = cast(u32)p;
} else {
head = get_out(<<ip);
head = get_out(ip.*);
set_out(ip, p);
}
}
Expand All @@ -88,7 +88,7 @@ append :: (inst: *[..] Inst, l1: PatchList, l2: PatchList) -> PatchList {
if l1.head == 0 return l2;
if l2.head == 0 return l1;

ip := *(<<inst)[l1.tail>>1];
ip := *(inst.*)[l1.tail>>1];
if l1.tail & 1 {
ip.out1 = l2.head;
} else {
Expand Down Expand Up @@ -260,13 +260,13 @@ finish :: (using comp: *Compiler, re: *Regexp_Node) -> *Prog {
prog.inst = inst;

optimize(prog);
#if REGEXP_DEBUG print("Optimized:\n%\n", to_string(<<prog));
#if REGEXP_DEBUG print("Optimized:\n%\n", to_string(prog.*));
flatten(prog);
#if REGEXP_DEBUG print("Flattened:\n%\n", to_string(<<prog));
#if REGEXP_DEBUG print("Flattened:\n%\n", to_string(prog.*));
compute_byte_map(prog);

if (!prog.reversed) {
prefix, prefix_foldcase := required_prefix_for_accel(<<re);
prefix, prefix_foldcase := required_prefix_for_accel(re.*);
if prefix.count && !prefix_foldcase {
prog.prefix_size = prefix.count;
prog.prefix_front = prefix[0];
Expand Down Expand Up @@ -330,7 +330,7 @@ cat :: (using comp: *Compiler, a: Frag, b: Frag) -> Frag {

// Elide no-op.
begin := *inst[a.begin];
if get_opcode(<<begin) == .kInstNop && a.end.head == (a.begin << 1) && get_out(<<begin) == 0 {
if get_opcode(begin.*) == .kInstNop && a.end.head == (a.begin << 1) && get_out(begin.*) == 0 {
// in case refs to a somewhere
patch(*inst, a.end, b.begin);
return b;
Expand Down Expand Up @@ -497,7 +497,7 @@ make_rune_cache_key :: (lo: u8, hi: u8, foldcase: bool, next: int) -> u64 {
cached_rune_byte_suffix :: (using comp: *Compiler, lo: u8, hi: u8, foldcase: bool, next: int) -> int {
key := make_rune_cache_key(lo, hi, foldcase, next);
ptr := table_find_pointer(*rune_cache, key);
if ptr return <<ptr;
if ptr return ptr.*;
id := uncached_rune_byte_suffix(comp, lo, hi, foldcase, next);
table_add(*rune_cache, key, id);
return id;
Expand Down
2 changes: 1 addition & 1 deletion match.jai
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ ascii_strcasecmp :: (a: string, b: string) -> int {
compute_num_captures :: (re: *Regexp_Node) -> int {
count_pre_visit :: (num: *int, re: *Regexp_Node, v: *void) -> *void, bool {
if re.op == .Capture {
<<num += 1;
num.* += 1;
}
return null, false;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/stubborn
Open in desktop
Submodule stubborn updated 4 files
+35 −0 matchers/close_to.jai
+64 −0 matchers/comparison.jai
+2 −0 module.jai
+7 −6 run.jai
2 changes: 1 addition & 1 deletion nfa.jai
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ add_to_queue :: (using nfa: *Nfa, q: *Thread_Queue, id0: int, c: int, ctx: strin

id := a.id;
if id == 0 continue;
if contains(<<q, id) continue;
if contains(q.*, id) continue;

// Create entry in q no matter what. We might fill it in below,
// or we might not. Even if not, it is necessary to have it,
Expand Down
Loading