Merge pull request #168 from dzoep/fix-emit-local-step

Remove conflicting module with macro-debugger/emit, fix dynamic-requi…
drym-org · Mar 30, 2024 · 798d12f · 798d12f · github-actions · Mar 30, 2024
2 parents 05454b0 + 5769e83
commit 798d12f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 24 deletions.
diff --git a/qi-lib/flow/core/compiler.rkt b/qi-lib/flow/core/compiler.rkt
@@ -9,7 +9,6 @@
                      "syntax.rkt"
                      "../aux-syntax.rkt"
                      "strategy.rkt"
-                     "debug.rkt"
                      "private/form-property.rkt")
          "impl.rkt"
          "passes.rkt"

diff --git a/qi-lib/flow/core/debug.rkt b/qi-lib/flow/core/debug.rkt
diff --git a/qi-lib/flow/core/passes.rkt b/qi-lib/flow/core/passes.rkt
@@ -1,14 +1,20 @@
 #lang racket/base
 
 (require (for-syntax racket/base
-                     (for-syntax racket/base racket/syntax)
-                     macro-debugger/emit))
+                     (for-syntax racket/base racket/syntax)))
 
 (provide (for-syntax define-and-register-pass
                      run-passes))
 
 (begin-for-syntax
 
+  (define my-emit-local-step
+    (with-handlers ((exn? (lambda (ex)
+                            (make-keyword-procedure
+                             (lambda (kws kw-args . rest)
+                               (void))))))
+      (dynamic-require 'macro-debugger/emit 'emit-local-step)))
+
   ;; Could be a list but for future extensibility a custom struct is
   ;; probably a better idea.
   (struct passdef (name prio parser) #:transparent)
@@ -43,7 +49,7 @@
     (for/fold ([stx stx])
               ([pass (in-list (unbox registered-passes))])
       (define stx1 ((passdef-parser pass) stx))
-      (emit-local-step stx stx1 #:id (passdef-name pass))
+      (my-emit-local-step stx stx1 #:id (passdef-name pass))
       stx1))
 
   )