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

Jump to bottom

CSharpExpressionPrinter: Wrap expression in parenthesis #1741

Merged
merged 1 commit into from Jul 9, 2023
Merged

CSharpExpressionPrinter: Wrap expression in parenthesis #1741

merged 1 commit into from Jul 9, 2023

Conversation

trungnt2910
Copy link
Contributor

Wrap default parameter expressions in parentheses to ensure whole expressions are casted instead of only the first operand.

This fixes the case when the C++ source contains enum flags ored with each other as default parameters.

For example, this code

			status_t			StartWatching(BMessenger target,
									uint32 eventMask
										= B_REQUEST_LAUNCHED
											| B_REQUEST_QUIT) const;

gets incorrectly translated to:

        public int StartWatching(global::Haiku.App.BMessenger target, uint eventMask = (uint) global::Haiku.App.WatchingRequestFlags.B_REQUEST_LAUNCHED | global::Haiku.App.WatchingRequestFlags.B_REQUEST_QUIT)

which causes an error:

/home/trung/cppsharp/generated/App.cs(9986,88): error CS0019: Operator '|' cannot be applied to operands of type 'uint' and 'WatchingRequestFlags' [/home/trung/cppsharp/HaikuApiGenerator.csproj]

Wrapping with a pair of parentheses should fix this issue:

        public int StartWatching(global::Haiku.App.BMessenger target, uint eventMask = (uint) (global::Haiku.App.WatchingRequestFlags.B_REQUEST_LAUNCHED | global::Haiku.App.WatchingRequestFlags.B_REQUEST_QUIT))

@tritao
Copy link
Collaborator

tritao commented Jul 9, 2023

Can you add a test to https://github.com/mono/CppSharp/blob/main/tests/dotnet/Common/Common.h?

@trungnt2910
CSharpExpressionPrinter: Wrap expression in parenthesis
355c222 
Wrap default parameter expressions in parentheses to ensure whole expressions are casted instead of only the first operand.
@trungnt2910
Copy link
Contributor Author

Can you add a test to https://github.com/mono/CppSharp/blob/main/tests/dotnet/Common/Common.h?

Done. Also added a corresponding function in Common.cpp.

