Merge pull request #790 from lygstate/c-literal-more

tmontgomery · web-flow · commit b52169a31874 · 2020-05-26T19:05:38.000-07:00
More C String literal improve
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/c/CGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/c/CGenerator.java
@@ -2412,7 +2412,14 @@ private CharSequence generateLiteral(final PrimitiveType type, final String valu
             case INT32:
             {
                 final long intValue = Long.parseLong(value);
-                literal = "INT32_C(" + Integer.toString((int)intValue) + ")";
+                if (intValue == Integer.MIN_VALUE)
+                {
+                    literal = "INT32_MIN";
+                }
+                else
+                {
+                    literal = "INT32_C(" + Long.toString(intValue) + ")";
+                }
                 break;
             }
 
@@ -2423,7 +2430,7 @@ private CharSequence generateLiteral(final PrimitiveType type, final String valu
             case INT64:
             {
                 final long longValue = Long.parseLong(value);
-                if (longValue == -9223372036854775808L)
+                if (longValue == Long.MIN_VALUE)
                 {
                     literal = "INT64_MIN";
                 }

Original file line number	Diff line number	Diff line change
`@@ -2412,7 +2412,14 @@ private CharSequence generateLiteral(final PrimitiveType type, final String valu`
`2412`	`2412`	`case INT32:`
`2413`	`2413`	`{`
`2414`	`2414`	`final long intValue = Long.parseLong(value);`
`2415`		`- literal = "INT32_C(" + Integer.toString((int)intValue) + ")";`
	`2415`	`+ if (intValue == Integer.MIN_VALUE)`
	`2416`	`+ {`
	`2417`	`+ literal = "INT32_MIN";`
	`2418`	`+ }`
	`2419`	`+ else`
	`2420`	`+ {`
	`2421`	`+ literal = "INT32_C(" + Long.toString(intValue) + ")";`
	`2422`	`+ }`
`2416`	`2423`	`break;`
`2417`	`2424`	`}`
`2418`	`2425`
`@@ -2423,7 +2430,7 @@ private CharSequence generateLiteral(final PrimitiveType type, final String valu`
`2423`	`2430`	`case INT64:`
`2424`	`2431`	`{`
`2425`	`2432`	`final long longValue = Long.parseLong(value);`
`2426`		`- if (longValue == -9223372036854775808L)`
	`2433`	`+ if (longValue == Long.MIN_VALUE)`
`2427`	`2434`	`{`
`2428`	`2435`	`literal = "INT64_MIN";`
`2429`	`2436`	`}`