boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-01-19 04:02:14 +00:00
Code Issues Projects Releases Wiki Activity

Rewrite var_defines to simplify and hopefully avoid bugs.

Browse Source
This commit is contained in:
Rene Rivera
2025-12-14 00:23:08 -06:00
parent de9aaa3719
commit 8a44ff5131
3 changed files with 39 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/engine/value.h
View File

@@ -121,6 +121,9 @@ struct value_ref
inline value_ref(const std::string & s)
: val(value::make(s.c_str()))
{}
inline value_ref(const string_view & sv)
: val(value::make(sv))
{}
inline ~value_ref()
{

95
src/engine/variable.cpp
View File

@@ -40,6 +40,7 @@
#include "pathsys.h"
#include "jam_strings.h"
#include "output.h"
#include "strview.h"
#include <stdio.h>
#include <stdlib.h>
@@ -73,83 +74,53 @@ static void var_dump( OBJECT * symbol, LIST * value, const char * what );
void var_defines( struct module_t * module, const char * const * e, int preprocess )
{
string buf[ 1 ];
string_new( buf );
for ( ; *e; ++e )
{
const char * val;
if ( ( val = strchr( *e, '=' ) )
#if defined( OS_MAC )
/* On the mac (MPW), the var=val is actually var\0val */
/* Think different. */
|| ( val = *e + strlen( *e ) )
#endif
)
::b2::string_view var_val(*e);
::b2::string_view var(var_val.begin(), var_val.find('='));
if (var.size() < var_val.size())
{
LIST * l = L0;
int32_t const len = int32_t(strlen( val + 1 ));
int const quoted = ( val[ 1 ] == '"' ) && ( val[ len ] == '"' ) &&
( len > 1 );
if ( quoted && preprocess )
::b2::string_view val(var_val.begin() + var.size() + 1);
const bool quoted = val.size() >= 2 && *val.begin() == '"'
&& *(val.end()-1) == '"';
b2::jam::variable jam_var { module, ::b2::value_ref(var) };
if (preprocess)
{
string_append_range( buf, val + 2, val + len );
l = list_push_back( l, object_new( buf->value ) );
string_truncate( buf, 0 );
if (quoted)
jam_var = ::b2::list_ref { ::b2::value_ref {
val.substr(1, val.size()-2) } };
else
jam_var = ::b2::list_ref { ::b2::value_ref { val } };
}
else
{
const char * p;
const char * pp;
char split =
#if defined( OPT_NO_EXTERNAL_VARIABLE_SPLIT )
'\0'
#elif defined( OS_MAC )
','
#else
' '
#endif
;
char split = ' ';
/* Split *PATH at :'s, not spaces. */
if ( val - 4 >= *e )
if (val.ends_with("PATH") || val.ends_with("Path" ||
val.ends_with("path")))
{
if ( !strncmp( val - 4, "PATH", 4 ) ||
!strncmp( val - 4, "Path", 4 ) ||
!strncmp( val - 4, "path", 4 ) )
split = SPLITPATH;
split = SPLITPATH;
}
/* Do the split. */
for
(
pp = val + 1;
preprocess && ( ( p = strchr( pp, split ) ) != 0 );
pp = p + 1
)
::b2::string_view::size_type p0 = 0;
::b2::string_view::size_type p1 = 0;
do
{
string_append_range( buf, pp, p );
l = list_push_back( l, object_new( buf->value ) );
string_truncate( buf, 0 );
}
l = list_push_back( l, object_new( pp ) );
p1 = val.find(split, p0);
if (p1 == val.npos)
{
jam_var += ::b2::value_ref { val.substr(p0) };
p0 = val.npos;
}
else
{
jam_var += ::b2::value_ref { val.substr(p0, p1 - p0) };
p0 = p1 + 1;
}
} while (p0 != val.npos);
}
/* Get name. */
string_append_range( buf, *e, val );
{
OBJECT * varname = object_new( buf->value );
var_set( module, varname, l, VAR_SET );
object_free( varname );
}
string_truncate( buf, 0 );
}
}
string_free( buf );
}

3
src/engine/variable.h
View File

@@ -71,6 +71,9 @@ struct variable
inline variable(const std::string & m, const std::string & v)
: variable(m.c_str(), v.c_str())
{}
inline variable(struct module_t * m, const std::string & v)
: variable(m, v.c_str())
{}
// Refer to variable in global/root module.
inline explicit variable(const char * v)