---

yaml
---
r: 271
b: refs/heads/master
c: d2b845d
h: refs/heads/master
i:
  269: eab4bbc
  267: 1ea7f18
  263: 9745e2a
  255: 37303de
v: v3

Author: froystig

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c218d06601a205dffbadca98e1ff953740efa1ba
+refs/heads/master: d2b845d29ca9f36f21967ad1b4829b84ef4aa808

trunk/.gitignore

@@ -24,7 +24,6 @@
 *.toc
 *.tp
 *.vr
-*.swp
 .hg/
 .hgignore
 lexer.ml

trunk/AUTHORS.txt

@@ -4,7 +4,6 @@ Graydon Hoare <[email protected]>
 
 Other authors:
 
-Adam Bozanich <[email protected]>
 Andreas Gal <[email protected]>
 Brendan Eich <[email protected]>
 Chris Double <[email protected]>

trunk/src/boot/be/abi.ml

@@ -49,6 +49,10 @@ let binding_size = 2;;
 let binding_field_item = 0;;
 let binding_field_binding = 1;;
 
+let obj_elt_rc = 0;;
+let obj_elt_tydesc = 1;;
+let obj_elt_fields = 2;;
+
 let general_code_alignment = 16;;
 
 let tydesc_field_first_param = 0;;

trunk/src/boot/fe/item.ml

@@ -775,6 +775,7 @@ and parse_type_item
   let item = Ast.MOD_ITEM_type (effect, ty) in
     (ident, span ps apos bpos (decl params item))
 
+
 and parse_mod_item (ps:pstate) : (Ast.ident * Ast.mod_item) =
   let apos = lexpos ps in
   let parse_lib_name ident =
@@ -848,35 +849,72 @@ and parse_mod_item (ps:pstate) : (Ast.ident * Ast.mod_item) =
                 note_required_mod ps {lo=apos; hi=bpos} conv rlib item;
                 (ident, item)
           end
+
+      | USE ->
+          begin
+            bump ps;
+            let ident = ctxt "use mod: ident" Pexp.parse_ident ps in
+            let meta =
+              ctxt "use mod: meta" parse_optional_meta_pat ps ident
+            in
+            let bpos = lexpos ps in
+            let id = (span ps apos bpos ()).id in
+            let (path, items) =
+              ps.pstate_get_mod meta id ps.pstate_node_id ps.pstate_opaque_id
+            in
+            let bpos = lexpos ps in
+              expect ps SEMI;
+              let rlib =
+                REQUIRED_LIB_rust { required_libname = path;
+                                    required_prefix = ps.pstate_depth }
+              in
+                iflog ps
+                  begin
+                    fun _ ->
+                      log ps "extracted mod from %s (binding to %s)"
+                        path ident;
+                      log ps "%a" Ast.sprintf_mod_items items;
+                  end;
+                let item = decl [||] (Ast.MOD_ITEM_mod (empty_view, items)) in
+                let item = span ps apos bpos item in
+                  note_required_mod ps {lo=apos; hi=bpos} CONV_rust rlib item;
+                  (ident, item)
+          end
+
+
+
       | _ -> raise (unexpected ps)
 
-and parse_mod_items_header_from_signature (ps:pstate) : Ast.mod_view =
-  let exports = Hashtbl.create 0 in
-    while (peek ps = EXPORT)
-    do
-      bump ps;
-      parse_export ps exports;
-      expect ps SEMI;
-    done;
-    if (Hashtbl.length exports) = 0
-    then htab_put exports Ast.EXPORT_all_decls ();
-    {empty_view with Ast.view_exports = exports}
 
 and parse_mod_items_from_signature
     (ps:pstate)
     : (Ast.mod_view * Ast.mod_items) =
-  expect ps LBRACE;
-  let view  = parse_mod_items_header_from_signature ps in
-  let items = Hashtbl.create 0 in
+  let exports = Hashtbl.create 0 in
+  let mis = Hashtbl.create 0 in
+  let in_view = ref true in
+    expect ps LBRACE;
     while not (peek ps = RBRACE)
     do
-      let (ident,item) = ctxt "mod items from sig: mod item"
-              parse_mod_item_from_signature ps
-      in
-        htab_put items ident item;
+      if !in_view
+      then
+        match peek ps with
+            EXPORT ->
+              bump ps;
+              parse_export ps exports;
+              expect ps SEMI;
+          | _ ->
+              in_view := false
+      else
+        let (ident, mti) = ctxt "mod items from sig: mod item"
+          parse_mod_item_from_signature ps
+        in
+          Hashtbl.add mis ident mti;
     done;
+    if (Hashtbl.length exports) = 0
+    then Hashtbl.add exports Ast.EXPORT_all_decls ();
     expect ps RBRACE;
-    (view,items)
+    ({empty_view with Ast.view_exports = exports}, mis)
+
 
 and parse_mod_item_from_signature (ps:pstate)
     : (Ast.ident * Ast.mod_item) =
@@ -994,6 +1032,7 @@ and expand_tags_to_stmts
               (Ast.DECL_mod_item (ident, tag_item))))
       id_items
 
+
 and expand_tags_to_items
     (ps:pstate)
     (item:Ast.mod_item)
