Skip to content

Commit 9842673

Browse files
committed
src: Style changes
1 parent 82fb753 commit 9842673

File tree

2 files changed

+46
-11
lines changed

2 files changed

+46
-11
lines changed

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/c/CGenerator.java

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,11 @@ private static void generateGroupPropertyMembers(
225225
}
226226

227227
private void generateGroupFunctions(
228-
final StringBuilder sb, final CharSequence[] scope, final List<Token> tokens, final String outerStruct, final String outermostStruct)
228+
final StringBuilder sb,
229+
final CharSequence[] scope,
230+
final List<Token> tokens,
231+
final String outerStruct,
232+
final String outermostStruct)
229233
{
230234
for (int i = 0, size = tokens.size(); i < size; ++i)
231235
{
@@ -500,7 +504,10 @@ private static CharSequence generateGroupPropertyFunctions(
500504
return sb;
501505
}
502506

503-
private CharSequence generateVarData(final String structName, final String outermostStruct, final List<Token> tokens)
507+
private CharSequence generateVarData(
508+
final String structName,
509+
final String outermostStruct,
510+
final List<Token> tokens)
504511
{
505512
final StringBuilder sb = new StringBuilder();
506513

@@ -1078,7 +1085,8 @@ private static CharSequence generateFileHeader(
10781085
" #define SBE_BIG_ENDIAN_ENCODE_32(v) (v)\n" +
10791086
" #define SBE_BIG_ENDIAN_ENCODE_64(v) (v)\n" +
10801087
"#else\n" +
1081-
" #error \"Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file.\"\n" +
1088+
" #error \"Byte Ordering of platform not determined." +
1089+
" Set __BYTE_ORDER__ manually before including this file.\"\n" +
10821090
"#endif\n\n" +
10831091
"#if defined(SBE_NO_BOUNDS_CHECK)\n" +
10841092
" #define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)\n" +
@@ -1242,9 +1250,25 @@ private CharSequence generateCompositePropertyFunctions(
12421250
final Token fieldToken = tokens.get(i);
12431251
final String propertyName = formatPropertyName(fieldToken.name());
12441252

1245-
generateFieldMetaAttributeFunction(sb, fieldToken, containingStructName, containingStructName);
1246-
generateFieldCommonFunctions(sb, fieldToken, fieldToken, propertyName, containingStructName);
1247-
generatePropertyFunctions(sb, scope, containingStructName, containingStructName, fieldToken, propertyName, fieldToken);
1253+
generateFieldMetaAttributeFunction(
1254+
sb,
1255+
fieldToken,
1256+
containingStructName,
1257+
containingStructName);
1258+
generateFieldCommonFunctions(
1259+
sb,
1260+
fieldToken,
1261+
fieldToken,
1262+
propertyName,
1263+
containingStructName);
1264+
generatePropertyFunctions(
1265+
sb,
1266+
scope,
1267+
containingStructName,
1268+
containingStructName,
1269+
fieldToken,
1270+
propertyName,
1271+
fieldToken);
12481272

12491273
i += tokens.get(i).componentTokenCount();
12501274
}
@@ -1812,7 +1836,10 @@ private CharSequence generateMessageFlyweightMembers()
18121836
" uint64_t acting_version;\n");
18131837
}
18141838

1815-
private CharSequence generateMessageFlyweightFunctions(final String structName, final Token token, final CharSequence[] scope)
1839+
private CharSequence generateMessageFlyweightFunctions(
1840+
final String structName,
1841+
final Token token,
1842+
final CharSequence[] scope)
18161843
{
18171844
final String blockLengthType = cTypeName(ir.headerStructure().blockLengthType());
18181845
final String templateIdType = cTypeName(ir.headerStructure().templateIdType());
@@ -1907,8 +1934,13 @@ private CharSequence generateMessageFlyweightFunctions(final String structName,
19071934
" %11$s_set_templateId(hdr, %10$s_sbe_template_id());\n" +
19081935
" %11$s_set_schemaId(hdr, %10$s_sbe_schema_id());\n" +
19091936
" %11$s_set_version(hdr, %10$s_sbe_schema_version());\n\n" +
1910-
" %10$s_reset(codec, buffer + offset + %11$s_encoded_length(), 0, buffer_length, %10$s_sbe_block_length(), " +
1911-
"%10$s_sbe_schema_version());\n" +
1937+
" %10$s_reset(\n" +
1938+
" codec,\n" +
1939+
" buffer + offset + %11$s_encoded_length(),\n" +
1940+
" 0,\n" +
1941+
" buffer_length,\n" +
1942+
" %10$s_sbe_block_length(),\n" +
1943+
" %10$s_sbe_schema_version());\n" +
19121944
" return codec;\n" +
19131945
"}\n\n" +
19141946
"SBE_ONE_DEF struct %10$s *%10$s_wrap_for_encode(\n" +
@@ -1996,7 +2028,10 @@ private CharSequence generateFieldMembers(final CharSequence[] scope, final List
19962028
}
19972029

19982030
private CharSequence generateFieldFunctions(
1999-
final CharSequence[] scope, final String containingStructName, final String outermostStruct, final List<Token> tokens)
2031+
final CharSequence[] scope,
2032+
final String containingStructName,
2033+
final String outermostStruct,
2034+
final List<Token> tokens)
20002035
{
20012036
final StringBuilder sb = new StringBuilder();
20022037

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/c/CUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public static String formatName(final String value)
103103
/**
104104
* Format a String as a struct name prepended with a scope.
105105
*
106-
* @param namespaces to be prepended.
106+
* @param scope to be prepended.
107107
* @param value to be formatted.
108108
* @return the string formatted as a struct name.
109109
*/

0 commit comments

Comments
 (0)