2
0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 13:02:11 +00:00

Fix a confusion about what the "::" following, or not, whitespace was handled.

[SVN r16316]
This commit is contained in:
Rene Rivera
2002-11-19 06:27:22 +00:00
parent b1c6d95ef1
commit 3731e155e3
2 changed files with 32 additions and 22 deletions

View File

@@ -72,19 +72,24 @@ rule section (
lines $(paragraph[2-]) : " " " " ;
lines ;
}
else if [ MATCH "(::)$" : $(paragraph[-1]) ]
{
pre = yes ;
local p = [ MATCH "(.*)([ ]*)(::)$" : $(paragraph[-1]) ] ;
if $(p[2]) && $(p[2]) != "" { paragraph = $(paragraph[1--2]) $(p[1]): ; }
else { paragraph = $(paragraph[1--2]) $(p[1]) ; }
lines [ split-at-words " " $(paragraph) ] : " " " " ;
lines ;
}
else
{
lines [ split-at-words " " $(paragraph) ] : " " " " ;
lines ;
local p = [ MATCH "(.*)(::)$" : $(paragraph[-1]) ] ;
local pws = [ MATCH "([ ]*)$" : $(p[1]) ] ;
p = [ MATCH "(.*)($(pws))($(p[2]))$" : $(paragraph[-1]) ] ;
if $(p[3]) = ::
{
pre = yes ;
if ! $(p[2]) || $(p[2]) = "" { paragraph = $(paragraph[1--2]) $(p[1]): ; }
else { paragraph = $(paragraph[1--2]) $(p[1]) ; }
lines [ split-at-words " " $(paragraph) ] : " " " " ;
lines ;
}
else
{
lines [ split-at-words " " $(paragraph) ] : " " " " ;
lines ;
}
}
}
}

View File

@@ -72,19 +72,24 @@ rule section (
lines $(paragraph[2-]) : " " " " ;
lines ;
}
else if [ MATCH "(::)$" : $(paragraph[-1]) ]
{
pre = yes ;
local p = [ MATCH "(.*)([ ]*)(::)$" : $(paragraph[-1]) ] ;
if $(p[2]) && $(p[2]) != "" { paragraph = $(paragraph[1--2]) $(p[1]): ; }
else { paragraph = $(paragraph[1--2]) $(p[1]) ; }
lines [ split-at-words " " $(paragraph) ] : " " " " ;
lines ;
}
else
{
lines [ split-at-words " " $(paragraph) ] : " " " " ;
lines ;
local p = [ MATCH "(.*)(::)$" : $(paragraph[-1]) ] ;
local pws = [ MATCH "([ ]*)$" : $(p[1]) ] ;
p = [ MATCH "(.*)($(pws))($(p[2]))$" : $(paragraph[-1]) ] ;
if $(p[3]) = ::
{
pre = yes ;
if ! $(p[2]) || $(p[2]) = "" { paragraph = $(paragraph[1--2]) $(p[1]): ; }
else { paragraph = $(paragraph[1--2]) $(p[1]) ; }
lines [ split-at-words " " $(paragraph) ] : " " " " ;
lines ;
}
else
{
lines [ split-at-words " " $(paragraph) ] : " " " " ;
lines ;
}
}
}
}