Merge pull request #170 from takikawa/spec-tests-event-to-tag

Rename events to tags in spec interpreter and core tests

Author: takikawa

interpreter/binary/decode.ml

@@ -192,7 +192,7 @@ let global_type s =
   let mut = mutability s in
   GlobalType (t, mut)
 
-let event_type s =
+let tag_type s =
   zero s; at var s
 
 
@@ -564,7 +564,7 @@ let id s =
     | 10 -> `CodeSection
     | 11 -> `DataSection
     | 12 -> `DataCountSection
-    | 13 -> `EventSection
+    | 13 -> `TagSection
     | _ -> error s (pos s) "malformed section id"
     ) bo
 
@@ -593,7 +593,7 @@ let import_desc s =
   | 0x01 -> TableImport (table_type s)
   | 0x02 -> MemoryImport (memory_type s)
   | 0x03 -> GlobalImport (global_type s)
-  | 0x04 -> EventImport (event_type s)
+  | 0x04 -> TagImport (tag_type s)
   | _ -> error s (pos s - 1) "malformed import kind"
 
 let import s =
@@ -631,14 +631,14 @@ let memory s =
 let memory_section s =
   section `MemorySection (vec (at memory)) [] s
 
-(* Event section *)
+(* Tag section *)
 
-let event s =
-  let etype = event_type s in
-  {etype}
+let tag s =
+  let tgtype = tag_type s in
+  {tgtype}
 
-let event_section s =
-  section `EventSection (vec (at event)) [] s
+let tag_section s =
+  section `TagSection (vec (at tag)) [] s
 
 (* Global section *)
 
@@ -659,7 +659,7 @@ let export_desc s =
   | 0x01 -> TableExport (at var s)
   | 0x02 -> MemoryExport (at var s)
   | 0x03 -> GlobalExport (at var s)
-  | 0x04 -> EventExport (at var s)
+  | 0x04 -> TagExport (at var s)
   | _ -> error s (pos s - 1) "malformed export kind"
 
 let export s =
@@ -835,7 +835,7 @@ let module_ s =
   iterate custom_section s;
   let memories = memory_section s in
   iterate custom_section s;
-  let events = event_section s in
+  let tags = tag_section s in
   iterate custom_section s;
   let globals = global_section s in
   iterate custom_section s;
@@ -862,7 +862,7 @@ let module_ s =
   let funcs =
     List.map2 Source.(fun t f -> {f.it with ftype = t} @@ f.at)
       func_types func_bodies