@tritao tritao merged commit 169f868 into mono:main Jul 9, 2023
5 checks passed
JordanL8 pushed a commit to MoonCollider/CppSharp that referenced this pull request Aug 29, 2023
@trungnt2910 @JordanL8
CSharpExpressionPrinter: Wrap expression in parenthesis (mono#1741)
0631184 
Wrap default parameter expressions in parentheses to ensure whole expressions are casted instead of only the first operand.

(cherry picked from commit 169f868)
JordanL8 added a commit to MoonCollider/CppSharp that referenced this pull request Sep 7, 2023
@JordanL8 @aybe
@tritao @josetr @stachu99 @trungnt2910
Synced our CppSharp fork with main (#8)
0c3e1b4 
* Incorrect build instructions on Windows (mono#1701)

* Fix incorrect build instructions for Windows

* Add link to Visual Studio installer

* Refine building instructions for VS2019+

(cherry picked from commit c4a24b0)

* Misc changes (mono#1710)

* Minor code refactoring for re-use.

* Add Class.FindVariable helper method.

* Upgrade to .NET 6.

(cherry picked from commit db7949b)

* Add C++ WebAssembly ABI (mono#1711)

* Minor code refactorings.

* Fix debug assert issue with vtable methods.

* Add support for WebAssembly C++ ABI to parser and AST converter.

(cherry picked from commit 9b06e7b)

* Add initial Emscripten generator. (mono#1712)

(cherry picked from commit 117567d)

* Code cleanups and improvements (mono#1713)

* Code cleanups.

* Run GetterSetterToPropertyPass for more generators.

* Fixed compile warning when compiling parser bindings.

* Cleanup driver code.

* Remove dead 32-bit code.

* Reduce verbosity when Options.Quiet is set.

* Remove test compile-time warnings.

* Move .NET tests to tests/dotnet.

* Remove unused AST viewer code and premake-qt submodule.

* Move tests2/ contents to tests/.

(cherry picked from commit 4417dd9)

* Publish package to nuget.org when a version tag is created

(cherry picked from commit 5715df5)

* Allow passing a `-target-framework` option to `build.sh` (mono#1718)

Closes mono#1717.

(cherry picked from commit 8cf6e3f)

* Remove unused LLVM build flags.

(cherry picked from commit 84b7276)

* Update LLVM workflow to latest Action images.

(cherry picked from commit 3d32fc7)

* Update LLVM Windows workflow to latest Action images.

(cherry picked from commit f9f9e9c)

* Update action steps to latest to fix Node.js deprecation warnings.

(cherry picked from commit 7d6decd)

* Update LLVM build script for Visual Studio 2022.

(cherry picked from commit b8a16a4)

* Workaround Directory.Build.props getting picked up when building LLVM.

This is to workaround MSBuild CMake step from LLVM build in Windows
picking this up.

(cherry picked from commit 25e2c7c)

* Added variation of mono#1736

* Workaround parsing GNU system headers with GCC 11.0 version. (mono#1737)

Closes mono#1703.

Upstream bugs:

  llvm/llvm-project#51607
  llvm/llvm-project#53152

(cherry picked from commit 0272532)

* CppSharp.AST.Declaration - fix return QualifiedOriginalName, QualifiedLogicalOriginalName (mono#1740)

Fixed properties getters of QualifiedOriginalName, QualifiedLogicalOriginalName and methods GetQualifiedName(),  GatherNamespaces.

(cherry picked from commit 9923d79)

* CSharpExpressionPrinter: Wrap expression in parenthesis (mono#1741)

Wrap default parameter expressions in parentheses to ensure whole expressions are casted instead of only the first operand.

(cherry picked from commit 169f868)

* Update README.md

Remove Gitter since the link is 404 and we have not been using it anyway.

(cherry picked from commit 160efb4)

* CSharpExpressionPrinter: Recurse into operands (mono#1745)

* CSharpExpressionPrinter: Recurse into operands

Recursively call `VisitExpression` on the LHS and RHS of a binary
operator expression. This fixes the generation for complex default
parameters involving things other than two enumeration members.

* CSharpSources: Use `const` when possible

Generate `const` instead of `static` members when possible.
This allows generated members to be used when compile-time constants are
required, such as default parameters.

(cherry picked from commit 1ce9cb7)

* CSharp: More default parameter fixes (mono#1747)

- Expression generation for `ConstructorReference` now also recursively
calls `VisitExpression` for the argument if only one argument is
detected. This allows correct overload generation for functions taking
a variable as the default parameter value.
- Default parameters of pointer-to-enumeration types are now correctly
generated similar to primitive types.

(cherry picked from commit add3aba)

* Add type parameter to non-type template parameter decls. (mono#1749)

(cherry picked from commit bb31bd6)

* Update parser example to latest API.

(cherry picked from commit 8c1fa18)

* Fixed debugging printing when type printing delegate is not initialized.

(cherry picked from commit 9f3ce76)

* Array marshalling (mono#1748)

* Generator: Customization for const char[]

Allow the user to choose whether `const char[]` should be marshalled as
`string` or a normal `char` array in C#.

A new option `MarshalConstCharArrayAsString` is added, and is `true`
by default.

This helps in situations where the original C++ API distinguishes
between C-strings and char arrays using the two different notations.

* CSharpMarshal: Fix unknown length array marshal

For unknown length arrays, also run a conversion loop if the primitive
type encountered needs conversion (e.g. `char` to `sbyte`).

* CSharpTypePrinter: Fix for boolean arrays

(cherry picked from commit 357efec)

* Add qualified template name to GetCXXRecordDeclFromBaseType. (mono#1751)

(cherry picked from commit 626a362)

* SymbolResolver: Use filename when path cannot be found (mono#1752)

Uses bare filename to pass to `dlopen` when the full path cannot
be detected. This helps on systems where library paths are not the
same as $PATH.

(cherry picked from commit 3978fb3)

* CSharpSources: Dereference pointer variables (mono#1753)

Dereference pointers when generating getters for pointer variables.
Otherwise, the managed instance would point to the pointer itself
rather than the object at the native instance's address.

(cherry picked from commit ce3d04a)

* Use TypePrinter.IntPtrType in CSharpSources.cs code from previous commit.

(cherry picked from commit 3c31179)

---------

Co-authored-by: aybe <aybe@users.noreply.github.com>
Co-authored-by: João Matos <joao@tritao.eu>
Co-authored-by: josetr <37419832+josetr@users.noreply.github.com>
Co-authored-by: stachu99 <stachu99@users.noreply.github.com>
Co-authored-by: Trung Nguyen <57174311+trungnt2910@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@trungnt2910 @tritao