tools/common.jam regexp review (#509)

paolopas · web-flow · commit cc7ac5710732 · 2026-01-12T23:17:19.000-06:00
diff --git a/src/tools/common.jam b/src/tools/common.jam
@@ -955,7 +955,7 @@ local rule toolset-tag ( name : type ? : property-set )
         case tru64cxx* : tag += tru ;
         case vacpp* : tag += xlc ;
     }
-    local version = [ MATCH "<toolset.*version>([0123456789]+)[.]?([0123456789]*)"
+    local version = [ MATCH "<toolset.*version>([0-9]+)[.]?([0-9]*)"
         : $(properties) ] ;
     # For historical reasons, vc6.0 and vc7.0 use different naming.
     if $(tag) = vc
@@ -1052,7 +1052,7 @@ local rule runtime-tag ( name : type ? : property-set )
 # "<qt>4.6.0" will result in tag "qt460"
 local rule qt-tag ( name : type ? : property-set )
 {
-    local v = [ MATCH "([0123456789]+)[.]?([0123456789]*)[.]?([0123456789]*)" :
+    local v = [ MATCH "([0-9]+)[.]?([0-9]*)[.]?([0-9]*)" :
         [ $(property-set).get <qt> ] ] ;
     return qt$(v:J=) ;
 }

Original file line number	Diff line number	Diff line change
`@@ -955,7 +955,7 @@ local rule toolset-tag ( name : type ? : property-set )`
`955`	`955`	`case tru64cxx* : tag += tru ;`
`956`	`956`	`case vacpp* : tag += xlc ;`
`957`	`957`	`}`
`958`		`- local version = [ MATCH "<toolset.version>([0123456789]+)[.]?([0123456789])"`
	`958`	`+ local version = [ MATCH "<toolset.version>([0-9]+)[.]?([0-9])"`
`959`	`959`	`: $(properties) ] ;`
`960`	`960`	`# For historical reasons, vc6.0 and vc7.0 use different naming.`
`961`	`961`	`if $(tag) = vc`
`@@ -1052,7 +1052,7 @@ local rule runtime-tag ( name : type ? : property-set )`
`1052`	`1052`	`# "<qt>4.6.0" will result in tag "qt460"`
`1053`	`1053`	`local rule qt-tag ( name : type ? : property-set )`
`1054`	`1054`	`{`
`1055`		`- local v = [ MATCH "([0123456789]+)[.]?([0123456789])[.]?([0123456789])" :`
	`1055`	`+ local v = [ MATCH "([0-9]+)[.]?([0-9])[.]?([0-9])" :`
`1056`	`1056`	`[ $(property-set).get <qt> ] ] ;`
`1057`	`1057`	`return qt$(v:J=) ;`
`1058`	`1058`	`}`