Fewer regex

Author: nicolasstucki

library/src/scala/annotation/newMain.scala

@@ -65,10 +65,7 @@ final class newMain extends MainAnnotation[FromString, Any]:
   private inline val argMarker = "--"
   private inline val shortArgMarker = "-"
 
-  private val longArgNameRegex = "[a-zA-Z][a-zA-Z0-9]*".r
   private val longArgRegex = "--[a-zA-Z][a-zA-Z0-9]*".r
-
-  private val shortArgNameRegex = "[a-zA-Z]".r
   private val shortArgRegex = "-[a-zA-Z]".r
 
   extension (param: Parameter)
@@ -341,7 +338,7 @@ final class newMain extends MainAnnotation[FromString, Any]:
           throw IllegalArgumentException(s"$name is used for multiple parameters: ${canonicalNames.mkString(", ")}")
       def checkValidNames() =
         def isValidArgName(name: String): Boolean =
-          longArgNameRegex.matches(name) || shortArgNameRegex.matches(name)
+          longArgRegex.matches(argMarker + name) || shortArgRegex.matches(shortArgMarker + name)
         for param <- info.parameters do
           if !isValidArgName(param.name) then
             throw IllegalArgumentException(s"The following argument name is invalid: ${param.name}")