Commit 0e9b51f7 authored by Stefan Israelsson Tampe's avatar Stefan Israelsson Tampe

fix missing find in guilemod

parent 09dadfeb
......@@ -252,7 +252,7 @@
(define (lookup-warning-type name)
"Return the warning type NAME or `#f' if not found."
((M find) (lambda (wt)
(find (lambda (wt)
(eq? name ((M warning-type-name) wt)))
(M %warning-types)))
......@@ -268,6 +268,14 @@ property alist) using the data in ARGS."
((M format) port "~A: unknown warning type `~A': ~A~%"
((M location-string) location) type args))))
(define (find p l)
(if (pair? l)
(let ((x (car l)))
(if (p x)
x
(find p (cdr l))))
#f))
(cond-expand
(guile-3.0
(define-set-M lookup-warning-type lookup-warning-type)
......@@ -279,13 +287,13 @@ property alist) using the data in ARGS."
;; List of known warning types.
(define-exp-M lookup-warning-type
(lambda (name)
"Return the warning type NAME or `#f' if not found."
((M find)
(lambda (wt)
(eq? name ((M warning-type-name) wt)))
(M %warning-types))))
))
(lambda (name)
"Return the warning type NAME or `#f' if not found."
(find
(lambda (wt)
(eq? name ((M warning-type-name) wt)))
(M %warning-types))))
))
(define pload
(let ((guile-load (@ (guile) primitive-load-path)))
......
  • methuselah-0
    @methuselah-0 started a thread
    Last updated by Stefan Israelsson Tampe
    • Hi! Im not sure if you have easy access to try to compile this repo using guile2.2 or not, so Ill just let you know this commit doesn't solve the make part:

      Makefile:1390: warning: overriding recipe for target 'python' Makefile:771: warning: ignoring old recipe for target 'python' GEN language/python/guilemod.go guile: warning: failed to install locale warning: failed to install locale: Invalid argument ice-9/boot-9.scm:752:25: In procedure dispatch-exception: Syntax error: language/python/guilemod.scm:271:0: cond-expand: unfulfilled cond-expand in form (cond-expand (guile-3.0 (define-set-M lookup-warning-type lookup-warning-type) (define-set-M warning warning) (set! %warning-types w-types)) (guile-2.0 or guile-2.2 (define-M %warning-types w-types) (define-exp-M lookup-warning-type (lambda (name) "Return the warning type NAME or `#f' if not found." ((M find) (lambda (wt) (eq? name ((M warning-type-name) wt))) (M %warning-types)))))) make: *** [Makefile:1385: language/python/guilemod.go] Error 1

    • Yeah, I don't have it atm on my machine.

      Anyhow I reread the specification for cond-expand. locks like I need changing

      guile-2.0 or guile2-2 tio (or guile-2.0 guile 2.2)

      I just Committed that,it would be super if you update and try compile again?

    Please register or sign in to reply
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment