Merge branch 'master' into release-1.5

Author: pavpanchekha

.github/workflows/tests.yml

@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        racket-version: [ '7.8', '8.0', '8.1' ]
+        racket-version: [ '8.0', '8.0', '8.2' ]
         precision: [ 'binary32', 'binary64' ]
     steps:
       - name: "Install Packages"
@@ -62,7 +62,9 @@ jobs:
       - name: "Install Packages"
         run: sudo apt-get install -y libmpfr6 libmpfr-dev
       - name: "Install Racket"
-        uses: Bogdanp/[email protected]
+        uses: Bogdanp/[email protected]
+        with:
+          version: '8.0'
       - name: Install Rust compiler
         uses: actions-rs/toolchain@v1
         with:
@@ -90,7 +92,9 @@ jobs:
       - name: "Install Packages"
         run: sudo apt-get install -y libmpfr6 libmpfr-dev
       - name: "Install Racket"
-        uses: Bogdanp/[email protected]
+        uses: Bogdanp/[email protected]
+        with:
+          version: '8.0'
       - name: Install Rust compiler
         uses: actions-rs/toolchain@v1
         with:
@@ -116,15 +120,14 @@ jobs:
     needs: [ 'hamming' ]
     strategy:
       matrix: # this takes a while: don't run too many
-        racket-version: [ '7.9' ]
         precision: [ 'binary32', 'binary64' ]
     steps:
       - name: "Install Packages"
         run: sudo apt-get install -y libmpfr6 libmpfr-dev
       - name: "Install Racket"
-        uses: Bogdanp/setup-racket@v0.5
+        uses: Bogdanp/setup-racket@v1.3.1
         with:
-          version: ${{ matrix.racket-version }}
+          version: '8.0'
       - uses: actions/checkout@master
       - name: "Install dependencies"
         run: make install

src/conversions.rkt

@@ -5,7 +5,7 @@
          (submod "syntax/rules.rkt" internals) (submod "syntax/syntax.rkt" internals))
 (provide generate-conversions generate-prec-rewrites get-rewrite-operator *conversions*)
 