-  in {types; tables; memories; events; globals; funcs; imports; exports; elems;
+  in {types; tables; memories; tags; globals; funcs; imports; exports; elems;
       datas; start}
 
 

interpreter/binary/encode.ml

@@ -121,7 +121,7 @@ let encode m =
     let memory_type = function
       | MemoryType lim -> limits vu32 lim
 
-    let event_type x = vu32 0x00l; var x
+    let tag_type x = vu32 0x00l; var x
 
     let mutability = function
       | Immutable -> u8 0
@@ -443,7 +443,7 @@ let encode m =
       | TableImport t -> u8 0x01; table_type t
       | MemoryImport t -> u8 0x02; memory_type t
       | GlobalImport t -> u8 0x03; global_type t
-      | EventImport t -> u8 0x04; event_type t
+      | TagImport t -> u8 0x04; tag_type t
 
     let import im =
       let {module_name; item_name; idesc} = im.it in
@@ -474,11 +474,11 @@ let encode m =
     let memory_section mems =
       section 5 (vec memory) mems (mems <> [])
 
-    (* Event section *)
-    let event (e : event) = u8 0x00; var e.it.etype
+    (* Tag section *)
+    let tag (t : tag) = u8 0x00; var t.it.tgtype
 
-    let event_section es =
-      section 13 (vec event) es (es <> [])
+    let tag_section ts =
+      section 13 (vec tag) ts (ts <> [])
 
     (* Global section *)
     let global g =
@@ -495,7 +495,7 @@ let encode m =
       | TableExport x -> u8 1; var x
       | MemoryExport x -> u8 2; var x
       | GlobalExport x -> u8 3; var x
-      | EventExport x -> u8 4; var x
+      | TagExport x -> u8 4; var x
 
     let export ex =
       let {name = n; edesc} = ex.it in
@@ -604,7 +604,7 @@ let encode m =
       func_section m.it.funcs;
       table_section m.it.tables;
       memory_section m.it.memories;
-      event_section m.it.events;
+      tag_section m.it.tags;
       global_section m.it.globals;
       export_section m.it.exports;
       start_section m.it.start;

interpreter/exec/eval.ml

@@ -85,7 +85,7 @@ let type_ (inst : module_inst) x = lookup "type" inst.types x
 let func (inst : module_inst) x = lookup "function" inst.funcs x
 let table (inst : module_inst) x = lookup "table" inst.tables x
 let memory (inst : module_inst) x = lookup "memory" inst.memories x
-let event (inst : module_inst) x = lookup "event" inst.events x
+let tag (inst : module_inst) x = lookup "tag" inst.tags x
 let global (inst : module_inst) x = lookup "global" inst.globals x
 let elem (inst : module_inst) x = lookup "element segment" inst.elems x
 let data (inst : module_inst) x = lookup "data segment" inst.datas x
@@ -581,8 +581,8 @@ let create_memory (inst : module_inst) (mem : memory) : memory_inst =
   let {mtype} = mem.it in
   Memory.alloc mtype
 
-let create_event (inst : module_inst) (e : event) : event_inst =
-  Event.alloc (type_ inst e.it.etype)
+let create_tag (inst : module_inst) (t : tag) : tag_inst =
+  Tag.alloc (type_ inst t.it.tgtype)
 
 let create_global (inst : module_inst) (glob : global) : global_inst =
   let {gtype; ginit} = glob.it in
@@ -597,7 +597,7 @@ let create_export (inst : module_inst) (ex : export) : export_inst =
     | TableExport x -> ExternTable (table inst x)
     | MemoryExport x -> ExternMemory (memory inst x)
     | GlobalExport x -> ExternGlobal (global inst x)
-    | EventExport x -> ExternEvent (event inst x)
+    | TagExport x -> ExternTag (tag inst x)
   in (name, ext)
 
 let create_elem (inst : module_inst) (seg : elem_segment) : elem_inst =
@@ -617,7 +617,7 @@ let add_import (m : module_) (ext : extern) (im : import) (inst : module_inst)
   | ExternFunc func -> {inst with funcs = func :: inst.funcs}
   | ExternTable tab -> {inst with tables = tab :: inst.tables}
   | ExternMemory mem -> {inst with memories = mem :: inst.memories}
-  | ExternEvent event -> {inst with events = event :: inst.events}
+  | ExternTag tag -> {inst with tags = tag :: inst.tags}
   | ExternGlobal glob -> {inst with globals = glob :: inst.globals}
 
 let init_func (inst : module_inst) (func : func_inst) =
@@ -660,7 +660,7 @@ let run_start start =
 
 let init (m : module_) (exts : extern list) : module_inst =
   let
-    { imports; tables; memories; events; globals; funcs; types;
+    { imports; tables; memories; tags; globals; funcs; types;
       exports; elems; datas; start
     } = m.it
   in
@@ -676,7 +676,7 @@ let init (m : module_) (exts : extern list) : module_inst =
     { inst1 with
       tables = inst1.tables @ List.map (create_table inst1) tables;
       memories = inst1.memories @ List.map (create_memory inst1) memories;
-      events = inst1.events @ List.map (create_event inst1) events;
+      tags = inst1.tags @ List.map (create_tag inst1) tags;
       globals = inst1.globals @ List.map (create_global inst1) globals;
     }
   in

interpreter/runtime/event.ml

@@ -6,7 +6,7 @@ type module_inst =
   funcs : func_inst list;
   tables : table_inst list;
   memories : memory_inst list;
-  events : event_inst list;
+  tags : tag_inst list;
   globals : global_inst list;
   exports : export_inst list;
   elems : elem_inst list;
@@ -16,7 +16,7 @@ type module_inst =
 and func_inst = module_inst ref Func.t
 and table_inst = Table.t
 and memory_inst = Memory.t
-and event_inst = Event.t
+and tag_inst = Tag.t
 and global_inst = Global.t
 and export_inst = Ast.name * extern
 and elem_inst = Values.ref_ list ref
@@ -26,7 +26,7 @@ and extern =
   | ExternFunc of func_inst
   | ExternTable of table_inst
   | ExternMemory of memory_inst
-  | ExternEvent of event_inst
+  | ExternTag of tag_inst
   | ExternGlobal of global_inst
 
 
@@ -50,15 +50,15 @@ let () =
 (* Auxiliary functions *)
 
 let empty_module_inst =
-  { types = []; funcs = []; tables = []; memories = []; events = [];
+  { types = []; funcs = []; tables = []; memories = []; tags = [];
     globals = []; exports = []; elems = []; datas = [] }
 
 let extern_type_of = function
   | ExternFunc func -> ExternFuncType (Func.type_of func)
   | ExternTable tab -> ExternTableType (Table.type_of tab)
   | ExternMemory mem -> ExternMemoryType (Memory.type_of mem)
   | ExternGlobal glob -> ExternGlobalType (Global.type_of glob)
-  | ExternEvent event -> ExternEventType (Event.type_of event)
+  | ExternTag tag -> ExternTagType (Tag.type_of tag)
 
 let export inst name =
   try Some (List.assoc name inst.exports) with Not_found -> None

interpreter/runtime/event.mli

@@ -0,0 +1,10 @@
+open Types
+
+type tag = {ty : func_type}
+type t = tag
+
+let alloc ty =
+   {ty}
+
+let type_of tg =
+  tg.ty

interpreter/runtime/instance.ml

@@ -0,0 +1,7 @@
+open Types
+
+type tag = {ty : func_type}
+type t = tag
+
+val alloc : func_type -> tag
+val type_of : tag -> func_type

interpreter/runtime/tag.ml

@@ -215,7 +215,7 @@ let print_import m im =
     | ExternFuncType t -> "func", string_of_func_type t
     | ExternTableType t -> "table", string_of_table_type t
     | ExternMemoryType t -> "memory", string_of_memory_type t
-    | ExternEventType t -> "event", string_of_func_type t
+    | ExternTagType t -> "tag", string_of_func_type t
     | ExternGlobalType t -> "global", string_of_global_type t
   in
   Printf.printf "  import %s \"%s\" \"%s\" : %s\n"
@@ -229,7 +229,7 @@ let print_export m ex =
     | ExternFuncType t -> "func", string_of_func_type t
     | ExternTableType t -> "table", string_of_table_type t
     | ExternMemoryType t -> "memory", string_of_memory_type t
-    | ExternEventType t -> "event", string_of_func_type t
+    | ExternTagType t -> "tag", string_of_func_type t
     | ExternGlobalType t -> "global", string_of_global_type t
   in
   Printf.printf "  export %s \"%s\" : %s\n"

interpreter/runtime/tag.mli

@@ -157,10 +157,10 @@ and memory' =
   mtype : memory_type;
 }
 
-type event = event' Source.phrase
-and event' =
+type tag = tag' Source.phrase
+and tag' =
 {
-  etype : var;
+  tgtype : var;
 }
 
 
@@ -196,7 +196,7 @@ and export_desc' =
   | TableExport of var
   | MemoryExport of var
   | GlobalExport of var
-  | EventExport of var
+  | TagExport of var
 
 type export = export' Source.phrase
 and export' =
@@ -211,7 +211,7 @@ and import_desc' =
   | TableImport of table_type
   | MemoryImport of memory_type
   | GlobalImport of global_type
-  | EventImport of var
+  | TagImport of var
 
 type import = import' Source.phrase
 and import' =
@@ -228,7 +228,7 @@ and module_' =
   globals : global list;
   tables : table list;
   memories : memory list;
-  events : event list;
+  tags : tag list;
   funcs : func list;
   start : var option;
   elems : elem_segment list;
@@ -246,7 +246,7 @@ let empty_module =
   globals = [];
   tables = [];
   memories = [];
-  events = [];
+  tags = [];
   funcs = [];
   start = None;
   elems = [];
@@ -266,7 +266,7 @@ let import_type (m : module_) (im : import) : extern_type =
   | FuncImport x -> ExternFuncType (func_type_for m x)
   | TableImport t -> ExternTableType t
   | MemoryImport t -> ExternMemoryType t
-  | EventImport x -> ExternEventType (func_type_for m x)
+  | TagImport x -> ExternTagType (func_type_for m x)
   | GlobalImport t -> ExternGlobalType t
 
 let export_type (m : module_) (ex : export) : extern_type =
@@ -287,10 +287,10 @@ let export_type (m : module_) (ex : export) : extern_type =
   | GlobalExport x ->
     let gts = globals its @ List.map (fun g -> g.it.gtype) m.it.globals in
     ExternGlobalType (nth gts x.it)
-  | EventExport x ->
-    let ets =
-      events its @ List.map (fun (e : event) -> func_type_for m e.it.etype) m.it.events
-    in ExternEventType (nth ets x.it)
+  | TagExport x ->
+    let tts =
+      tags its @ List.map (fun t -> func_type_for m t.it.tgtype) m.it.tags
+    in ExternTagType (nth tts x.it)
 
 let string_of_name n =
   let b = Buffer.create 16 in