From d6481531561f08f45c7215fedce8f05e4445a17e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20Axel=20S=C3=B8gaard?= <jensaxel@soegaard.net>
Date: Wed, 20 Jun 2012 19:32:08 +0200
Subject: [PATCH] Fixed problem with relative paths and #lang bracket

---
 bracket/bracket-lang.rkt |  3 +--
 bracket/bracket.rkt      | 10 +++++-----
 bracket/lang/reader.rkt  | 28 +++++++++++++++++++++-------
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/bracket/bracket-lang.rkt b/bracket/bracket-lang.rkt
index 31e371060..810d0a26a 100644
--- a/bracket/bracket-lang.rkt
+++ b/bracket/bracket-lang.rkt
@@ -4,8 +4,7 @@
 (error-print-source-location #t)
 
 (require (submod "bracket.rkt" symbolic-application)
-         ;(submod "bracket.rkt" bracket)
-         )
+         (submod "bracket.rkt" bracket))
 
 (provide (all-from-out racket))
 (provide (all-defined-out)
diff --git a/bracket/bracket.rkt b/bracket/bracket.rkt
index ac5128bf5..43bc666c6 100644
--- a/bracket/bracket.rkt
+++ b/bracket/bracket.rkt
@@ -785,8 +785,8 @@
     (values (map (curryr operand 0) (operands t=r-List)) 
             (map (curryr operand 1) (operands t=r-List)))))
 
-(module mpl-graphics racket
-  (require "../graphics.rkt")
+(module bracket-graphics racket
+  (require "../graphics/graphics.rkt")
   
   (define-syntax (declare/provide-vars stx)
     (syntax-case stx ()
@@ -811,7 +811,7 @@
            (submod ".." expression)
            (submod ".." undefined)
            (submod ".." equation-expression)
-           (submod ".." mpl-graphics))
+           (submod ".." bracket-graphics))
   (provide ; (all-from-out (submod ".." symbolic-application))
            (rename-out [free-of Free-of]
                        [base Base]
@@ -820,7 +820,7 @@
                        [exponent Exponent]
                        [before? Before?]
                        [kind Kind])
-           (all-from-out (submod ".." mpl-graphics))
+           (all-from-out (submod ".." bracket-graphics))
            Operand
            Operands
            Hold
@@ -1179,7 +1179,7 @@
            `(Range ,imin ,imax ,di))]
       [args `(Range . ,args)]))
   
-  (require "../adaptive-plotting.rkt")
+  (require "../plotting/adaptive-plotting.rkt")
   
   (define-match-expander List: 
     (λ (stx)
diff --git a/bracket/lang/reader.rkt b/bracket/lang/reader.rkt
index 77cf9e388..924955071 100644
--- a/bracket/lang/reader.rkt
+++ b/bracket/lang/reader.rkt
@@ -15,16 +15,30 @@
       eof
       (with-syntax ([body (parse-expression 
                            src
-                           #'from-my-read-syntax in)])
+                           #'from-my-read-syntax in)]
+                    [bracket-lang
+                     (let ()
+                       (define-values (base file _)
+                         (split-path
+                          (resolved-module-path-name
+                           (module-path-index-resolve
+                            (syntax-source-module #'here)))))
+                       (build-path base "../bracket-lang.rkt"))]
+                    [bracket.rkt
+                     (let ()
+                       (define-values (base file _)
+                         (split-path
+                          (resolved-module-path-name
+                           (module-path-index-resolve
+                            (syntax-source-module #'here)))))
+                       (build-path base "../bracket.rkt"))])
         (syntax-property 
          (strip-context   
-          #'(module anything "../main.rkt"
+          #'(module anything bracket-lang
+              (require (submod bracket.rkt bracket)
+                       (submod bracket.rkt symbolic-application))
               (define-syntax (#%infix stx)
-                ;(displayln (list 'my-read-syntax: stx))
-                (syntax-case stx ()
-                  [(_ expr) #'expr]))              
-              (require (submod "bracket.rkt" bracket)
-                       (submod "bracket.rkt" symbolic-application))
+                (syntax-case stx () [(_ expr) #'expr]))              
               ; This lists the operators used by the parser.
               (define expt Power)
               (define + Plus)