[generator] Ensure all usages of parameter names are escaped the same. #506
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jonpryor
reviewed
Oct 25, 2019
| string[] result = new string [4]; | ||
| result [0] = String.Format ("if ({0} != null) {{", var_name); | ||
| result [1] = String.Format ("\tJNIEnv.CopyArray ({0}, {1});", native_name, var_name); | ||
| result [0] = String.Format ("if ({0} != null) {{", opt.GetSafeIdentifier (var_name)); |
Contributor
There was a problem hiding this comment.
Presumably the caller of PostCall() is also using opt.GetSafeIdentifier() -- something somewhere else must be, because this code is just the error checking code! -- so would it instead be better if we called opt.GetSafeIdentifier() once and passed that value around to all the methods that needed it, instead of duplicating opt.GetSafeIdentifier() invocations?
Contributor
Author
There was a problem hiding this comment.
I think that is a much trickier and dangerous change to get correct. For example the previous line is:
string native_name = opt.GetSafeIdentifier (TypeNameUtilities.GetNativeName (var_name));
If we're passing in a var_name that has already been mangled then getting the native name from it will probably need to be reworked, etc.
jonpryor
pushed a commit
that referenced
this pull request
Nov 8, 2019
…506) If a method parameter contains a dollar sign, `generator` sometimes escapes it properly and sometimes it does not: public unsafe global::Okio.ByteString Of (byte[] _this_toByteString_, int offset, int byteCount) { // ... if ($this$toByteString != null) { JNIEnv.CopyArray (native__this_toByteString_, $this$toByteString); JNIEnv.DeleteLocalRef (native__this_toByteString_); } That contains both `_this_toByteString_` and `$this$toByteString`. Ensures all instances use the same `opt.GetSafeIdentifier(string)` escaping method so that `$` doesn't remain within generated sources.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If a method parameter contains a dollar sign, we sometimes escape it properly and sometimes we do not:
That contains both
_this_toByteString_and$this$toByteString.This PR ensures all instances use the same
opt.GetSafeIdentifier (string)escaping method.