Merge pull request #4179 from masatake/optlib2c--minor-fix

masatake · web-flow · commit 7171fc288b51 · 2025-01-23T02:42:39.000+09:00
optlib2c: make the error message more specific when a wrong datatype is given
diff --git a/misc/optlib2c b/misc/optlib2c
@@ -75,10 +75,14 @@ my $fielddef_flags =
 	 {
 	     $datatype .= "FIELDTYPE_BOOL";
 	 }
-	 elsif (($1 eq 'bool+str') || ($1 eq 'str+bool'))
+	 elsif ($1 eq 'str+bool')
 	 {
 	     $datatype .= "FIELDTYPE_STRING|FIELDTYPE_BOOL";
 	 }
+	 elsif ($1 eq 'bool+str')
+	 {
+	     die "\"{datatype=$1}\": use str+bool instead of bool+str";
+	 }
 	 else
 	 {
 	     die "Unknown datatype specification: \"{datatype=$1}\" in \"--_fielddef-<LANG>=...\"";

Original file line number	Diff line number	Diff line change
`@@ -75,10 +75,14 @@ my $fielddef_flags =`
`75`	`75`	`{`
`76`	`76`	`$datatype .= "FIELDTYPE_BOOL";`
`77`	`77`	`}`
`78`		`- elsif (($1 eq 'bool+str') \|\| ($1 eq 'str+bool'))`
	`78`	`+ elsif ($1 eq 'str+bool')`
`79`	`79`	`{`
`80`	`80`	`$datatype .= "FIELDTYPE_STRING\|FIELDTYPE_BOOL";`
`81`	`81`	`}`
	`82`	`+ elsif ($1 eq 'bool+str')`
	`83`	`+ {`
	`84`	`+ die "\"{datatype=$1}\": use str+bool instead of bool+str";`
	`85`	`+ }`
`82`	`86`	`else`
`83`	`87`	`{`
`84`	`88`	`die "Unknown datatype specification: \"{datatype=$1}\" in \"--_fielddef-<LANG>=...\"";`