Skip to content

Fix indexof #97

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
jucasoliveira merged 2 commits into from
Feb 7, 2026
Merged

Fix indexof #97

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
5850201
Fix indexof
jucasoliveira Feb 7, 2026
5ccd2e1
Fixed with fmt
jucasoliveira Feb 7, 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
2 changes: 1 addition & 1 deletion bootstrap/stdlib.ot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ interface Array<T> {
unshift(item: T): number;
splice(start: number, deleteCount?: number, ...items: T[]): Array<T>;
slice(start?: number, end?: number): Array<T>;
indexOf(item: T): number;
indexOf(item: T, fromIndex?: number): number;
includes(item: T): boolean;
map<U>(fn: (item: T, index: number) => U): Array<U>;
filter(fn: (item: T, index: number) => boolean): Array<T>;
Expand Down
4 changes: 2 additions & 2 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ fn load_and_run_script(

if append {
let offset = vm.append_program(bytecode);
println!(" {} ({} ops at offset {})", path, bytecode_len, offset);
eprintln!(" {} ({} ops at offset {})", path, bytecode_len, offset);
} else {
let path_buf = PathBuf::from(path);
vm.load_program_with_path(bytecode, path_buf);
println!(" {} ({} ops)", path, bytecode_len);
eprintln!(" {} ({} ops)", path, bytecode_len);
}

vm.run_until_halt();
Expand Down
114 changes: 87 additions & 27 deletions src/vm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2349,7 +2349,15 @@ impl VM {
self.stack.push(JsValue::String(result));
}
"indexOf" => {
// Find substring position
// Pop args in reverse order (last arg on top of stack)
let start_index = if arg_count > 1 {
match self.stack.pop() {
Some(JsValue::Number(n)) if n >= 0.0 => n as usize,
_ => 0,
}
} else {
0
};
let search = if arg_count > 0 {
match self.stack.pop() {
Some(JsValue::String(ss)) => ss,
Expand All @@ -2359,11 +2367,14 @@ impl VM {
} else {
String::new()
};
// Pop remaining args
for _ in 1..arg_count {
for _ in 2..arg_count {
self.stack.pop();
}
let result = s.find(&search).map(|i| i as f64).unwrap_or(-1.0);
let result = s
.get(start_index..)
.and_then(|sub| sub.find(&search))
.map(|i| (i + start_index) as f64)
.unwrap_or(-1.0);
self.stack.push(JsValue::Number(result));
}
"split" => {
Expand Down Expand Up @@ -2576,6 +2587,15 @@ impl VM {
self.stack.push(JsValue::String(result));
}
"lastIndexOf" => {
// Pop args in reverse order (last arg on top of stack)
let end_index = if arg_count > 1 {
match self.stack.pop() {
Some(JsValue::Number(n)) if n >= 0.0 => Some(n as usize),
_ => None,
}
} else {
None
};
let search = if arg_count > 0 {
match self.stack.pop() {
Some(JsValue::String(ss)) => ss,
Expand All @@ -2585,10 +2605,19 @@ impl VM {
} else {
String::new()
};
for _ in 1..arg_count {
for _ in 2..arg_count {
self.stack.pop();
}
let result = s.rfind(&search).map(|i| i as f64).unwrap_or(-1.0);
let result = match end_index {
Some(end) => {
let end = (end + search.len()).min(s.len());
s.get(..end)
.and_then(|sub| sub.rfind(&search))
.map(|i| i as f64)
.unwrap_or(-1.0)
}
None => s.rfind(&search).map(|i| i as f64).unwrap_or(-1.0),
};
self.stack.push(JsValue::Number(result));
}
"padStart" => {
Expand Down Expand Up @@ -2815,47 +2844,78 @@ impl VM {
return ExecResult::Continue;
}
"indexOf" => {
// Pop args in reverse order (last arg on top of stack)
let start_index = if arg_count > 1 {
match self.stack.pop() {
Some(JsValue::Number(n)) if n >= 0.0 => n as usize,
_ => 0,
}
} else {
0
};
let search = if arg_count > 0 {
self.stack.pop().unwrap_or(JsValue::Undefined)
} else {
JsValue::Undefined
};
for _ in 1..arg_count {
for _ in 2..arg_count {
self.stack.pop();
}
let result = arr.iter().position(|v| match (v, &search) {
(JsValue::Number(a), JsValue::Number(b)) => a == b,
(JsValue::String(a), JsValue::String(b)) => a == b,
(JsValue::Boolean(a), JsValue::Boolean(b)) => a == b,
(JsValue::Null, JsValue::Null) => true,
(JsValue::Undefined, JsValue::Undefined) => true,
(JsValue::Object(a), JsValue::Object(b)) => a == b,
_ => false,
});
let search_slice = if start_index < arr.len() {
&arr[start_index..]
} else {
&[] as &[JsValue]
};
let result =
search_slice.iter().position(|v| match (v, &search) {
(JsValue::Number(a), JsValue::Number(b)) => a == b,
(JsValue::String(a), JsValue::String(b)) => a == b,
(JsValue::Boolean(a), JsValue::Boolean(b)) => a == b,
(JsValue::Null, JsValue::Null) => true,
(JsValue::Undefined, JsValue::Undefined) => true,
(JsValue::Object(a), JsValue::Object(b)) => a == b,
_ => false,
});
self.stack.push(JsValue::Number(
result.map(|i| i as f64).unwrap_or(-1.0),
result.map(|i| (i + start_index) as f64).unwrap_or(-1.0),
));
self.ip += 1;
return ExecResult::Continue;
}
"lastIndexOf" => {
// Pop args in reverse order (last arg on top of stack)
let from_index = if arg_count > 1 {
match self.stack.pop() {
Some(JsValue::Number(n)) if n >= 0.0 => {
Some(n as usize)
}
_ => None,
}
} else {
None
};
let search = if arg_count > 0 {
self.stack.pop().unwrap_or(JsValue::Undefined)
} else {
JsValue::Undefined
};
for _ in 1..arg_count {
for _ in 2..arg_count {
self.stack.pop();
}
let result = arr.iter().rposition(|v| match (v, &search) {
(JsValue::Number(a), JsValue::Number(b)) => a == b,
(JsValue::String(a), JsValue::String(b)) => a == b,
(JsValue::Boolean(a), JsValue::Boolean(b)) => a == b,
(JsValue::Null, JsValue::Null) => true,
(JsValue::Undefined, JsValue::Undefined) => true,
(JsValue::Object(a), JsValue::Object(b)) => a == b,
_ => false,
});
let end = match from_index {
Some(fi) => (fi + 1).min(arr.len()),
None => arr.len(),
};
let result =
arr[..end].iter().rposition(|v| match (v, &search) {
(JsValue::Number(a), JsValue::Number(b)) => a == b,
(JsValue::String(a), JsValue::String(b)) => a == b,
(JsValue::Boolean(a), JsValue::Boolean(b)) => a == b,
(JsValue::Null, JsValue::Null) => true,
(JsValue::Undefined, JsValue::Undefined) => true,
(JsValue::Object(a), JsValue::Object(b)) => a == b,
_ => false,
});
self.stack.push(JsValue::Number(
result.map(|i| i as f64).unwrap_or(-1.0),
));
Expand Down
Loading