Misc fixups

Signed-off-by: Ryan Friedman <[email protected]>

Author: Ryanf55

rosidl_adapter/rosidl_adapter/main.py

@@ -39,7 +39,7 @@ def main(argv=sys.argv[1:]):
         '--output-file', required=True,
         help='The output file containing the tuples for the generated .idl '
              'files')
-    legacy_field_name_action = "store_true" if DEFAULT_ALLOW_LEGACY_FIELD_NAMES else "store_false"
+    legacy_field_name_action = "store_true" if not DEFAULT_ALLOW_LEGACY_FIELD_NAMES else "store_false"
     parser.add_argument(
         '--allow-legacy-field-naming', required=False, action=legacy_field_name_action,
         help='Allow legacy ROS1 style field names that use PascalCase, camelCase, and Pascal_With_Underscores')

rosidl_adapter/rosidl_adapter/parser.py

@@ -125,8 +125,8 @@ def is_valid_legacy_field_name(name):
         raise InvalidResourceName(name)
     return m is not None and m.group(0) == name
 
-def is_valid_field_name(name, allow_legacy_field_names=DEFAULT_ALLOW_LEGACY_FIELD_NAMES):
-    if allow_legacy_field_names:
+def is_valid_field_name(name, allow_legacy_field_naming=DEFAULT_ALLOW_LEGACY_FIELD_NAMES):
+    if allow_legacy_field_naming:
         return is_valid_legacy_field_name(name)
     try:
         m = VALID_FIELD_NAME_PATTERN.match(name)
@@ -361,11 +361,10 @@ def __init__(self, type_, name, default_value_string=None, *, allow_legacy_field
             raise TypeError(
                 "the field type '%s' must be a 'Type' instance" % type_)
         self.type = type_
-        if not allow_legacy_field_naming:
-            if not is_valid_field_name(name, allow_legacy_field_name=allow_legacy_field_naming):
-                raise NameError(
-                    "'{}' is an invalid field name. It should have the pattern '{}'".format(
-                        name, VALID_FIELD_NAME_PATTERN.pattern))
+        if not is_valid_field_name(name, allow_legacy_field_naming=allow_legacy_field_naming):
+            raise NameError(
+                "'{}' is an invalid field name. It should have the pattern '{}'".format(
+                    name, VALID_FIELD_NAME_PATTERN.pattern))
         self.name = name
         if default_value_string is None:
             self.default_value = None