fix unmarshaling from text of enums with bitmask flag (#90) (#91)

cmd/dialects-gen/main.go

@@ -19,6 +19,8 @@ package dialects
 
 import (
     "testing"
+    "encoding"
+    "reflect"
 
     "github.com/stretchr/testify/require"
 
@@ -36,6 +38,44 @@ func TestDialects(t *testing.T) {
 	}()
 {{- end }}
 }
+
+var casesEnum = []struct {
+	name string
+	dec  encoding.TextMarshaler
+	enc  string
+}{
+	{
+		"bitmask",
+		common.POSITION_TARGET_TYPEMASK_VX_IGNORE | common.POSITION_TARGET_TYPEMASK_VY_IGNORE,
+		"POSITION_TARGET_TYPEMASK_VX_IGNORE | POSITION_TARGET_TYPEMASK_VY_IGNORE",
+	},
+	{
+		"value",
+		common.GPS_FIX_TYPE_NO_FIX,
+		"GPS_FIX_TYPE_NO_FIX",
+	},
+}
+
+func TestEnumUnmarshalText(t *testing.T) {
+	for _, ca := range casesEnum {
+		t.Run(ca.name, func(t *testing.T) {
+			dec := reflect.New(reflect.TypeOf(ca.dec)).Interface().(encoding.TextUnmarshaler)
+			err := dec.UnmarshalText([]byte(ca.enc))
+			require.NoError(t, err)
+			require.Equal(t, ca.dec, reflect.ValueOf(dec).Elem().Interface())
+		})
+	}
+}
+
+func TestEnumMarshalText(t *testing.T) {
+	for _, ca := range casesEnum {
+		t.Run(ca.name, func(t *testing.T) {
+			byts, err := ca.dec.MarshalText()
+			require.NoError(t, err)
+			require.Equal(t, ca.enc, string(byts))
+		})
+	}
+}
 `))
 
 func writeTemplate(fpath string, tpl *template.Template, args map[string]interface{}) error {

pkg/conversion/conversion.go

@@ -150,6 +150,7 @@ func (e *{{ .Enum.Name }}) UnmarshalText(text []byte) error {
             return fmt.Errorf("invalid label '%s'", label)
         }
     }
+	*e = mask
 {{- else }}
     if value, ok := values_{{ .Enum.Name }}[string(text)]; ok {
        *e = value

pkg/dialects/ardupilotmega/enum_ekf_status_flags.go

@@ -92,6 +92,7 @@ func (e *EKF_STATUS_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/ardupilotmega/enum_gopro_heartbeat_flags.go

@@ -51,6 +51,7 @@ func (e *GOPRO_HEARTBEAT_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/ardupilotmega/enum_gopro_video_settings_flags.go

@@ -51,6 +51,7 @@ func (e *GOPRO_VIDEO_SETTINGS_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/ardupilotmega/enum_limit_module.go

@@ -59,6 +59,7 @@ func (e *LIMIT_MODULE) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/ardupilotmega/enum_rally_flags.go

@@ -56,6 +56,7 @@ func (e *RALLY_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_adsb_flags.go

@@ -78,6 +78,7 @@ func (e *ADSB_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_ais_flags.go

@@ -94,6 +94,7 @@ func (e *AIS_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_attitude_target_typemask.go

@@ -72,6 +72,7 @@ func (e *ATTITUDE_TARGET_TYPEMASK) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_autotune_axis.go

@@ -64,6 +64,7 @@ func (e *AUTOTUNE_AXIS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_camera_cap_flags.go

@@ -96,6 +96,7 @@ func (e *CAMERA_CAP_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_camera_tracking_target_data.go

@@ -64,6 +64,7 @@ func (e *CAMERA_TRACKING_TARGET_DATA) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_esc_failure_flags.go

@@ -80,6 +80,7 @@ func (e *ESC_FAILURE_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_estimator_status_flags.go

@@ -96,6 +96,7 @@ func (e *ESTIMATOR_STATUS_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_gimbal_device_cap_flags.go

@@ -104,6 +104,7 @@ func (e *GIMBAL_DEVICE_CAP_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_gimbal_device_error_flags.go

@@ -88,6 +88,7 @@ func (e *GIMBAL_DEVICE_ERROR_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_gimbal_device_flags.go

@@ -88,6 +88,7 @@ func (e *GIMBAL_DEVICE_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_gimbal_manager_cap_flags.go

@@ -112,6 +112,7 @@ func (e *GIMBAL_MANAGER_CAP_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_gimbal_manager_flags.go

@@ -88,6 +88,7 @@ func (e *GIMBAL_MANAGER_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_gps_input_ignore_flags.go

@@ -79,6 +79,7 @@ func (e *GPS_INPUT_IGNORE_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_highres_imu_updated_flags.go

@@ -108,6 +108,7 @@ func (e *HIGHRES_IMU_UPDATED_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_hil_sensor_updated_flags.go

@@ -108,6 +108,7 @@ func (e *HIL_SENSOR_UPDATED_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_hl_failure_flag.go

@@ -104,6 +104,7 @@ func (e *HL_FAILURE_FLAG) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_mav_battery_fault.go

@@ -84,6 +84,7 @@ func (e *MAV_BATTERY_FAULT) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_mav_do_reposition_flags.go

@@ -52,6 +52,7 @@ func (e *MAV_DO_REPOSITION_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_mav_generator_status_flag.go

@@ -140,6 +140,7 @@ func (e *MAV_GENERATOR_STATUS_FLAG) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_mav_power_status.go

@@ -72,6 +72,7 @@ func (e *MAV_POWER_STATUS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_mav_protocol_capability.go

@@ -124,6 +124,7 @@ func (e *MAV_PROTOCOL_CAPABILITY) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_mav_sys_status_sensor.go

@@ -176,6 +176,7 @@ func (e *MAV_SYS_STATUS_SENSOR) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_mav_sys_status_sensor_extended.go

@@ -52,6 +52,7 @@ func (e *MAV_SYS_STATUS_SENSOR_EXTENDED) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_mav_winch_status_flag.go

@@ -104,6 +104,7 @@ func (e *MAV_WINCH_STATUS_FLAG) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_position_target_typemask.go

@@ -96,6 +96,7 @@ func (e *POSITION_TARGET_TYPEMASK) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_serial_control_flag.go

@@ -68,6 +68,7 @@ func (e *SERIAL_CONTROL_FLAG) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_utm_data_avail_flags.go

@@ -80,6 +80,7 @@ func (e *UTM_DATA_AVAIL_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/common/enum_video_stream_status_flags.go

@@ -56,6 +56,7 @@ func (e *VIDEO_STREAM_STATUS_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/development/enum_airspeed_sensor_flags.go

@@ -56,6 +56,7 @@ func (e *AIRSPEED_SENSOR_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/development/enum_mav_battery_status_flags.go

@@ -147,6 +147,7 @@ func (e *MAV_BATTERY_STATUS_FLAGS) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/development/enum_mav_mode_property.go

@@ -59,6 +59,7 @@ func (e *MAV_MODE_PROPERTY) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/development/enum_target_absolute_sensor_capability_flags.go

@@ -63,6 +63,7 @@ func (e *TARGET_ABSOLUTE_SENSOR_CAPABILITY_FLAGS) UnmarshalText(text []byte) err
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/minimal/enum_mav_mode_flag.go

@@ -80,6 +80,7 @@ func (e *MAV_MODE_FLAG) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }
 

pkg/dialects/minimal/enum_mav_mode_flag_decode_position.go

@@ -80,6 +80,7 @@ func (e *MAV_MODE_FLAG_DECODE_POSITION) UnmarshalText(text []byte) error {
 			return fmt.Errorf("invalid label '%s'", label)
 		}
 	}
+	*e = mask
 	return nil
 }