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

New builtin SORT.

Browse Source 
[SVN r19430]
This commit is contained in:
Vladimir Prus
2003-08-04 09:27:47 +00:00
parent 3bb6fbed85
commit 5e191e6cc6
14 changed files with 262 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
historic/jam/src/builtins.c
View File

@@ -234,6 +234,11 @@ load_builtins()
builtin_instance, 0, args );
}
{
char * args[] = { "sequence", "*", 0 };
bind_builtin( "SORT",
builtin_sort, 0, args );
}
}
/*
@@ -898,6 +903,15 @@ LIST *builtin_instance( PARSE *parse, FRAME *frame )
return L0;
}
LIST*
builtin_sort( PARSE *parse, FRAME *frame )
{
LIST* arg1 = lol_get( frame->args, 0 );
return list_sort(arg1);
}
static void lol_build( LOL* lol, char** elements )
{
LIST* l = L0;

1
historic/jam/src/builtins.h
View File

@@ -36,6 +36,7 @@ LIST *builtin_search_for_target( PARSE *parse, FRAME *args );
LIST *builtin_import_module( PARSE *parse, FRAME *args );
LIST *builtin_imported_modules( PARSE *parse, FRAME *frame );
LIST *builtin_instance( PARSE *parse, FRAME *frame );
LIST *builtin_sort( PARSE *parse, FRAME *frame );
void backtrace( FRAME *frame );

79
historic/jam/src/lists.c
View File

@@ -133,6 +133,85 @@ list_sublist(
return nl;
}
LIST *
list_sort(
LIST *l)
{
LIST* first = 0;
LIST* second = 0;
LIST* merged = l;
LIST* result;
if (!l)
return L0;
for(;;) {
/* Split the list in two */
LIST** dst = &first;
LIST* src = merged;
for(;;) {
*dst = list_append(*dst, list_new(0, src->string));
if (!src->next)
break;
if (strcmp(src->string, src->next->string) > 0)
{
if (dst == &first)
dst = &second;
else
dst = &first;
}
src = src->next;
}
if (merged != l)
list_free( merged );
merged = 0;
if (second == 0) {
result = first;
break;
}
/* Merge lists 'first' and 'second' into 'merged' and free
'first'/'second'. */
{
LIST* f = first;
LIST* s = second;
while(f && s)
{
if (strcmp(f->string, s->string) < 0)
{
merged = list_append( merged, list_new(0, f->string ));
f = f->next;
}
else
{
merged = list_append( merged, list_new(0, s->string ));
s = s->next;
}
}
merged = list_copy( merged, f );
merged = list_copy( merged, s );
list_free( first );
list_free( second );
first = 0;
second = 0;
}
}
return result;
}
/*
* list_free() - free a list of strings
*/

1
historic/jam/src/lists.h
View File

@@ -80,6 +80,7 @@ void list_print( LIST *l );
int list_length( LIST *l );
LIST * list_sublist( LIST *l, int start, int count );
LIST * list_pop_front( LIST *l );
LIST * list_sort( LIST *l);
# define list_next( l ) ((l)->next)

14
jam_src/builtins.c
View File

@@ -234,6 +234,11 @@ load_builtins()
builtin_instance, 0, args );
}
{
char * args[] = { "sequence", "*", 0 };
bind_builtin( "SORT",
builtin_sort, 0, args );
}
}
/*
@@ -898,6 +903,15 @@ LIST *builtin_instance( PARSE *parse, FRAME *frame )
return L0;
}
LIST*
builtin_sort( PARSE *parse, FRAME *frame )
{
LIST* arg1 = lol_get( frame->args, 0 );
return list_sort(arg1);
}
static void lol_build( LOL* lol, char** elements )
{
LIST* l = L0;

1
jam_src/builtins.h
View File

@@ -36,6 +36,7 @@ LIST *builtin_search_for_target( PARSE *parse, FRAME *args );
LIST *builtin_import_module( PARSE *parse, FRAME *args );
LIST *builtin_imported_modules( PARSE *parse, FRAME *frame );
LIST *builtin_instance( PARSE *parse, FRAME *frame );
LIST *builtin_sort( PARSE *parse, FRAME *frame );
void backtrace( FRAME *frame );

79
jam_src/lists.c
View File

@@ -133,6 +133,85 @@ list_sublist(
return nl;
}
LIST *
list_sort(
LIST *l)
{
LIST* first = 0;
LIST* second = 0;
LIST* merged = l;
LIST* result;
if (!l)
return L0;
for(;;) {
/* Split the list in two */
LIST** dst = &first;
LIST* src = merged;
for(;;) {
*dst = list_append(*dst, list_new(0, src->string));
if (!src->next)
break;
if (strcmp(src->string, src->next->string) > 0)
{
if (dst == &first)
dst = &second;
else
dst = &first;
}
src = src->next;
}
if (merged != l)
list_free( merged );
merged = 0;
if (second == 0) {
result = first;
break;
}
/* Merge lists 'first' and 'second' into 'merged' and free
'first'/'second'. */
{
LIST* f = first;
LIST* s = second;
while(f && s)
{
if (strcmp(f->string, s->string) < 0)
{
merged = list_append( merged, list_new(0, f->string ));
f = f->next;
}
else
{
merged = list_append( merged, list_new(0, s->string ));
s = s->next;
}
}
merged = list_copy( merged, f );
merged = list_copy( merged, s );
list_free( first );
list_free( second );
first = 0;
second = 0;
}
}
return result;
}
/*
* list_free() - free a list of strings
*/

