Index: doc/generic_types/evaluation/cfa-bench.c =================================================================== --- doc/generic_types/evaluation/cfa-bench.c (revision 457013197df212effd5e36568f1d38ea6ca3704e) +++ doc/generic_types/evaluation/cfa-bench.c (revision 6eb439832ecffd8a3243d08854bebef61ebda043) @@ -1,4 +1,3 @@ #include -#include #include #include "pair" @@ -7,56 +6,22 @@ #include "cfa-print.h" -int main(int argc, char** argv) { - FILE* out = fopen("cfa-out.txt", "w"); - srand(20171025); +int main( int argc, char *argv[] ) { + FILE * out = fopen( "cfa-out.txt", "w" ); + int max = 0; + stack(int) s, t; + REPEAT_TIMED( "push_int", push( &s, _i ); ) + TIMED( "copy_int", t = s; ) + TIMED( "clear_int", clear( &s ); ) + REPEAT_TIMED( "pop_int", max = max( max, pop( &t ) ); ) + REPEAT_TIMED( "print_int", print( out, _i, ":", _i, "\n" ); ) - stack(int) s; - REPEAT_TIMED( "push_int", - push( &s, rand() ); - ) - - stack(int) t; - TIMED( "copy_int", - t = s; - ) - - TIMED( "clear_int", - clear( &s ); - ) - - int max = 0; - REPEAT_TIMED( "pop_int", - max = max( max, pop( &t ) ); - ) - print( out, max, "\n" ); - - REPEAT_N_TIMED( "print_int", N/2, - print( out, rand(), ":", rand(), "\n" ); - ) - - stack(pair(_Bool, char)) s2; - REPEAT_TIMED( "push_bool_char", - push( &s2, (pair(_Bool, char)){ rand() & 0x1, rand() & 0x7F } ); - ) - - stack(pair(_Bool, char)) t2; - TIMED( "copy_bool_char", - t2 = s2; - ) - - TIMED( "clear_bool_char", - clear( &s2 ); - ) - - pair(_Bool, char) max2 = { (_Bool)0, '\0' }; - REPEAT_TIMED( "pop_bool_char", - max2 = max( max2, pop( &t2 ) ); - ) - print( out, max2, "\n" ); - - REPEAT_N_TIMED( "print_pair", N/2, - print( out, (pair(_Bool, char)){ rand() & 0x1, rand() & 0x7F }, ":", - (pair(_Bool, char)){ rand() & 0x1, rand() & 0x7F }, "\n" ); - ) + stack(pair(_Bool, char)) s1, t1; + pair(_Bool, char) max = { (_Bool)0, '\0' }; + REPEAT_TIMED( "push_pair", push( &s1, (pair(_Bool, char)){ _i & 1, _i &0x7F } ); ) + TIMED( "copy_pair", t1 = s1; ) + TIMED( "clear_pair", clear( &s1 ); ) + REPEAT_TIMED( "pop_pair", max = max( max, pop( &t1 ) ); ) + REPEAT_TIMED( "print_pair", + print( out, (pair(_Bool, char)){ _i & 1, _i &0x7F }, ":", (pair(_Bool, char)){ _i & 1, _i &0x7F }, "\n" ); ) fclose(out); } Index: doc/generic_types/evaluation/cpp-bench.cpp =================================================================== --- doc/generic_types/evaluation/cpp-bench.cpp (revision 457013197df212effd5e36568f1d38ea6ca3704e) +++ doc/generic_types/evaluation/cpp-bench.cpp (revision 6eb439832ecffd8a3243d08854bebef61ebda043) @@ -1,5 +1,4 @@ #include #include -#include #include #include "bench.hpp" @@ -9,53 +8,22 @@ int main(int argc, char** argv) { std::ofstream out{"cpp-out.txt"}; - srand(20171025); + stack s, t; + int max = 0; + REPEAT_TIMED( "push_int", s.push( _i ); ) + TIMED( "copy_int", t = s; ) + TIMED( "clear_int", s.clear(); ) + REPEAT_TIMED( "pop_int", max = std::max( max, t.pop() ); ) + print( out, max, "\n" ); + REPEAT_N_TIMED( "print_int", N/2, print( out, _i, ":", _i, "\n" ); ) - stack s; - REPEAT_TIMED( "push_int", - s.push( rand() ); - ) - - stack t; - TIMED( "copy_int", - t = s; - ) - - TIMED( "clear_int", - s.clear(); - ) - - int max = 0; - REPEAT_TIMED( "pop_int", - max = std::max( max, t.pop() ); - ) - print( out, max, "\n" ); - - REPEAT_N_TIMED( "print_int", N/2, - print( out, rand(), ":", rand(), "\n" ); - ) - - stack> s2; - REPEAT_TIMED( "push_bool_char", - s2.push( std::pair{ rand() & 0x1, rand() & 0x7F } ); - ) - - stack> t2; - TIMED( "copy_bool_char", - t2 = s2; - ) - - TIMED( "clear_bool_char", - s2.clear(); - ) - - std::pair max2 = { false, '\0' }; - REPEAT_TIMED( "pop_bool_char", - max2 = std::max( max2, t2.pop() ); - ) - print( out, max2, "\n" ); - + stack> s1, t1; + std::pair max1 = { false, '\0' }; + REPEAT_TIMED( "push_bool_char", s1.push( std::pair{ _i & 0x1, _i & 0x7F } ); ) + TIMED( "copy_bool_char", t1 = s1; ) + TIMED( "clear_bool_char", s1.clear(); ) + REPEAT_TIMED( "pop_bool_char", max1 = std::max( max1, t1.pop() ); ) + print( out, max1, "\n" ); REPEAT_N_TIMED( "print_pair", N/2, - print( out, std::pair{ rand() & 0x1, rand() & 0x7F }, ":", - std::pair{ rand() & 0x1, rand() & 0x7F }, "\n" ); - ) + print( out, std::pair{ _i & 0x1, _i & 0x7F }, ":", + std::pair{ _i & 0x1, _i & 0x7F }, "\n" ); ) } Index: doc/generic_types/evaluation/cpp-vbench.cpp =================================================================== --- doc/generic_types/evaluation/cpp-vbench.cpp (revision 457013197df212effd5e36568f1d38ea6ca3704e) +++ doc/generic_types/evaluation/cpp-vbench.cpp (revision 6eb439832ecffd8a3243d08854bebef61ebda043) @@ -1,5 +1,4 @@ #include #include -#include #include "bench.hpp" #include "cpp-vstack.hpp" @@ -9,58 +8,26 @@ int main(int argc, char** argv) { std::ofstream out{"cpp-vout.txt"}; - srand(20171025); + stack s, t; + integer max{ 0 }; + REPEAT_TIMED( "push_int", s.push( make( _i ) ); ) + TIMED( "copy_int", t = s; ) + TIMED( "clear_int", s.clear(); ) + REPEAT_TIMED( "pop_int", max = std::max( max, t.pop()->as() ); /***/ ) + print( out, max, c_string{"\n"} ); + REPEAT_N_TIMED( "print_int", N/2, + print( out, integer{_i}, c_string{":"}, integer{_i}, c_string{"\n"} ); ) - stack s; - REPEAT_TIMED( "push_int", - s.push( std::make_unique( rand() ) ); - ) - - stack t; - TIMED( "copy_int", - t = s; - ) - - TIMED( "clear_int", - s.clear(); - ) - - integer max; - REPEAT_TIMED( "pop_int", - max = std::max( max, t.pop()->as() ); /***/ - ) - print( out, max, c_string{"\n"} ); - - REPEAT_N_TIMED( "print_int", N/2, - print( out, integer{rand()}, c_string{":"}, integer{rand()}, c_string{"\n"} ); - ) - - stack s2; - REPEAT_TIMED( "push_bool_char", - s2.push( std::make_unique( std::make_unique( rand() & 0x1 ), - std::make_unique( rand() & 0x7F ) ) ); - ) - - stack t2; - TIMED( "copy_bool_char", - t2 = s2; - ) - - TIMED( "clear_bool_char", - s2.clear(); - ) - - auto max2 = std::make_unique( std::make_unique(false), - std::make_unique('\0') ); + stack s1, t1; + ptr max1 = make( make(false), make('\0') ); + REPEAT_TIMED( "push_bool_char", + s1.push( make( make(_i & 1), make(_i & 0x7F) ) ); ) + TIMED( "copy_bool_char", t1 = s1; ) + TIMED( "clear_bool_char", s1.clear(); ) REPEAT_TIMED( "pop_bool_char", - std::unique_ptr x = as_ptr( t2.pop() ); /***/ - if ( *x > *max2 ) { max2 = std::move(x); } - ) - print( out, *max2, c_string{"\n"} ); - + ptr x = as_ptr( t1.pop() ); /***/ + if ( *x > *max1 ) { max1 = std::move(x); } ) + print( out, *max1, c_string{"\n"} ); REPEAT_N_TIMED( "print_pair", N/2, - print( out, pair{ std::make_unique( rand() & 0x1 ), - std::make_unique( rand() & 0x7F ) }, c_string{":"}, - pair{ std::make_unique( rand() & 0x1 ), - std::make_unique( rand() & 0x7F ) }, c_string{"\n"} ); - ) + print( out, pair{ make(_i & 1), make(_i & 0x7F) }, c_string{":"}, + pair{ make(_i & 1), make(_i & 0x7F) }, c_string{"\n"} ); ) } Index: doc/generic_types/evaluation/cpp-vstack.cpp =================================================================== --- doc/generic_types/evaluation/cpp-vstack.cpp (revision 457013197df212effd5e36568f1d38ea6ca3704e) +++ doc/generic_types/evaluation/cpp-vstack.cpp (revision 6eb439832ecffd8a3243d08854bebef61ebda043) @@ -5,5 +5,5 @@ stack::node::node( const object& v ) : value( v.new_copy() ), next( nullptr ) {} -stack::node::node( std::unique_ptr&& v, node* n ) : value( std::move(v) ), next( n ) {} +stack::node::node( ptr&& v, node* n ) : value( std::move(v) ), next( n ) {} void stack::copy(const stack& o) { @@ -50,16 +50,12 @@ } -bool stack::empty() const { - return head == nullptr; -} +bool stack::empty() const { return head == nullptr; } -void stack::push(std::unique_ptr&& value) { - head = new node{ std::move(value), head }; /***/ -} +void stack::push(ptr&& value) { head = new node{ std::move(value), head }; /***/ } -std::unique_ptr stack::pop() { +ptr stack::pop() { node* n = head; head = n->next; - std::unique_ptr x = std::move(n->value); + ptr x = std::move(n->value); delete n; return x; Index: doc/generic_types/evaluation/cpp-vstack.hpp =================================================================== --- doc/generic_types/evaluation/cpp-vstack.hpp (revision 457013197df212effd5e36568f1d38ea6ca3704e) +++ doc/generic_types/evaluation/cpp-vstack.hpp (revision 6eb439832ecffd8a3243d08854bebef61ebda043) @@ -5,10 +5,10 @@ class stack { struct node { - std::unique_ptr value; + ptr value; node* next; node( const object& v ); - node( std::unique_ptr&& v, node* n ); + node( ptr&& v, node* n ); }; @@ -34,6 +34,6 @@ bool empty() const; - void push(std::unique_ptr&& value); + void push(ptr&& value); - std::unique_ptr pop(); + ptr pop(); }; Index: doc/generic_types/evaluation/object.hpp =================================================================== --- doc/generic_types/evaluation/object.hpp (revision 457013197df212effd5e36568f1d38ea6ca3704e) +++ doc/generic_types/evaluation/object.hpp (revision 6eb439832ecffd8a3243d08854bebef61ebda043) @@ -25,4 +25,6 @@ std::type_index class_of() { return { typeid(T) }; } +template using ptr = std::unique_ptr; + class object { public: @@ -43,7 +45,7 @@ } - virtual std::unique_ptr new_inst() const = 0; - - virtual std::unique_ptr new_copy() const = 0; + virtual ptr new_inst() const = 0; + + virtual ptr new_copy() const = 0; virtual object& operator= (const object&) = 0; @@ -52,8 +54,9 @@ }; +template +static inline ptr make(Args&&... args) { return std::make_unique(std::forward(args)...); } + template -std::unique_ptr as_ptr( std::unique_ptr&& p ) { - return std::unique_ptr{ &p.release()->template as() }; -} +ptr as_ptr( ptr&& p ) { return ptr{ &p.release()->template as() }; } class ordered : public virtual object { @@ -87,7 +90,7 @@ boolean(bool x) : x(x) {} - std::unique_ptr new_inst() const override { return std::make_unique(); } - - std::unique_ptr new_copy() const override { return std::make_unique(*this); } + ptr new_inst() const override { return make(); } + + ptr new_copy() const override { return make(*this); } boolean& operator= (const boolean& that) { @@ -115,7 +118,7 @@ character(char x) : x(x) {} - std::unique_ptr new_inst() const override { return std::make_unique(); } - - std::unique_ptr new_copy() const override { return std::make_unique(*this); } + ptr new_inst() const override { return make(); } + + ptr new_copy() const override { return make(*this); } character& operator= (const character& that) { @@ -146,7 +149,7 @@ integer(int x) : x(x) {} - std::unique_ptr new_inst() const override { return std::make_unique(); } - - std::unique_ptr new_copy() const override { return std::make_unique(*this); } + ptr new_inst() const override { return make(); } + + ptr new_copy() const override { return make(*this); } integer& operator= (const integer& that) { @@ -174,7 +177,7 @@ c_string(const char* s) : s(s) {} - std::unique_ptr new_inst() const override { return std::make_unique(); } - - std::unique_ptr new_copy() const override { return std::make_unique(s); } + ptr new_inst() const override { return make(); } + + ptr new_copy() const override { return make(s); } c_string& operator= (const c_string& that) { @@ -191,17 +194,16 @@ class pair : public ordered, public printable { - std::unique_ptr x; - std::unique_ptr y; + ptr x; + ptr y; public: pair() = default; - pair(std::unique_ptr&& x, std::unique_ptr&& y) - : x(std::move(x)), y(std::move(y)) {} - - std::unique_ptr new_inst() const override { return std::make_unique(); } - - std::unique_ptr new_copy() const override { - return std::make_unique(x->new_copy(), y->new_copy()); + pair(ptr&& x, ptr&& y) : x(std::move(x)), y(std::move(y)) {} + + ptr new_inst() const override { return make(); } + + ptr new_copy() const override { + return make(x->new_copy(), y->new_copy()); } Index: doc/generic_types/generic_types.tex =================================================================== --- doc/generic_types/generic_types.tex (revision 457013197df212effd5e36568f1d38ea6ca3704e) +++ doc/generic_types/generic_types.tex (revision 6eb439832ecffd8a3243d08854bebef61ebda043) @@ -194,5 +194,4 @@ The new constructs are empirically compared with both standard C and \CC; the results show the new design is comparable in performance. - \subsection{Polymorphic Functions} \label{sec:poly-fns} @@ -1109,5 +1108,5 @@ In conclusion, the authors' design for generic types and tuples, unlike those available in existing work, is both reusable and type-checked, while still supporting a full range of C features, including separately-compiled modules. -We have experimentally validated the performance of our design against both \CC and standard C, showing it is \TODO{shiny, cap'n}. +We have experimentally validated the performance of our design against both \CC and standard C, showing it is comparable to both, and in some cases better.