Merge branch 'main' into minor-2.0

Author: pavpanchekha

src/float.rkt

@@ -8,7 +8,7 @@
  ulp-difference ulps->bits
  midpoint random-generate
  </total <=/total
- value->string value->json
+ value->string value->json json->value
  real->repr repr->real)
 
 (define (ulp-difference x y repr)
@@ -62,6 +62,20 @@
     [_ (hash 'type (~a (representation-name repr))
              'ordinal (~a ((representation-repr->ordinal repr) x)))]))
 
+(define (json->value x repr)
+  (match x
+    [(? real?) x]
+    [(? hash?) 
+      (match (hash-ref x 'type) 
+        ["real"
+          (match (hash-ref x 'value)
+            ["-inf" -inf.0]
+            ["+inf" +inf.0]
+            ["NaN" +nan.0]
+            [_ +nan.0])]
+        [_ ((representation-ordinal->repr repr)
+              (string->number (hash-ref x 'ordinal)))])]))
+
 (define (value->string n repr)
   ;; Prints a number with relatively few digits
   (define ->bf (representation-repr->bf repr))

src/points.rkt

@@ -91,9 +91,9 @@
   (define-values (pts exs)
     (for/lists (pts exs) ([entry (in-list json)])
       (match-define (list pt ex) entry)
-      (values (map real->repr pt var-reprs) (real->repr ex output-repr))))
+      (values (map real->repr pt var-reprs) (real->repr (json->value ex output-repr) output-repr))))
   (mk-pcontext pts exs))
 
-(define (pcontext->json pcontext)
+(define (pcontext->json pcontext repr)
   (for/list ([(pt ex) (in-pcontext pcontext)])
-    (list pt ex)))
+    (list (map (curryr value->json repr) pt) (value->json ex repr))))

src/web/demo.rkt

@@ -368,7 +368,7 @@
       (define pctx (job-result-backend result))
 
       (eprintf " complete\n")
-      (hasheq 'points (pcontext->json pctx)))))
+      (hasheq 'points (pcontext->json pctx (context-repr (test-context test)))))))
 
 (define analyze-endpoint
   (post-with-json-response

www/doc.html

@@ -33,13 +33,18 @@ <h2>Tutorials</h2>
   <h2>Documentation</h2>
 
   <ul>
-    <li><a href="doc/latest/faq.html">FAQ</a>: troubleshooting Herbie.</li>
-    <li><a href="doc/latest/release-notes.html">Release Notes</a>: the biggest and latest changes to Herbie.</li>
     <li><a href="doc/latest/input.html">Input format</a>: what sorts of expressions Herbie supports.</li>
     <li><a href="doc/latest/options.html">Command-line flags</a>: modifying Herbie's behavior.</li>
+    <li><a href="doc/latest/error.html">What is error?</a>: how Herbie measures floating-point error.</li>
+    <li><a href="doc/latest/faq.html">FAQ</a>: troubleshooting Herbie.</li>
+    <li><a href="doc/latest/release-notes.html">Release Notes</a>: the biggest and latest changes to Herbie.</li>
+  </ul>
+
+  <h2>Internal Documentation</h2>
+  <ul>
     <li><a href="doc/latest/plugins.html">Plugins</a>: teaching Herbie about new input formats.</li>
-    <li><a href="doc/latest/diagrams.html">Diagrams</a>: miscellaneous figures related to Herbie</li>
     <li><a href="doc/latest/api-endpoints.html">HTTP API</a>: Herbie's HTTP endpoints</li>
+    <li><a href="doc/latest/diagrams.html">Diagrams</a>: miscellaneous figures related to Herbie</li>
   </ul>
 
   <h2>Blog posts about Herbie</h2>