Fix for assigning to non-existent variables (#1708) #1718
Merged
Conversation
This file contains 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
This fix modifies Trick's convert_swig script. It adds a directive to not accept dynamic attributes. The directive will ensure that modelers do not assign to non-existent parameter in their input files. The prior fix (issues #1288 and/or #1603) did not cover C structures, so this commit is really an addendum to that fix. With this commit, the convert_swig script will generate a non-dynamic directive foreach class and structure. This fix also stops generating swig interface code for typedef structure definitions since swig only produces an interface to the actual typedef name. For example, with this typedef: typedef struct StructureName { double main_engine_thrust; /* N Thrust of main engine */ struct StructureName* next; /* ** Next pointer */ } TypeDefName; swig creates an interface for "TypeDefName", and not "StructureName", so there is no need for Trick to produce anything in regards "StructureName".
convert_swig takes in the raw header and does no preprocessing,
so blocks of c/c++ header code which are meant to be skipped
by Swig are processed by convert_swig. This causes an issue
with the generated python code that try to access classes
that are ifndef SWIGed out.
To fix this, check for class existence in the generated python
code e.g:
if 'MomMom' in globals():
MomMom.__setattr__ = _swig_setattr_nondynamic_instance_variable(object.__setattr__)
The previous commit(s) on this branch fixed bad assignments like (misspell position an attribute of BSTATE_IN): ball.state.input.positiaaaan = 4.0 This commit fixes bad assignments to leaf/primitive attributes like (try to add attribute to primitive/leaf double type): ball.state.input.position.fred = 4.0
…class in process_class and removed duplicate _swig_setattr_nondynamic_instance_variable blocks for classes that are not in a namespace.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This fix modifies Trick's convert_swig script. It adds a directive to not accept dynamic attributes. The directive will ensure that modelers do not
assign to non-existent parameter in their input files.
The prior fix (issues #1288 and/or #1603) did not
cover C structures, so this commit is really an
addendum to that fix. With this commit, the convert_swig script will generate a non-dynamic directive foreach class and structure.
This fix also stops generating swig interface code for typedef structure definitions since swig only
produces an interface to the actual typedef name.
For example, with this typedef:
typedef struct StructureName {
double main_engine_thrust; /* N Thrust of main engine /
struct StructureName next; /* ** Next pointer */
} TypeDefName;
swig creates an interface for "TypeDefName", and not "StructureName", so there is no need for Trick to
produce anything in regards "StructureName".