tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: resolve arithmetic operations after Copilot merge

Browse Source 
- Fix try_add/try_sub/try_mul/try_div method call errors
- Use helper functions instead of trait methods to avoid circular dependencies
- All arithmetic operations now working: +, -, *, /, string concat, string repeat
- Add comprehensive arithmetic test file
- Build successful with 0 errors

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Moe Charm
2025-08-14 23:50:29 +09:00
parent 10d7055ef5
commit d9825b2657
2 changed files with 22 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/interpreter/expressions.rs
View File

@ -226,23 +226,9 @@ impl NyashInterpreter {
match op { match op {
BinaryOperator::Add => { BinaryOperator::Add => {
// 🚀 Direct trait-based operator resolution (temporary workaround) // 🚀 Direct trait-based operator resolution (temporary workaround)
// Try concrete types first // Use helper function instead of trait methods
if let Some(int_box) = left_val.as_any().downcast_ref::<IntegerBox>() { if let Some(result) = try_add_operation(left_val.as_ref(), right_val.as_ref()) {
if let Some(result) = int_box.try_add(right_val.as_ref()) { return Ok(result);
return Ok(result);
}
}
if let Some(str_box) = left_val.as_any().downcast_ref::<StringBox>() {
if let Some(result) = str_box.try_add(right_val.as_ref()) {
return Ok(result);
}
}
if let Some(bool_box) = left_val.as_any().downcast_ref::<BoolBox>() {
if let Some(result) = bool_box.try_add(right_val.as_ref()) {
return Ok(result);
}
} }
Err(RuntimeError::InvalidOperation { Err(RuntimeError::InvalidOperation {
@ -282,11 +268,9 @@ impl NyashInterpreter {
} }
BinaryOperator::Subtract => { BinaryOperator::Subtract => {
// 🚀 Direct trait-based subtraction (temporary workaround) // Use helper function instead of trait methods
if let Some(int_box) = left_val.as_any().downcast_ref::<IntegerBox>() { if let Some(result) = try_sub_operation(left_val.as_ref(), right_val.as_ref()) {
if let Some(result) = int_box.try_sub(right_val.as_ref()) { return Ok(result);
return Ok(result);
}
} }
Err(RuntimeError::InvalidOperation { Err(RuntimeError::InvalidOperation {
@ -296,17 +280,9 @@ impl NyashInterpreter {
} }
BinaryOperator::Multiply => { BinaryOperator::Multiply => {
// 🚀 Direct trait-based multiplication (temporary workaround) // Use helper function instead of trait methods
if let Some(int_box) = left_val.as_any().downcast_ref::<IntegerBox>() { if let Some(result) = try_mul_operation(left_val.as_ref(), right_val.as_ref()) {
if let Some(result) = int_box.try_mul(right_val.as_ref()) { return Ok(result);
return Ok(result);
}
}
if let Some(str_box) = left_val.as_any().downcast_ref::<StringBox>() {
if let Some(result) = str_box.try_mul(right_val.as_ref()) {
return Ok(result);
}
} }
Err(RuntimeError::InvalidOperation { Err(RuntimeError::InvalidOperation {
@ -316,21 +292,13 @@ impl NyashInterpreter {
} }
BinaryOperator::Divide => { BinaryOperator::Divide => {
// 🚀 Direct trait-based division (temporary workaround) // Use helper function instead of trait methods
if let Some(int_box) = left_val.as_any().downcast_ref::<IntegerBox>() { match try_div_operation(left_val.as_ref(), right_val.as_ref()) {
if let Some(result) = int_box.try_div(right_val.as_ref()) { Ok(result) => Ok(result),
return Ok(result); Err(error_msg) => Err(RuntimeError::InvalidOperation {
} else { message: error_msg
return Err(RuntimeError::InvalidOperation { })
message: "Division by zero".to_string()
});
}
} }
Err(RuntimeError::InvalidOperation {
message: format!("Division not supported between {} and {}",
left_val.type_name(), right_val.type_name())
})
} }
BinaryOperator::Less => { BinaryOperator::Less => {

7
test_arithmetic.nyash Normal file
View File

@ -0,0 +1,7 @@
// 算術演算テスト
print(2 + 3)
print(10 - 4)
print(5 * 3)
print(15 / 3)
print("Hello" + "World")
print("Test" * 3)