Changes in / [b38225d:38d70ab]

Files:

• doc/working/resolver_design.md (modified) (1 diff)
• src/libcfa/iostream (modified) (4 diffs)
• src/libcfa/iostream.c (modified) (3 diffs)
• src/tests/.expect/div.txt (added)
• src/tests/div.c (modified) (2 diffs)

doc/working/resolver_design.md

@@ -91 +91 @@
 ## Conversion Costs ##
 Each possible resolution of an expression has a _cost_ tuple consisting of 
-the following components: _unsafe_ conversion cost, _polymorphic_ 
-specialization cost, _safe_ conversion cost, a count of _explicit_ 
-conversions, and _qualifier_ conversion cost. 
+the following components:
+1. _unsafe_ conversion cost: summed degree of unsafe conversions; unlike CFA03, this is not a simple count of conversions (for symmetry with the safe conversions)
+2. _polymorphic unifications_: count of parameters and return values bound to some polymorphic type for boxing
+3. _type variables_: number of polymorphic type variables bound
+4. negated _type specializations_: Each type assertion specializes the polymorphism, thus decreasing the cost; nested polymorphic types (e.g. `T*`) are also counted as specializations
+5. _safe_ conversions: summed degree of safe conversions
+6. _qualifier_ conversions: summed degree of qualifier and reference conversions
 These components are lexically-ordered and can be summed element-wise; 
 summation starts at `(0, 0, 0, 0, 0)`.
+
+**TODO** update below for consistency with this
 
 ### Lvalue and Qualifier Conversions ###

src/libcfa/iostream

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul  7 08:35:59 2017
-// Update Count     : 118
+// Last Modified On : Wed Aug  9 16:42:47 2017
+// Update Count     : 131
 //
 
@@ -46 +46 @@
 }; // ostream
 
-trait writeable( otype T ) {
-        forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, T );
+// trait writeable( otype T ) {
+//      forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, T );
+// }; // writeable
+
+trait writeable( otype T, dtype ostype | ostream( ostype ) ) {
+        ostype * ?|?( ostype *, T );
 }; // writeable
 
@@ -77 +81 @@
 
 // tuples
-forall( dtype ostype, otype T, ttype Params | ostream( ostype ) | writeable( T ) | { ostype * ?|?( ostype *, Params ); } ) ostype * ?|?( ostype * os, T arg, Params rest );
+forall( dtype ostype, otype T, ttype Params | writeable( T, ostype ) | { ostype * ?|?( ostype *, Params ); } )
+ostype * ?|?( ostype * os, T arg, Params rest );
 
 // manipulators
@@ -90 +95 @@
 
 // writes the range [begin, end) to the given stream
-forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) )
-void write( iterator_type begin, iterator_type end, os_type *os );
+forall( dtype ostype, otype elt_type | writeable( elt_type, ostype ), otype iterator_type | iterator( iterator_type, elt_type ) )
+void write( iterator_type begin, iterator_type end, ostype * os );
 
-forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) )
-void write_reverse( iterator_type begin, iterator_type end, os_type *os );
+forall( dtype ostype, otype elt_type | writeable( elt_type, ostype ), otype iterator_type | iterator( iterator_type, elt_type ) )
+void write_reverse( iterator_type begin, iterator_type end, ostype * os );
 
 //---------------------------------------

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jul 16 21:12:03 2017
-// Update Count     : 398
+// Last Modified On : Wed Aug  9 16:46:51 2017
+// Update Count     : 401
 //
 
@@ -193 +193 @@
 
 // tuples
-forall( dtype ostype, otype T, ttype Params | ostream( ostype ) | writeable( T ) | { ostype * ?|?( ostype *, Params ); } )
+forall( dtype ostype, otype T, ttype Params | writeable( T, ostype ) | { ostype * ?|?( ostype *, Params ); } )
 ostype * ?|?( ostype * os, T arg, Params rest ) {
         os | arg;                                                                                       // print first argument
@@ -256 +256 @@
 //---------------------------------------
 
-forall( otype elttype | writeable( elttype ), otype iteratortype | iterator( iteratortype, elttype ), dtype ostype | ostream( ostype ) )
-void write( iteratortype begin, iteratortype end, ostype * os ) {
-        void print( elttype i ) { os | i; }
+forall( dtype ostype, otype elt_type | writeable( elt_type, ostype ), otype iterator_type | iterator( iterator_type, elt_type ) )
+void write( iterator_type begin, iterator_type end, ostype * os ) {
+        void print( elt_type i ) { os | i; }
         for_each( begin, end, print );
 } // ?|?
 
-forall( otype elttype | writeable( elttype ), otype iteratortype | iterator( iteratortype, elttype ), dtype ostype | ostream( ostype ) )
-void write_reverse( iteratortype begin, iteratortype end, ostype * os ) {
-        void print( elttype i ) { os | i; }
+forall( dtype ostype, otype elt_type | writeable( elt_type, ostype ), otype iterator_type | iterator( iterator_type, elt_type ) )
+void write_reverse( iterator_type begin, iterator_type end, ostype * os ) {
+        void print( elt_type i ) { os | i; }
         for_each_reverse( begin, end, print );
 } // ?|?

src/tests/div.c

@@ -11 +11 @@
 // Created On       : Tue Aug  8 16:28:43 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug  8 18:02:44 2017
-// Update Count     : 14
+// Last Modified On : Wed Aug  9 17:09:40 2017
+// Update Count     : 16
 // 
 
@@ -28 +28 @@
         sout | "div" | div( s1, s2 ) | endl;
         T t1 = { 13 }, t2 = { 5 };
-        [t1, t2] = div( t1, t2 );                                                       // polymorphic div
-        sout | "div" | t1 | t2 | endl;
-//      sout | "div" | div( t1, t2 ) | endl;
+        sout | "div" | div( t1, t2 ) | endl;                            // polymorphic div
 } // main