Skip to content
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

Fixes a bug that prevented nested struct macro invocations from being evaluated properly. #1018

Merged
merged 1 commit into from
Dec 19, 2024
Merged

Fixes a bug that prevented nested struct macro invocations from being evaluated properly. #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/main/java/com/amazon/ion/impl/macro/EExpressionArgsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,6 @@ protected void readValueAsExpression(boolean isImplicitRest, List<Expression.EEx
* @param expressions receives the expressions as they are materialized.
*/
private void collectEExpressionArgs(List<Expression.EExpressionBodyExpression> expressions) {
if (reader.isInStruct()) {
expressions.add(new Expression.FieldName(reader.getFieldNameSymbol()));
}
Macro macro = loadMacro();
List<Macro.Parameter> signature = macro.getSignature();
PresenceBitmap presenceBitmap = loadPresenceBitmapIfNecessary(signature);
Expand Down Expand Up @@ -281,6 +278,9 @@ public void beginEvaluatingMacroInvocation(MacroEvaluator macroEvaluator) {
// TODO performance: use a pool of expression lists to avoid repetitive allocations.
List<Expression.EExpressionBodyExpression> expressions = new ArrayList<>();
// TODO performance: avoid fully materializing all expressions up-front.
if (reader.isInStruct()) {
expressions.add(new Expression.FieldName(reader.getFieldNameSymbol()));
}
collectEExpressionArgs(expressions);
macroEvaluator.initExpansion(expressions);
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/amazon/ion/impl/macro/MacroEvaluatorAsIonReader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ class MacroEvaluatorAsIonReader(
val arguments: List<Expression> = evaluator.getArguments()
val numberOfContainerEndsAtExpressionIndex = IntArray(arguments.size + 1)

currentFieldName = null // Field names are written only via FieldName expressions

while (index < arguments.size) {
for (i in 0 until numberOfContainerEndsAtExpressionIndex[index]) {
writer.stepOut()
Expand All @@ -87,7 +89,6 @@ class MacroEvaluatorAsIonReader(
writer.writeValue(this)
}
is Expression.FieldName -> {
queuedFieldName = argument
writer.setFieldNameSymbol(argument.value)
}
is Expression.EExpression -> {
Expand Down
61 changes: 61 additions & 0 deletions src/test/java/com/amazon/ion/impl/EncodingDirectiveCompilationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,67 @@ public void structAsParameter(InputType inputType, StreamType streamType) throws
}
}

private byte[] macroInvocationAsParameterToItself(StreamType outputFormat) {
ByteArrayOutputStream out = new ByteArrayOutputStream();
IonRawWriter_1_1 writer = outputFormat.newWriter(out);
SortedMap<String, Macro> expectedMacroTable = new TreeMap<String, Macro>() {{
put("SimonSays", writeSimonSaysMacro(writer));
}};

outputFormat.startMacroInvocationByName(writer, "SimonSays", expectedMacroTable);
writer.stepInStruct(true);
writer.writeFieldName(FIRST_LOCAL_SYMBOL_ID);
outputFormat.startMacroInvocationByName(writer, "SimonSays", expectedMacroTable);
writer.stepInStruct(true);
writer.writeFieldName(FIRST_LOCAL_SYMBOL_ID);
writer.writeInt(123);
writer.stepOut();
writer.stepOut();

writer.stepOut();
writer.stepOut();

return getBytes(writer, out);
}

@ParameterizedTest(name = "{0},{1}")
@MethodSource("allCombinations")
public void macroInvocationAsParameterToItself(InputType inputType, StreamType streamType) throws Exception {
byte[] data = macroInvocationAsParameterToItself(streamType);

try (IonReader reader = inputType.newReader(data)) {
assertEquals(IonType.STRUCT, reader.next());
reader.stepIn();
assertEquals(IonType.STRUCT, reader.next());
assertEquals("foo", reader.getFieldName());
reader.stepIn();
assertEquals(IonType.INT, reader.next());
assertEquals("foo", reader.getFieldName());
assertEquals(123, reader.intValue());
assertNull(reader.next());
reader.stepOut();
reader.stepOut();
assertNull(reader.next());
}
}

@ParameterizedTest(name = "{0},{1},{2}")
@MethodSource("allInputFormatsInputTypesAndOutputFormats")
public void macroInvocationAsParameterToItselfMacroAwareTranscode(
InputType inputType,
StreamType inputFormat,
StreamType outputFormat
) throws Exception {
byte[] data = macroInvocationAsParameterToItself(outputFormat);

verifyMacroAwareTranscode(
data, inputType, inputFormat,
substringCount("(:SimonSays", 2),
substringCount("foo:", 2),
substringCount("123", 1)
);
}

@ParameterizedTest(name = "{0},{1}")
@MethodSource("allCombinations")
public void macroInvocationAsParameter(InputType inputType, StreamType streamType) throws Exception {
Expand Down
Loading