Skip to content

Qualify encoder fields with this. to avoid clashes #560

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
writeoncereadmany wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Qualify encoder fields with this. to avoid clashes #560

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
12 changes: 6 additions & 6 deletions ...o-codecs/src/main/java/uk/co/real_logic/artio/dictionary/generation/DecoderGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,15 +468,15 @@ protected String resetLength(final String name)
return String.format(
" public void %1$s()\n" +
" {\n" +
" %2$sLength = 0;\n" +
" this.%2$sLength = 0;\n" +
" }\n\n",
nameOfResetMethod(name),
formatPropertyName(name));
}

protected String resetRequiredFloat(final String name)
{
final String lengthReset = flyweightsEnabled ? " %1$sLength = 0;\n" : "";
final String lengthReset = flyweightsEnabled ? " this.%1$sLength = 0;\n" : "";

return String.format(
" public void %2$s()\n" +
Expand Down Expand Up @@ -2081,14 +2081,14 @@ private String decodeField(final Entry entry, final String suffix)
private String storeLengthForVariableLengthFields(final Type type, final String fieldName)
{
return type.hasLengthField(flyweightsEnabled) ?
String.format(" %sLength = valueLength;\n", fieldName) :
String.format(" this.%sLength = valueLength;\n", fieldName) :
"";
}

private String storeOffsetForVariableLengthFields(final Type type, final String fieldName)
{
return type.hasOffsetField(flyweightsEnabled) ?
String.format(" %sOffset = valueOffset;\n", fieldName) :
String.format(" this.%sOffset = valueOffset;\n", fieldName) :
"";
}

Expand Down Expand Up @@ -2255,8 +2255,8 @@ protected String resetStringBasedData(final String name)
return String.format(
" public void %1$s()\n" +
" {\n" +
" %2$sOffset = 0;\n" +
" %2$sLength = 0;\n" +
" this.%2$sOffset = 0;\n" +
" this.%2$sLength = 0;\n" +
" }\n\n",
nameOfResetMethod(name),
formatPropertyName(name));
Expand Down
56 changes: 28 additions & 28 deletions ...o-codecs/src/main/java/uk/co/real_logic/artio/dictionary/generation/EncoderGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ private String generateCopyingDataSetter(
return String.format(
" %4$spublic %2$s %1$sAsCopy(final byte[] value, final int offset, final int length)\n" +
" {\n" +
" %1$s = copyInto(%1$s, value, offset, length);\n" +
" this.%1$s = copyInto(this.%1$s, value, offset, length);\n" +
"%3$s" +
" return this;\n" +
" }\n\n",
Expand Down Expand Up @@ -740,14 +740,14 @@ private String generateBytesSetter(
{
return String.format(
" %4$s final MutableDirectBuffer %1$s = new UnsafeBuffer();\n" +
" %4$s byte[] %1$sInternalBuffer = %1$s.byteArray();\n" +
" %4$s byte[] %1$sInternalBuffer = this.%1$s.byteArray();\n" +
" %4$s int %1$sOffset = 0;\n" +
" %4$s int %1$sLength = 0;\n\n" +
" %5$spublic %2$s %1$s(final DirectBuffer value, final int offset, final int length)\n" +
" {\n" +
" %1$s.wrap(value);\n" +
" %1$sOffset = offset;\n" +
" %1$sLength = length;\n" +
" this.%1$s.wrap(value);\n" +
" this.%1$sOffset = offset;\n" +
" this.%1$sLength = length;\n" +
" return this;\n" +
" }\n\n" +
" %5$spublic %2$s %1$s(final DirectBuffer value, final int length)\n" +
Expand All @@ -760,19 +760,19 @@ private String generateBytesSetter(
" }\n\n" +
" %5$spublic %2$s %1$s(final byte[] value, final int offset, final int length)\n" +
" {\n" +
" %1$s.wrap(value);\n" +
" %1$sOffset = offset;\n" +
" %1$sLength = length;\n" +
" this.%1$s.wrap(value);\n" +
" this.%1$sOffset = offset;\n" +
" this.%1$sLength = length;\n" +
" return this;\n" +
" }\n\n" +
" %5$spublic %2$s %1$sAsCopy(final byte[] value, final int offset, final int length)\n" +
" {\n" +
" if (copyInto(%1$s, value, offset, length))\n" +
" if (copyInto(this.%1$s, value, offset, length))\n" +
" {\n" +
" %1$sInternalBuffer = %1$s.byteArray();\n" +
" %1$sInternalBuffer = this.%1$s.byteArray();\n" +
" }\n" +
" %1$sOffset = 0;\n" +
" %1$sLength = length;\n" +
" this.%1$sOffset = 0;\n" +
" this.%1$sLength = length;\n" +
" return this;\n" +
" }\n\n" +
" %5$spublic %2$s %1$s(final byte[] value, final int length)\n" +
Expand Down Expand Up @@ -813,22 +813,22 @@ private String generateStringSetter(
"%2$s" +
" %5$spublic %3$s %1$s(final CharSequence value)\n" +
" {\n" +
" if (toBytes(value, %1$s))\n" +
" if (toBytes(value, this.%1$s))\n" +
" {\n" +
" %1$sInternalBuffer = %1$s.byteArray();\n" +
" %1$sInternalBuffer = this.%1$s.byteArray();\n" +
" }\n" +
" %1$sOffset = 0;\n" +
" %1$sLength = value.length();\n" +
" this.%1$sOffset = 0;\n" +
" this.%1$sLength = value.length();\n" +
" return this;\n" +
" }\n\n" +
" %5$spublic %3$s %1$s(final AsciiSequenceView value)\n" +
" {\n" +
" final DirectBuffer buffer = value.buffer();\n" +
" if (buffer != null)\n" +
" {\n" +
" %1$s.wrap(buffer);\n" +
" %1$sOffset = value.offset();\n" +
" %1$sLength = value.length();\n" +
" this.%1$s.wrap(buffer);\n" +
" this.%1$sOffset = value.offset();\n" +
" this.%1$sLength = value.length();\n" +
" }\n" +
" return this;\n" +
" }\n\n" +
Expand All @@ -842,12 +842,12 @@ private String generateStringSetter(
" }\n\n" +
" %5$spublic %3$s %1$s(final char[] value, final int offset, final int length)\n" +
" {\n" +
" if (toBytes(value, %1$s, offset, length))\n" +
" if (toBytes(value, this.%1$s, offset, length))\n" +
" {\n" +
" %1$sInternalBuffer = %1$s.byteArray();\n" +
" %1$sInternalBuffer = this.%1$s.byteArray();\n" +
" }\n" +
" %1$sOffset = 0;\n" +
" %1$sLength = length;\n" +
" this.%1$sOffset = 0;\n" +
" this.%1$sLength = length;\n" +
" return this;\n" +
" }\n\n" +
"%4$s",
Expand Down Expand Up @@ -905,13 +905,13 @@ private String decimalFloatSetter(
"%2$s" +
" %7$spublic %3$s %1$s(ReadOnlyDecimalFloat value)\n" +
" {\n" +
" %1$s.set(value);\n" +
" this.%1$s.set(value);\n" +
"%4$s" +
" return this;\n" +
" }\n\n" +
" %7$spublic %3$s %1$s(long value, int scale)\n" +
" {\n" +
" %1$s.set(value, scale);\n" +
" this.%1$s.set(value, scale);\n" +
"%4$s" +
" return this;\n" +
" }\n\n" +
Expand Down Expand Up @@ -1228,7 +1228,7 @@ protected String resetAnyFields(final List<Entry> entries, final StringBuilder m
private String resetAnyFields(final Entry entry)
{
return String.format(
" %1$s.reset();\n",
" this.%1$s.reset();\n",
formatPropertyName(entry.name()));
}

Expand Down Expand Up @@ -1274,7 +1274,7 @@ private String anyFieldsCopyTo(final AnyFields element, final String encoderName
}

return String.format(
" %1$s.copyTo(%2$s.%1$s());\n",
" this.%1$s.copyTo(%2$s.%1$s());\n",
formatPropertyName(element.name()),
encoderName);
}
Expand Down Expand Up @@ -1474,7 +1474,7 @@ protected String resetComponents(final List<Entry> entries, final StringBuilder
private String callComponentReset(final Entry entry)
{
return String.format(
" %1$s.reset();\n",
" this.%1$s.reset();\n",
formatPropertyName(entry.name()));
}

Expand Down
Loading