Skip to content

Commit 26db651

Browse files
paolopasgrafikrobot
authored andcommitted
util/doc.jam regexp review
1 parent ea7c769 commit 26db651

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/util/doc.jam

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ local rule brief-comment (
8686
)
8787
{
8888
local d = $(docs:J=" ") ;
89-
local p = [ MATCH ".*([.])$" : $(d) ] ;
89+
local p = [ MATCH "([.])$" : $(d) ] ;
9090
if ! $(p) { d = $(d)"." ; }
9191
d = $(d)" " ;
9292
local m = [ MATCH "^([^.]+[.])(.*)" : $(d) ] ;
@@ -786,7 +786,7 @@ local rule scan-rule (
786786
{
787787
rule-name = $(scope-name).$(rule-name) ;
788788
}
789-
local is-local = [ MATCH "^(local).*" : $(rule-parts[1]) ] ;
789+
local is-local = [ MATCH "^(local)" : $(rule-parts[1]) ] ;
790790
if $(comment-block)
791791
{
792792
set-rule-doc $(rule-name) $(module-name) $(is-local) : $(comment-block) ;
@@ -804,11 +804,11 @@ local rule scan-rule (
804804
if [ scan-rule $(syntax-block) : $(var) ]
805805
{
806806
}
807-
else if [ MATCH "^(\\{)" : $(syntax-block) ]
807+
else if [ MATCH "^([{])" : $(syntax-block) ]
808808
{
809809
scope-level += "{" ;
810810
}
811-
else if [ MATCH "^[^\\}]*([\\}])[$(ws)]*$" : $(syntax-block) ]
811+
else if [ MATCH "^[^}]*([}])[$(ws)]*$" : $(syntax-block) ]
812812
{
813813
scope-level = $(scope-level[2-]) ;
814814
}
@@ -849,7 +849,7 @@ local rule scan-rule-arguments (
849849
arg-name = $(token) ;
850850
arg-signature += $(token) ;
851851
token = [ extract-token $(var) ] ;
852-
if [ MATCH "^([\\*\\+\\?])" : $(token) ]
852+
if [ MATCH "^([*+?])" : $(token) ]
853853
{
854854
arg-qualifier = $(token) ;
855855
arg-signature += $(token) ;
@@ -887,10 +887,10 @@ local rule scan-variable (
887887
{
888888
# [1] = name, [2] = value(s)
889889
local var-parts =
890-
[ MATCH "^[$(ws)]*([^$(ws)]+)[$(ws)]+([\\?\\=]*)[$(ws)]+([^\\;]*)\\;" : $(syntax) ] ;
890+
[ MATCH "^[$(ws)]*([^$(ws)]+)[$(ws)]+([?]?=)[$(ws)]+([^;]*);" : $(syntax) ] ;
891891
if $(var-parts)
892892
{
893-
local value = [ MATCH "^(.*)[ ]$" : $(var-parts[3-]:J=" ") ] ;
893+
local value = [ MATCH "^(.*) $" : $(var-parts[3-]:J=" ") ] ;
894894
local default-value = "" ;
895895
local initial-valie = "" ;
896896
if $(var-parts[2]) = "?="
@@ -934,11 +934,11 @@ local rule scan-class (
934934
if [ scan-rule $(syntax-block) : $(var) ]
935935
{
936936
}
937-
else if [ MATCH "^(\\{)" : $(syntax-block) ]
937+
else if [ MATCH "^([{])" : $(syntax-block) ]
938938
{
939939
scope-level += "{" ;
940940
}
941-
else if [ MATCH "^[^\\}]*([\\}])[$(ws)]*$" : $(syntax-block) ]
941+
else if [ MATCH "^[^}]*([}])[$(ws)]*$" : $(syntax-block) ]
942942
{
943943
scope-level = $(scope-level[2-]) ;
944944
}
@@ -984,7 +984,7 @@ rule scan-module (
984984
if [ scan-rule $(syntax-block) : text ] { }
985985
else if [ scan-variable $(syntax-block) : text ] { }
986986
else if [ scan-class $(syntax-block) : text ] { }
987-
else if [ MATCH ".*([cC]opyright).*" : $(comment-block:J=" ") ]
987+
else if [ MATCH "([cC]opyright)" : $(comment-block:J=" ") ]
988988
{
989989
# mark as the copy for the module.
990990
set-module-copyright $(module-name) : $(comment-block) ;

0 commit comments

Comments
 (0)