Rename Syntax module to Ast

ml-proto/src/.gitignore

@@ -12,4 +12,4 @@ parser.mli
 *.opt
 *.zip
 _build
-
+wasm

ml-proto/src/Makefile

@@ -5,11 +5,11 @@
 NAME = wasm
 MODULES = \
   flags lib source error \
-  types values memory syntax \
+  types values memory ast \
   check arithmetic eval print script \
   lexer parser \
   main
-NOMLI = flags types values syntax sexpr main
+NOMLI = flags types values ast sexpr main
 PARSERS = parser
 LEXERS = lexer
 LIBRARIES = bigarray

ml-proto/src/arithmetic.ml

@@ -40,7 +40,7 @@ sig
   val float_of_bits : t -> float
 end
 
-module IntOp (IntOpSyntax : module type of Syntax.IntOp ()) (Int : INT) =
+module IntOp (IntOpSyntax : module type of Ast.IntOp ()) (Int : INT) =
 struct
   open IntOpSyntax
 
@@ -122,8 +122,8 @@ struct
     function Int64 i -> i | v -> raise (TypeError (n, v, Int64Type))
 end
 
-module Int32Op = IntOp (Syntax.Int32Op) (Int32X)
-module Int64Op = IntOp (Syntax.Int64Op) (Int64X)
+module Int32Op = IntOp (Ast.Int32Op) (Int32X)
+module Int64Op = IntOp (Ast.Int64Op) (Int64X)
 
 
 (* Float operators *)
@@ -135,7 +135,7 @@ sig
   val to_value : float -> value
 end
 
-module FloatOp (FloatOpSyntax : module type of Syntax.FloatOp ())
+module FloatOp (FloatOpSyntax : module type of Ast.FloatOp ())
   (Float : FLOAT) =
 struct
   open FloatOpSyntax
@@ -202,8 +202,8 @@ struct
     function Float64 z -> z | v -> raise (TypeError (n, v, Float64Type))
 end
 
-module Float32Op = FloatOp (Syntax.Float32Op) (Float32X)
-module Float64Op = FloatOp (Syntax.Float64Op) (Float64X)
+module Float32Op = FloatOp (Ast.Float32Op) (Float32X)
+module Float64Op = FloatOp (Ast.Float64Op) (Float64X)
 
 
 (* Dispatch *)

ml-proto/src/arithmetic.mli

@@ -6,7 +6,7 @@ open Values
 
 exception TypeError of int * value * Types.value_type
 
-val eval_unop : Syntax.unop -> value -> value
-val eval_binop : Syntax.binop -> value -> value -> value
-val eval_relop : Syntax.relop -> value -> value -> bool
-val eval_cvt : Syntax.cvt -> value -> value
+val eval_unop : Ast.unop -> value -> value
+val eval_binop : Ast.binop -> value -> value -> value
+val eval_relop : Ast.relop -> value -> value -> bool
+val eval_cvt : Ast.cvt -> value -> value

ml-proto/src/check.ml

@@ -2,7 +2,7 @@
  * (c) 2015 Andreas Rossberg
  *)
 
-open Syntax
+open Ast
 open Source
 open Types
 

ml-proto/src/check.mli

@@ -2,4 +2,4 @@
  * (c) 2015 Andreas Rossberg
  *)
 
-val check_module : Syntax.modul -> unit (* raise Error *)
+val check_module : Ast.modul -> unit (* raise Error *)

ml-proto/src/eval.ml

@@ -3,7 +3,7 @@
  *)
 
 open Values
-open Syntax
+open Ast
 open Source
 
 let error = Error.error
@@ -12,7 +12,7 @@ let error = Error.error
 (* Module Instances *)
 
 type value = Values.value
-type func = Syntax.func
+type func = Ast.func
 
 type module_instance =
 {
@@ -238,7 +238,7 @@ and eval_func m f vs =
 (* Modules *)
 
 let init m =
-  let {Syntax.funcs; exports; tables; globals; memory = (n, _)} = m.it in
+  let {Ast.funcs; exports; tables; globals; memory = (n, _)} = m.it in
   {
     funcs = funcs;
     exports = List.map (fun x -> List.nth funcs x.it) exports;

ml-proto/src/eval.mli

@@ -5,7 +5,7 @@
 type module_instance
 type value = Values.value
 
-val init : Syntax.modul -> module_instance
+val init : Ast.modul -> module_instance
 val invoke : module_instance -> int -> value list -> value list
   (* raise Error.Error *)
-val eval : module_instance -> Syntax.expr -> value (* raise Error.Error *)
+val eval : module_instance -> Ast.expr -> value (* raise Error.Error *)

ml-proto/src/lexer.mll

@@ -4,7 +4,7 @@
 
 {
 open Parser
-open Syntax
+open Ast
 
 let convert_pos pos =
   { Source.file = pos.Lexing.pos_fname;

ml-proto/src/parser.mly

@@ -4,7 +4,7 @@
 
 %{
 open Source
-open Syntax
+open Ast
 open Script
 
 let position_to_pos position =
@@ -50,12 +50,12 @@ let literal at s t =
 %token<int> VAR
 %token<Types.value_type> TYPE
 %token<Types.value_type> CONST
-%token<Syntax.unop> UNARY
-%token<Syntax.binop> BINARY
-%token<Syntax.relop> COMPARE
-%token<Syntax.cvt> CONVERT
-%token<Syntax.memop> GETMEMORY
-%token<Syntax.memop> SETMEMORY
+%token<Ast.unop> UNARY
+%token<Ast.binop> BINARY
+%token<Ast.relop> COMPARE
+%token<Ast.cvt> CONVERT
+%token<Ast.memop> GETMEMORY
+%token<Ast.memop> SETMEMORY
 
 %start script
 %type<Script.script> script
@@ -210,4 +210,4 @@ script :
 ;
 
 %%
-
+

ml-proto/src/print.ml

@@ -2,7 +2,7 @@
  * (c) 2015 Andreas Rossberg
  *)
 
-open Syntax
+open Ast
 open Source
 open Printf
 
@@ -12,7 +12,7 @@ open Printf
 open Types
 
 let func_type f =
-  let {Syntax.params; results; _} = f.it in
+  let {Ast.params; results; _} = f.it in
   {ins = List.map Source.it params; outs = List.map Source.it results}
 
 let string_of_table_type = function
@@ -30,7 +30,7 @@ let print_table_sig prefix i t_opt =
   printf "%s %d : %s\n" prefix i (string_of_table_type t_opt)
 
 
-(* Syntax *)
+(* Ast *)
 
 let print_func i f =
   print_func_sig "func" i f

ml-proto/src/print.mli

@@ -2,7 +2,7 @@
  * (c) 2015 Andreas Rossberg
  *)
 
-val print_module : Syntax.modul -> unit
-val print_module_sig : Syntax.modul -> unit
+val print_module : Ast.modul -> unit
+val print_module_sig : Ast.modul -> unit
 val print_values : Values.value list -> unit
 

ml-proto/src/script.ml

@@ -8,8 +8,8 @@ open Source
 
 type command = command' phrase
 and command' =
-  | Define of Syntax.modul
-  | Invoke of int * Syntax.expr list
+  | Define of Ast.modul
+  | Invoke of int * Ast.expr list
 
 type script = command list
 

ml-proto/src/script.mli

@@ -4,8 +4,8 @@
 
 type command = command' Source.phrase
 and command' =
-  | Define of Syntax.modul
-  | Invoke of int * Syntax.expr list
+  | Define of Ast.modul
+  | Invoke of int * Ast.expr list
 
 type script = command list