-(define *conversions* (make-parameter (make-hash)))
+(define *conversions* (make-parameter (hash)))
 
 (define/contract (string-replace* str changes)
   (-> string? (listof (cons/c string? string?)) string?)
@@ -104,8 +104,8 @@
     (for/fold ([reprs '()]) ([conv convs])
       (define prec1 (first conv))
       (define prec2 (last conv))
-      (hash-update! (*conversions*) prec1 (λ (x) (cons prec2 x)) '())
-      (hash-update! (*conversions*) prec2 (λ (x) (cons prec1 x)) '())
+      (*conversions* (hash-update (*conversions*) prec1 (λ (x) (cons prec2 x)) '()))
+      (*conversions* (hash-update (*conversions*) prec2 (λ (x) (cons prec1 x)) '()))
       (generate-prec-rewrite prec1 prec2)
       (set-union reprs (list (get-representation prec1) (get-representation prec2)))))
   (*needed-reprs* (set-union reprs (*needed-reprs*))))

src/core/localize.rkt

@@ -16,11 +16,10 @@
   (hash-ref! cache expr
              (λ ()
                 (match expr
+                  [(? number?)
+                   (cons (repeat (bf expr)) (repeat 1))]
                   [(? constant?)
-                   (define val
-                     (if (symbol? expr)
-                         ((constant-info expr 'bf))
-                         (bf expr)))
+                   (define val ((constant-info expr 'bf)))
                    (cons (repeat val) (repeat 1))]
                   [(? variable?)
                    (cons (map (curryr representation-repr->bf (dict-ref (*var-reprs*) expr))
@@ -61,7 +60,7 @@
 (register-reset
  (λ ()
   (*analyze-context* (*pcontext*))
-  (hash-clear! *analyze-cache*)))
+  (set! *analyze-cache* (make-hash))))
 
 (define (localize-error prog repr)
   (define varmap (map cons (program-variables prog)
@@ -82,6 +81,7 @@
          (unless (andmap (curry = 1) err)
            (sow (cons err (reverse loc))))
          (match expr
+           [(? number?) (void)]
            [(? constant?) (void)]
            [(? variable?) (void)]
            [(list 'if cond ift iff)

src/core/matcher.rkt

@@ -30,6 +30,8 @@
   (define (fail . irr) #f)
 
   (match pattern
+   [(? number?)
+    (and (equal? pattern expr) '())]
    [(? constant?)
     (and (equal? pattern expr) '())]
    [(? variable?)
@@ -45,6 +47,7 @@
 (define (pattern-substitute pattern bindings)
   ; pattern binding -> expr
   (match pattern
+   [(? number?) pattern]
    [(? constant?) pattern]
    [(? variable?)
     (dict-ref bindings pattern)]
@@ -120,6 +123,9 @@
       (match pattern
         [(? variable?)
          (sow (cons '() (list (cons pattern expr))))]
+        [(? number?)
+         (when (equal? expr pattern)
+           (sow (cons '() '())))]
         [(? constant?)
          (when (equal? expr pattern)
            (sow (cons '() '())))]

src/core/reduce.rkt

@@ -19,6 +19,7 @@
 (define (simplify expr*)
   (define expr ((get-evaluator) expr*))
   (match expr
+    [(? number?) expr]
     [(? constant?) expr]
     [(? variable?) expr]
     [`(λ ,vars ,body)
@@ -47,6 +48,7 @@
 
 (define (simplify-node expr)
   (match expr
+    [(? number?) expr]
     [(? constant?) expr]
     [(? variable?) expr]
     [(or `(+ ,_ ...) `(- ,_ ...) `(neg ,_))

src/core/simplify.rkt

@@ -185,12 +185,9 @@
 (define (munge expr)
   ;; Despite the name, `expr` might be an expression OR a pattern
   (match expr
-    [(? constant?)
-     (if (symbol? expr)
-         (list expr)
-         expr)]
-    [(? variable?)
-     expr]
+    [(? number?) expr]
+    [(? constant?) (list expr)]
+    [(? variable?) expr]
     [(list head subs ...)
      (cons head (map munge subs))]))
 

src/core/taylor.rkt

@@ -93,9 +93,8 @@
 
 (register-reset
  (λ ()
-  (hash-clear! n-sum-to-cache)
-  (hash-clear! logcache)
-  (hash-set! logcache 1 '((1 -1 1)))))
+  (set! n-sum-to-cache (make-hash))
+  (set! logcache (make-hash '((1 . ((1 -1 1))))))))
 
 (define (taylor var expr*)
   "Return a pair (e, n), such that expr ~= e var^n"
@@ -106,6 +105,8 @@
   (match expr
     [(? (curry equal? var))
      (taylor-exact 0 1)]
+    [(? number?)
+     (taylor-exact expr)]
     [(? constant?)
      (taylor-exact expr)]
     [(? variable?)

src/debug.rkt

@@ -29,7 +29,7 @@
       (= val1 val2)
       (equal? val1 val2)))
 
-(define *cur-debug-levels* (make-hash))
+(define *cur-debug-levels* (make-hasheq))
 ;; To understand this it might be useful to understand the system.
 ;; The current level of any debug flag is fluid, within a range.
 ;; It's "setting" determines the range, or a fixed value,

src/errors.rkt

@@ -81,5 +81,5 @@
 
 (register-reset
  (λ ()
-   (set-clear! warnings-seen)
+   (set! warnings-seen (mutable-set))
    (set! warning-log '())))

src/function-definitions.rkt

@@ -1,6 +1,6 @@
 #lang racket
 
-(require "config.rkt" "syntax/rules.rkt" "core/matcher.rkt" "programs.rkt" "interface.rkt" "syntax/sugar.rkt")
+(require "config.rkt" "syntax/rules.rkt" "core/matcher.rkt""programs.rkt" "interface.rkt" "syntax/sugar.rkt")
 (provide get-expander get-evaluator)
 
 (define (evaluation-rule? rule)
@@ -13,6 +13,7 @@
 
 (define (all-ops expr good?)
   (match expr
+    [(? number?) #t]
     [(? constant?) #t]
     [(? variable?) #t]
     [(list f args ...)
@@ -21,6 +22,11 @@
 (define expanders (make-hash))
 (define evaluators (make-hash))
 
+(register-reset
+ (λ ()
+  (set! expanders (make-hash))
+  (set! evaluators (make-hash))))
+
 (define (make-expander primitives)
   (define known-functions (make-hash))
   (for ([op primitives])