diff --git a/CHANGES.txt b/CHANGES.txt --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,8 @@ Changelog for Debug +0.1.1, released 2018-03-19 + Switch the HTML to Elm, fixing a few minor bugs + Expose a few more functions from Debug.Hoed 0.1, released 2018-02-16 Add Hoed based mode #16, display values for intermediate function calls diff --git a/debug.cabal b/debug.cabal --- a/debug.cabal +++ b/debug.cabal @@ -1,7 +1,7 @@ cabal-version: >= 1.18 build-type: Simple name: debug -version: 0.1 +version: 0.1.1 license: BSD3 license-file: LICENSE category: Development, Debugging @@ -15,12 +15,13 @@ Full usage instructions are at "Debug". homepage: https://github.com/ndmitchell/debug bug-reports: https://github.com/ndmitchell/debug/issues -tested-with: GHC==8.2.2, GHC==8.0.2 +tested-with: GHC==8.4.1, GHC==8.2.2, GHC==8.0.2 extra-doc-files: CHANGES.txt README.md data-files: + html/debug.css html/debug.html html/debug.js @@ -49,13 +50,11 @@ deepseq, directory, hashable, - monoidal-containers, template-haskell, open-browser, text, uniplate, unordered-containers, - js-jquery, prettyprinter, prettyprinter-compat-ansi-wl-pprint, vector diff --git a/html/debug.css b/html/debug.css new file mode 100644 --- /dev/null +++ b/html/debug.css @@ -0,0 +1,36 @@ +body { + font-family: 'Source Sans Pro', 'Trebuchet MS', 'Lucida Grande', 'Bitstream Vera Sans', 'Helvetica Neue', sans-serif; + color: #293c4b; + height: 100%; +} +h1 {margin-bottom: 5px;} +ul {font-size: 10pt;} +li {font-family: sans-serif;} +h1 {font-size: 20pt; background-color: #d3d3d3; margin-top: 0; padding: 5px;} +#function-list a {text-decoration: none;} +#function-depends-section ul {list-style-type: none;} +#function-depends-current {list-style-type: disc;} +h2 {margin-top: 0; margin-bottom: 5px; font-size: 12pt;} +.h2like {margin-top: 0; margin-bottom: 5px; font-size: 12pt; font-weight: bold} +td {vertical-align: top;} +abbr {text-decoration: none;} +.render-call{margin: 5px;} +.render-arg{margin: 5px; display: inline-block;} +.call-link{} +.calls-per-page{font-size:10pt;} + +.hs-keyglyph {color: red;} +.hs-equals {color: blue;, font-weight: bold} +.hs-keyword {color: blue;} +.hs-comment {color: green;} +.hs-str, .hs-chr {color: teal;} + +a:link, a:visited { + color: unset; + text-decoration: unset; + cursor: auto; +} + +a:link:active, a:visited:active { + color: unset; +} diff --git a/html/debug.html b/html/debug.html --- a/html/debug.html +++ b/html/debug.html @@ -2,60 +2,14 @@ Debug - - - - - - - - - - - - - - - - - -
-

Haskell Debugger

-
-

Functions

-
- -
    -     		-

    Source

    - 
    
-        
    
-            
    Variables
    
-            
      
-        
      
-            
      Calls
      
-            
        
-        
      
-
-
+        
     
 
diff --git a/html/debug.js b/html/debug.js
--- a/html/debug.js
+++ b/html/debug.js
@@ -1,165 +1,12243 @@
-var hsLexer = /[a-zA-Z][a-zA-Z0-9]+|[\r\n]|./;
-var symbols = "->:=()[]";
-
-function escapeHTML(x)
-{
-    return x
-         .replace(/&/g, "&")
-         .replace(//g, ">")
-         .replace(/"/g, """)
-         .replace(/'/g, "'");
-}
-
-function showCall(i)
-{
-    var t = trace.calls[i];
-    var inf = trace.functions[t[""]];
-    $source = $("#function-source").empty();
-    var source = inf.source;
-    while (source != "")
-    {
-        var res = hsLexer.exec(source);
-        if (res == null || res[0].length == 0)
-        {
-            $source.append(source);
-            break;
-        }
-        else
-        {
-            if (res[0] == "where")
-                $source.append("where");
-            else if (symbols.indexOf(res[0]) != -1)
-                $source.append("" + escapeHTML(res[0]) + "");
-            else if (res[0] in t)
-                $source.append("" + escapeHTML(res[0]) + "");
-            else
-                $source.append(res[0]);
-            source = source.substr(res[0].length);
-        }
-    }
-
-    showCallStack(i);
-
-    $("#function-variables").empty();
-    var variables = [];
-    var seenDepends = false;
-
-    for (var s in t)
-    {
-        if (s == "" || s == "$parents" || s == "$depends") continue;
-        else
-            variables.push(s + " = " + trace.variables[t[s]]);
-    }
-    variables = variables.sort();
-    for (var i = 0; i < variables.length; i++)
-        $("#function-variables").append($("
    • " + escapeHTML(variables[i]) + "
      • "));
-}
-
-function showCallStack(me)
-{
-    var t = trace.calls[me];
-    var d = t["$depends"];
-    if(t["$parents"] == null && d == null)
-        $("#function-depends-section").hide();
-    else {
-        var i;
-        var par = me;
-        var parents = [];
-        var depends = [];
-        var msg;
-        var these;
-        $("#function-depends").empty();
-        // parents
-        while(true){
-            these = trace.calls[par]["$parents"];
-            if(these == null || these.Length == 0) {
-                break;
-            }
-            // assumes one parent only
-            par = these[0];
-            msg = renderCall(par);
-            parents.unshift("
    • " + escapeHTML(msg) + "
      • ");
-
-        }
-        // depends
-        for(i in d) {
-            msg = renderCall(d[i]);
-            depends.push("
    • " + escapeHTML(msg) + "
      • ");
-        }
-        // assembling the call stack. There must be a better way...
-        var callstack = $("#function-depends");
-        var cursor = callstack;
-        var temp;
-        for(i in parents) {
-            temp = $("