Author: miguel
Date: 2007-05-28 15:19:31 -0400 (Mon, 28 May 2007)
New Revision: 78085

Modified:
   trunk/release/moma/Makefile
   trunk/release/moma/head
   trunk/release/moma/moma.cs
Log:
Get some more stats in place, now we can start using this

Modified: trunk/release/moma/Makefile
===================================================================
--- trunk/release/moma/Makefile 2007-05-28 19:03:58 UTC (rev 78084)
+++ trunk/release/moma/Makefile 2007-05-28 19:19:31 UTC (rev 78085)
@@ -3,4 +3,4 @@
        gmcs -debug moma.cs && mono --debug moma.exe ~/Results/Fresh 
~/Results/1.2.4 output
 
 push:
-       (cd output; rsync -a . primates.ximian.com:public_html/newmomareports)
\ No newline at end of file
+       (cd output; rsync -a . primates.ximian.com:public_html/momareports)
\ No newline at end of file

Modified: trunk/release/moma/head
===================================================================
--- trunk/release/moma/head     2007-05-28 19:03:58 UTC (rev 78084)
+++ trunk/release/moma/head     2007-05-28 19:19:31 UTC (rev 78085)
@@ -13,8 +13,8 @@
 the number of APIs that have been implemented since the original
 report was submitted.
 
-<p>The summary results are not currently available, as I just rewrote
-the hundred of messy shell scripts that took forever to run using a <a
+<p>Not all summary results are available, as I just rewrote the
+hundred of messy shell scripts that took forever to run using a <a
 href="http://anonsvn.mono-project.com/viewcvs/trunk/release/moma";>C#
 program</a>.
 

Modified: trunk/release/moma/moma.cs
===================================================================
--- trunk/release/moma/moma.cs  2007-05-28 19:03:58 UTC (rev 78084)
+++ trunk/release/moma/moma.cs  2007-05-28 19:19:31 UTC (rev 78085)
@@ -156,6 +156,11 @@
 
                concat ("side");
                p ("<b>Submissions:</b> {0}", reports.Count);
+               p ("<p><b>Totals:</b>");
+               p ("<ul style=\"list-style-type: none;\">");
+               p ("<li><a href='f-MISS.txt'>Missing</a>");
+               p ("<li><a href='f-NIEX.txt'>Throw NotImplemented</a>");
+               p ("<li><a href='f-TODO.txt'>TODO/Pending</a>");
                concat ("end");
 
                sw.Close ();
@@ -163,7 +168,9 @@
                //
                // Now render the total needs
                //
-               //GenerateStats (Flags.MISS, Path.Combine (outputdir, 
"f-MISS.txt"), "missing");
+               GenerateStats (Flags.MISS, Path.Combine (outputdir, 
"f-MISS.txt"), "missing/not-present in Mono today");
+               GenerateStats (Flags.TODO, Path.Combine (outputdir, 
"f-TODO.txt"), "methods flagged as TODO");
+               GenerateStats (Flags.NIEX, Path.Combine (outputdir, 
"f-NIEX.txt"), "throwing NotImplementedException");
        }
 
        static void GenerateStats (int flag, string fname, string caption)
@@ -182,22 +189,22 @@
                                foreach (string gapi in Report.GlobalApi.Keys){
                                        int n, k;
                                        
-                                       
                                        n = Report.GlobalApi [gapi];
-                                       if ((n & flag) != 0){
-                                               
-                                               if (Moma.API.TryGetValue (gapi, 
out k))
-                                                       n = k;
-                                               
+                                       if ((n >> 24) == flag)
                                                table [gapi] = n & 0xffffff;
-                                       }
                                }
 
                                sw.WriteLine ("Total counts for {0} APIs\n\n", 
caption);
                                
                                foreach (string s in table.Keys){
                                        int p = s.IndexOf (' ');
-                                       sw.WriteLine ("  {0,4} {1}", table [s], 
s.Substring (p + 1));
+                                       sw.WriteLine ("  {0,6} {1}", table [s], 
s.Substring (p + 1));
+
+                                       // Be a bit more useful in TODO reports
+                                       if (flag == Flags.TODO){
+                                               sw.WriteLine ("        Details: 
{0}", TodoExplanation [s]);
+                                               sw.WriteLine ();
+                                       }
                                }
                        }
                }
@@ -225,7 +232,7 @@
                        xn = GlobalApi [x];
                        yn = GlobalApi [y];
 
-                       return (xn & 0xffffff) - (yn & 0xffffff);
+                       return (yn & 0xffffff) - (xn & 0xffffff);
                }
        }
        
@@ -320,6 +327,15 @@
                                }
                                string rest = r.Substring (7);
 
+                               //
+                               // If the API is not registered in the latest
+                               // API tables, do not register it, it means it
+                               // has been taken care of.
+                               //
+                               int n;
+                               if (!Moma.API.TryGetValue (rest, out n))
+                                       continue;
+                               
                                Register (local, ikind, rest);
                                Register (GlobalApi, ikind, rest);
                        }
@@ -434,7 +450,7 @@
 
                                        // If it is a todo, add the annotation 
of what the message is
                                        if ((n & Flags.TODO) != 0){
-                                               p (rw, "              {0}", 
Moma.TodoExplanation [s]);
+                                               p (rw, "              Details: 
{0}", Moma.TodoExplanation [s]);
                                        }
                                }
                        }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to