@@ -1004,6 +1043,7 @@ and expand_tags_to_items
       (fun (ident, item) -> htab_put items ident item)
       id_items
 
+
 and note_required_mod
     (ps:pstate)
     (sp:span)
@@ -1083,89 +1123,48 @@ and parse_export
   in
     Hashtbl.add exports e ()
 
-and parse_use
-    (ps:pstate)
-    : (Ast.ident * Ast.mod_item) = 
-  bump ps;
-  let ident = ctxt "use mod: ident" Pexp.parse_ident ps in
-  let meta =
-    ctxt "use mod: meta" parse_optional_meta_pat ps ident
-  in
-  let apos = lexpos ps in
-  let bpos = lexpos ps in
-  let id = (span ps apos bpos ()).id in
-  let (path, items) =
-    ps.pstate_get_mod meta id ps.pstate_node_id ps.pstate_opaque_id
-  in
-  let bpos = lexpos ps in
-    expect ps SEMI;
-    let rlib =
-      REQUIRED_LIB_rust { required_libname = path;
-                          required_prefix = ps.pstate_depth }
-    in
-      iflog ps
-        begin
-          fun _ ->
-            log ps "extracted mod from %s (binding to %s)"
-              path ident;
-            log ps "%a" Ast.sprintf_mod_items items;
-        end;
-      let item = decl [||] (Ast.MOD_ITEM_mod (empty_view, items)) in
-      let item = span ps apos bpos item in
-        note_required_mod ps {lo=apos; hi=bpos} CONV_rust rlib item;
-        (ident, item)
-
-and parse_item_decl ps items fn =
-  let (ident, item) = fn ps in
-    htab_put items ident item;
-    expand_tags_to_items ps item items
-
-and parse_mod_header (ps:pstate)
-                     : (Ast.mod_view * Ast.mod_items) =
-  let imports = Hashtbl.create 0 in
-  let exports = Hashtbl.create 0 in
-  let items   = Hashtbl.create 4 in
-  let rec loop () =
-    match peek ps with
-        IMPORT ->
-          bump ps;
-          parse_import ps imports;
-          expect ps SEMI;
-          loop ()
-      | EXPORT ->
-          bump ps;
-          parse_export ps exports;
-          expect ps SEMI;
-          loop ()
-      | USE ->
-          parse_item_decl ps items parse_use;
-          loop ()
-      | _ -> ()
-  in
-    loop ();
-    if (Hashtbl.length exports) = 0
-    then Hashtbl.add exports Ast.EXPORT_all_decls ();
-    let view = { Ast.view_imports = imports;
-                 Ast.view_exports = exports }
-    in
-      (view, items)
 
 and parse_mod_items
     (ps:pstate)
     (terminal:token)
     : (Ast.mod_view * Ast.mod_items) =
   ps.pstate_depth <- ps.pstate_depth + 1;
-  let (view, items) = parse_mod_header ps in
+  let imports = Hashtbl.create 0 in
+  let exports = Hashtbl.create 0 in
+  let in_view = ref true in
+  let items = Hashtbl.create 4 in
     while (not (peek ps = terminal))
     do
-      parse_item_decl ps items parse_mod_item;
+      if !in_view
+      then
+        match peek ps with
+            IMPORT ->
+              bump ps;
+              parse_import ps imports;
+              expect ps SEMI;
+          | EXPORT ->
+              bump ps;
+              parse_export ps exports;
+              expect ps SEMI;
+          | _ ->
+              in_view := false
+      else
+        let (ident, item) = parse_mod_item ps in
+          htab_put items ident item;
+          expand_tags_to_items ps item items;
     done;
+    if (Hashtbl.length exports) = 0
+    then Hashtbl.add exports Ast.EXPORT_all_decls ();
     expect ps terminal;
     ps.pstate_depth <- ps.pstate_depth - 1;
-    (view, items)
+    let view = { Ast.view_imports = imports;
+                 Ast.view_exports = exports }
+    in
+      (view, items)
 ;;
 
 
+
 (*
  * Local Variables:
  * fill-column: 78;

trunk/src/boot/me/trans.ml

@@ -521,7 +521,7 @@ let trans_visitor
       then
         begin
           let obj = get_obj_for_current_frame() in
-          let tydesc = get_element_ptr obj 1 in
+          let tydesc = get_element_ptr obj Abi.obj_elt_tydesc in
           let ty_params_ty = Ast.TY_tup (make_tydesc_tys n_ty_params) in
           let ty_params_rty = referent_type abi ty_params_ty in
           let ty_params =
@@ -2473,8 +2473,8 @@ let trans_visitor
             let null_jmp = null_check binding in
             let rc_jmp = drop_refcount_and_cmp binding in
             let obj = deref binding in
-            let tydesc = get_element_ptr obj 1 in
-            let body = get_element_ptr obj 2 in
+            let tydesc = get_element_ptr obj Abi.obj_elt_tydesc in
+            let body = get_element_ptr obj Abi.obj_elt_fields in
             let ty_params = get_tydesc_params ty_params tydesc in
             let dtor =
               get_element_ptr (deref tydesc) Abi.tydesc_field_obj_drop_glue