Directly output an int if an integer literal is available

Author: Exanite

sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitStmt.cs

@@ -42,15 +42,25 @@ private void VisitBinaryOperator(BinaryOperator binaryOperator)
         outputBuilder.Write(binaryOperator.OpcodeStr);
         outputBuilder.Write(' ');
 
-        if ((binaryOperator.IsShiftOp || binaryOperator.IsShiftAssignOp) && binaryOperator.RHS.Type.Kind != CXType_Int)
+        if (binaryOperator.IsShiftOp || binaryOperator.IsShiftAssignOp)
         {
             // RHS of shift operation in C# must be an int
-            outputBuilder.Write("(int)");
-            outputBuilder.Write('(');
-
-            Visit(binaryOperator.RHS);
+            if (binaryOperator.RHS.Type.Kind is CXType_Int or CXType_Long)
+            {
+                Visit(binaryOperator.RHS);
+            }
+            else if (binaryOperator.RHS is IntegerLiteral literal)
+            {
+                outputBuilder.Write(literal.Value);
+            }
+            else
+            {
+                outputBuilder.Write("(int)");
 
-            outputBuilder.Write(')');
+                outputBuilder.Write('(');
+                Visit(binaryOperator.RHS);
+                outputBuilder.Write(')');
+            }
         }
         else
         {

tests/ClangSharp.PInvokeGenerator.UnitTests/CTest.cs

@@ -285,9 +285,11 @@ public Task UnsignedIntBitshiftTest()
     {
         var inputContents = @"
 const int Signed = 1;
-const unsigned int Unsigned = 1U;
+const long SignedLong = 1;
+const unsigned int Unsigned = 1;
 
 const int ShiftSigned = 1 << Signed;
+const int ShiftSignedLong = 1 << SignedLong;
 const int ShiftUnsigned = 1 << Unsigned;
 
 const int CInt = 1 << 1;
@@ -309,41 +311,47 @@ public static partial class Methods
         [NativeTypeName(""const int"")]
         public const int Signed = 1;
 
+        [NativeTypeName(""const long"")]
+        public const int SignedLong = 1;
+
         [NativeTypeName(""const unsigned int"")]
-        public const uint Unsigned = 1U;
+        public const uint Unsigned = 1;
 
         [NativeTypeName(""const int"")]
         public const int ShiftSigned = 1 << Signed;
 
+        [NativeTypeName(""const int"")]
+        public const int ShiftSignedLong = 1 << SignedLong;
+
         [NativeTypeName(""const int"")]
         public const int ShiftUnsigned = 1 << (int)(Unsigned);
 
         [NativeTypeName(""const int"")]
         public const int CInt = 1 << 1;
 
         [NativeTypeName(""const int"")]
-        public const int CUint = 1 << (int)(1U);
+        public const int CUint = 1 << 1;
 
         [NativeTypeName(""#define Left 1 << 1U"")]
-        public const int Left = 1 << (int)(1U);
+        public const int Left = 1 << 1;
 
         [NativeTypeName(""#define Right 1 >> 1U"")]
-        public const int Right = 1 >> (int)(1U);
+        public const int Right = 1 >> 1;
 
         [NativeTypeName(""#define Int 1 << 1"")]
         public const int Int = 1 << 1;
 
         [NativeTypeName(""#define Long 1 << 1L"")]
-        public const int Long = 1 << (int)(1);
+        public const int Long = 1 << 1;
 
         [NativeTypeName(""#define LongLong 1 << 1LL"")]
-        public const int LongLong = 1 << (int)(1L);
+        public const int LongLong = 1 << 1;
 
         [NativeTypeName(""#define ULong 1 << 1UL"")]
-        public const int ULong = 1 << (int)(1U);
+        public const int ULong = 1 << 1;
 
         [NativeTypeName(""#define ULongLong 1 << 1ULL"")]
-        public const int ULongLong = 1 << (int)(1UL);
+        public const int ULongLong = 1 << 1;
     }
 }
 ";