Skip to content

Interpreter improvements: Close test gap with compiler to 0 tests #215

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
fglock merged 3 commits into from
Feb 20, 2026
Merged

Interpreter improvements: Close test gap with compiler to 0 tests #215

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad5807d
fix: Remove "Interpreter error" prefix from eval'd code exceptions
fglock Feb 20, 2026
ebc92fa
fix: Implement scalar reference dereference in interpreter
fglock Feb 20, 2026
7f14e66
fix: Handle RuntimeList in DEREF opcode to prevent ClassCastException
fglock Feb 20, 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
79 changes: 62 additions & 17 deletions src/main/java/org/perlonjava/interpreter/BytecodeInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1326,12 +1326,25 @@ public static RuntimeList execute(InterpretedCode code, RuntimeArray args, int c
}

case Opcodes.DEREF: {
// Dereference: rd = rs (dereferencing depends on context)
// For now, just copy the reference - proper dereferencing
// is context-dependent and handled by specific operators
// Dereference: rd = $$rs (scalar reference dereference)
// Can receive RuntimeScalar or RuntimeList
int rd = bytecode[pc++];
int rs = bytecode[pc++];
registers[rd] = registers[rs];
RuntimeBase value = registers[rs];

// Only dereference if it's a RuntimeScalar with REFERENCE type
if (value instanceof RuntimeScalar) {
RuntimeScalar scalar = (RuntimeScalar) value;
if (scalar.type == RuntimeScalarType.REFERENCE) {
registers[rd] = scalar.scalarDeref();
} else {
// Non-reference scalar, just copy
registers[rd] = value;
}
} else {
// RuntimeList or other types, pass through
registers[rd] = value;
}
break;
}

Expand Down Expand Up @@ -1806,24 +1819,33 @@ public static RuntimeList execute(InterpretedCode code, RuntimeArray args, int c

case Opcodes.LOAD_SYMBOLIC_SCALAR: {
// Load via symbolic reference: rd = GlobalVariable.getGlobalVariable(nameReg.toString()).get()
// OR dereference if nameReg contains a scalar reference
// Format: LOAD_SYMBOLIC_SCALAR rd nameReg
int rd = bytecode[pc++];
int nameReg = bytecode[pc++];

// Get the variable name from the name register
// Get the value from the name register
RuntimeScalar nameScalar = (RuntimeScalar) registers[nameReg];
String varName = nameScalar.toString();

// Normalize the variable name to include package prefix if needed
// This is important for ${label:var} cases where "colon" becomes "main::colon"
String normalizedName = org.perlonjava.runtime.NameNormalizer.normalizeVariableName(
varName,
"main" // Use main package as default for symbolic references
);

// Get the global variable and load its value
RuntimeScalar globalVar = GlobalVariable.getGlobalVariable(normalizedName);
registers[rd] = globalVar;
// Check if it's a scalar reference - if so, dereference it
if (nameScalar.type == RuntimeScalarType.REFERENCE) {
// This is ${\ref} - dereference the reference
registers[rd] = nameScalar.scalarDeref();
} else {
// This is ${"varname"} - symbolic reference to variable
String varName = nameScalar.toString();

// Normalize the variable name to include package prefix if needed
// This is important for ${label:var} cases where "colon" becomes "main::colon"
String normalizedName = org.perlonjava.runtime.NameNormalizer.normalizeVariableName(
varName,
"main" // Use main package as default for symbolic references
);

// Get the global variable and load its value
RuntimeScalar globalVar = GlobalVariable.getGlobalVariable(normalizedName);
registers[rd] = globalVar;
}
break;
}

Expand Down Expand Up @@ -1929,6 +1951,15 @@ public static RuntimeList execute(InterpretedCode code, RuntimeArray args, int c
throw (PerlDieException) e;
}

// Check if we're running inside an eval STRING context
// (sourceName starts with "(eval " when code is from eval STRING)
// In this case, don't wrap the exception - let the outer eval handler catch it
boolean insideEvalString = code.sourceName != null && code.sourceName.startsWith("(eval ");
if (insideEvalString) {
// Re-throw as-is - will be caught by EvalStringHandler.evalString()
throw e;
}

// Wrap other exceptions with interpreter context including bytecode context
String errorMessage = formatInterpreterError(code, pc, e);
throw new RuntimeException(errorMessage, e);
Expand Down Expand Up @@ -2027,7 +2058,21 @@ private static int executeTypeOps(short opcode, short[] bytecode, int pc,
case Opcodes.DEREF: {
int rd = bytecode[pc++];
int rs = bytecode[pc++];
registers[rd] = registers[rs];
RuntimeBase value = registers[rs];

// Only dereference if it's a RuntimeScalar with REFERENCE type
if (value instanceof RuntimeScalar) {
RuntimeScalar scalar = (RuntimeScalar) value;
if (scalar.type == RuntimeScalarType.REFERENCE) {
registers[rd] = scalar.scalarDeref();
} else {
// Non-reference scalar, just copy
registers[rd] = value;
}
} else {
// RuntimeList or other types, pass through
registers[rd] = value;
}
return pc;
}

Expand Down