locations in identifiers

bootstrapworld · Jul 18, 2012 · 1a62d17 · 1a62d17
1 parent 5c56bce
commit 1a62d17
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 24 deletions.
diff --git a/js-runtime/src/bytecode-compiler.ss b/js-runtime/src/bytecode-compiler.ss
@@ -366,11 +366,12 @@
 ;; compile-toplevel: toplevel -> jsexp
 (define (compile-toplevel a-toplevel)
   (match a-toplevel
-    [(struct toplevel (depth pos const? ready?))
+    [(struct toplevel (depth pos const? ready? loc))
      (make-ht 'toplevel `((depth ,(make-int depth))
                           (pos ,(make-int pos))
                           (const? ,(make-lit const?))
-                          (ready? ,(make-lit ready?))))]))
+                          (ready? ,(make-lit ready?))
+			  (loc ,(make-lit loc))))]))
 
 
 ;; compile-application: application -> jsexp

diff --git a/js-runtime/src/bytecode-structs.ss b/js-runtime/src/bytecode-structs.ss
@@ -38,8 +38,8 @@
 (define-form-struct module-variable ([modidx module-path-index?] 
                                      [sym symbol?] 
                                      [pos exact-integer?] 
-                                     [phase (or/c 0 1)])) ; direct access to exported id
-
+                                     [phase (or/c 0 1)] ; direct access to exported id
+				     ))
 ;; Syntax object
 (define-form-struct wrap ())
 (define-form-struct wrapped ([datum any/c] 
@@ -73,7 +73,8 @@
 (define-form-struct (toplevel expr) ([depth exact-nonnegative-integer?] 
                                      [pos exact-nonnegative-integer?] 
                                      [const? boolean?] 
-                                     [ready? boolean?]))  ; access binding via prefix array (which is on stack)
+                                     [ready? boolean?]; access binding via prefix array (which is on stack)
+				     [loc (or/c #f any/c)]))  ;; dyoo: extension: remember the source location
 
 (define-form-struct (seq form) ([forms (listof (or/c form? indirect? any/c))])) ; `begin'
 

diff --git a/js-runtime/src/translate-bytecode-structs.ss b/js-runtime/src/translate-bytecode-structs.ss
@@ -218,7 +218,7 @@
 (define (translate-toplevel a-toplevel)
   (match a-toplevel
     [(struct internal:toplevel (depth pos const? ready?))
-     (make-toplevel depth pos const? ready?)]))
+     (make-toplevel depth pos const? ready? #f)]))
 
 
 (define (translate-at-expression-position x)

diff --git a/servlet-htdocs/collects/bootstrap/autos-teachpack.js b/servlet-htdocs/collects/bootstrap/autos-teachpack.js
diff --git a/servlet-htdocs/collects/bootstrap/bootstrap-gtp-teachpack.js b/servlet-htdocs/collects/bootstrap/bootstrap-gtp-teachpack.js
diff --git a/servlet-htdocs/collects/bootstrap/bootstrap-teachpack.js b/servlet-htdocs/collects/bootstrap/bootstrap-teachpack.js
diff --git a/servlet-htdocs/collects/bootstrap/cage-teachpack.js b/servlet-htdocs/collects/bootstrap/cage-teachpack.js
diff --git a/servlet-htdocs/collects/bootstrap/function-teachpack.js b/servlet-htdocs/collects/bootstrap/function-teachpack.js
diff --git a/servlet-htdocs/collects/bootstrap2011/bootstrap-common.js b/servlet-htdocs/collects/bootstrap2011/bootstrap-common.js
diff --git a/servlet-htdocs/collects/bootstrap2011/bootstrap-teachpack.js b/servlet-htdocs/collects/bootstrap2011/bootstrap-teachpack.js
diff --git a/servlet-htdocs/collects/bootstrap2011/cage-teachpack.js b/servlet-htdocs/collects/bootstrap2011/cage-teachpack.js
diff --git a/servlet-htdocs/collects/bootstrap2011/function-teachpack.js b/servlet-htdocs/collects/bootstrap2011/function-teachpack.js
diff --git a/servlet-htdocs/collects/bootstrap2012/bootstrap-common.js b/servlet-htdocs/collects/bootstrap2012/bootstrap-common.js
diff --git a/servlet-htdocs/collects/bootstrap2012/bootstrap-teachpack.js b/servlet-htdocs/collects/bootstrap2012/bootstrap-teachpack.js
diff --git a/servlet-htdocs/collects/bootstrap2012/bootstrap-tilt-teachpack.js b/servlet-htdocs/collects/bootstrap2012/bootstrap-tilt-teachpack.js
diff --git a/servlet-htdocs/collects/bootstrap2012/cage-teachpack.js b/servlet-htdocs/collects/bootstrap2012/cage-teachpack.js
diff --git a/servlet-htdocs/collects/bootstrap2012/function-teachpack.js b/servlet-htdocs/collects/bootstrap2012/function-teachpack.js
diff --git a/servlet-htdocs/collects/jsworld/google-maps.js b/servlet-htdocs/collects/jsworld/google-maps.js
diff --git a/servlet-htdocs/collects/jsworld/phonegap.js b/servlet-htdocs/collects/jsworld/phonegap.js
diff --git a/src/compiler/mzscheme-vm/mzscheme-vm.ss b/src/compiler/mzscheme-vm/mzscheme-vm.ss
@@ -200,7 +200,7 @@
   ;; FIXME: I should be doing some kind of module resolution here.
   (values (bcode:make-req
            (datum->syntax #f (stx->datum (second (stx-e a-require))))
-           (bcode:make-toplevel 0 0 #f #f))
+           (bcode:make-toplevel 0 0 #f #f #f))
           a-pinfo))
 
 
@@ -384,7 +384,7 @@
                (bcode:make-localref boxed? depth #f #f #f)]
 
               [(struct global-stack-reference (name depth pos))
-               (bcode:make-toplevel depth pos #f #f)]
+               (bcode:make-toplevel depth pos #f #f (loc->vec (stx-loc expr)))]
 
               [(struct unbound-stack-reference (name))
                (error 'compile-identifier-expression