1
jam_src/lists.h
View File

@@ -80,6 +80,7 @@ void list_print( LIST *l );
int list_length( LIST *l );
LIST * list_sublist( LIST *l, int start, int count );
LIST * list_pop_front( LIST *l );
LIST * list_sort( LIST *l);
# define list_next( l ) ((l)->next)

1
new/builtin.jam
View File

@@ -487,6 +487,7 @@ xclass searched-lib-generator : generator
generators.register [ xnew searched-lib-generator ] ;
xclass compile-action : action
{
import sequence ;

61
new/sequence.jam
View File

@@ -57,40 +57,47 @@ rule less ( a b )
# insertion-sort s using the BinaryPredicate ordered.
rule insertion-sort ( s * : ordered * )
{
local caller = [ CALLER_MODULE ] ;
ordered ?= sequence.less ;
local result = $(s[1]) ;
if $(ordered) = sequence.less
if ! $(ordered)
{
local head tail ;
for local x in $(s[2-])
{
head = ;
tail = $(result) ;
while $(tail) && ( $(tail[1]) < $(x) )
{
head += $(tail[1]) ;
tail = $(tail[2-]) ;
}
result = $(head) $(x) $(tail) ;
}
return [ SORT $(s) ] ;
}
else
{
for local x in $(s[2-])
else
{
local caller = [ CALLER_MODULE ] ;
ordered ?= sequence.less ;
local result = $(s[1]) ;
if $(ordered) = sequence.less
{
local head tail ;
tail = $(result) ;
while $(tail) && [ modules.call-in $(caller) : $(ordered) $(tail[1]) $(x) ]
for local x in $(s[2-])
{
head += $(tail[1]) ;
tail = $(tail[2-]) ;
head = ;
tail = $(result) ;
while $(tail) && ( $(tail[1]) < $(x) )
{
head += $(tail[1]) ;
tail = $(tail[2-]) ;
}
result = $(head) $(x) $(tail) ;
}
result = $(head) $(x) $(tail) ;
}
}
return $(result) ;
else
{
for local x in $(s[2-])
{
local head tail ;
tail = $(result) ;
while $(tail) && [ modules.call-in $(caller) : $(ordered) $(tail[1]) $(x) ]
{
head += $(tail[1]) ;
tail = $(tail[2-]) ;
}
result = $(head) $(x) $(tail) ;
}
}
return $(result) ;
}
}
# merge two ordered sequences using the BinaryPredicate ordered.

2
new/testing.jam
View File

@@ -16,7 +16,7 @@ import toolset ;
feature.feature testing.launcher : : optional free ;
xclass unit-test-target-class : typed-target
{
{
rule __init__ ( name : project : sources * : requirements *
: default-build * )
{

1
v2/tools/builtin.jam
View File

@@ -487,6 +487,7 @@ xclass searched-lib-generator : generator
generators.register [ xnew searched-lib-generator ] ;
xclass compile-action : action
{
import sequence ;

2
v2/tools/testing.jam
View File

@@ -16,7 +16,7 @@ import toolset ;
feature.feature testing.launcher : : optional free ;
xclass unit-test-target-class : typed-target
{
{
rule __init__ ( name : project : sources * : requirements *
: default-build * )
{

61
v2/util/sequence.jam
View File

@@ -57,40 +57,47 @@ rule less ( a b )
# insertion-sort s using the BinaryPredicate ordered.
rule insertion-sort ( s * : ordered * )
{
local caller = [ CALLER_MODULE ] ;
ordered ?= sequence.less ;
local result = $(s[1]) ;
if $(ordered) = sequence.less
if ! $(ordered)
{
local head tail ;
for local x in $(s[2-])
{
head = ;
tail = $(result) ;
while $(tail) && ( $(tail[1]) < $(x) )
{
head += $(tail[1]) ;
tail = $(tail[2-]) ;
}
result = $(head) $(x) $(tail) ;
}
return [ SORT $(s) ] ;
}
else
{
for local x in $(s[2-])
else
{
local caller = [ CALLER_MODULE ] ;
ordered ?= sequence.less ;
local result = $(s[1]) ;
if $(ordered) = sequence.less
{
local head tail ;
tail = $(result) ;
while $(tail) && [ modules.call-in $(caller) : $(ordered) $(tail[1]) $(x) ]
for local x in $(s[2-])
{
head += $(tail[1]) ;
tail = $(tail[2-]) ;
head = ;
tail = $(result) ;
while $(tail) && ( $(tail[1]) < $(x) )
{
head += $(tail[1]) ;
tail = $(tail[2-]) ;
}
result = $(head) $(x) $(tail) ;
}
result = $(head) $(x) $(tail) ;
}
}
return $(result) ;
else
{
for local x in $(s[2-])
{
local head tail ;
tail = $(result) ;
while $(tail) && [ modules.call-in $(caller) : $(ordered) $(tail[1]) $(x) ]
{
head += $(tail[1]) ;
tail = $(tail[2-]) ;
}
result = $(head) $(x) $(tail) ;
}
}
return $(result) ;
}
}
# merge two ordered sequences using the BinaryPredicate ordered.