~ chicken-core (chicken-5) f43cba489635a193698211bd1af53218c4798cde

commit f43cba489635a193698211bd1af53218c4798cde
Author:     Evan Hanson <evhan@foldling.org>
AuthorDate: Tue May 24 10:28:28 2016 +1200
Commit:     Evan Hanson <evhan@foldling.org>
CommitDate: Tue May 24 10:28:28 2016 +1200

    Fix misnamed "define-definition" globals
    
    These were partially renamed in ba7cc8d, but a few instances of the
    "##sys#" versions remained.

diff --git a/chicken-syntax.scm b/chicken-syntax.scm
index b7ccacb8..1621120c 100644
--- a/chicken-syntax.scm
+++ b/chicken-syntax.scm
@@ -342,7 +342,7 @@
     (##sys#check-syntax 'set!-values form '(_ lambda-list _))
     (##sys#expand-multiple-values-assignment (cadr form) (caddr form)))))
 
-(set! ##sys#define-values-definition
+(set! chicken.expand#define-values-definition
   (##sys#extend-macro-environment
    'define-values '()
    (##sys#er-transformer
diff --git a/expand.scm b/expand.scm
index 88a0798f..52ed7198 100644
--- a/expand.scm
+++ b/expand.scm
@@ -467,9 +467,9 @@
 ;
 ; This code is disgustingly complex.
 
-(define ##sys#define-definition)
-(define ##sys#define-syntax-definition)
-(define ##sys#define-values-definition)
+(define chicken.expand#define-definition)
+(define chicken.expand#define-syntax-definition)
+(define chicken.expand#define-values-definition)
 
 (define ##sys#canonicalize-body
   (lambda (body #!optional (se (##sys#current-environment)) cs?)
@@ -477,9 +477,9 @@
       (let ((f (lookup id se)))
 	(or (eq? s f)
 	    (case s
-	      ((define) (if f (eq? f ##sys#define-definition) (eq? s id)))
-	      ((define-syntax) (if f (eq? f ##sys#define-syntax-definition) (eq? s id)))
-	      ((define-values) (if f (eq? f ##sys#define-values-definition) (eq? s id)))
+	      ((define) (if f (eq? f chicken.expand#define-definition) (eq? s id)))
+	      ((define-syntax) (if f (eq? f chicken.expand#define-syntax-definition) (eq? s id)))
+	      ((define-values) (if f (eq? f chicken.expand#define-values-definition) (eq? s id)))
 	      (else (eq? s id))))))
     (define (fini vars vals mvars body)
       (if (and (null? vars) (null? mvars))