Skip to content

Commit

Permalink
Fix format/style nits
Browse files Browse the repository at this point in the history
  • Loading branch information
dschuff committed Nov 4, 2015
1 parent 2a78fec commit d41552b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions ml-proto/host/lexer.mll
Original file line number Diff line number Diff line change
Expand Up @@ -231,15 +231,16 @@ rule token = parse
{ CONVERT (floatop t Float32Op.ConvertSInt64 Float64Op.ConvertSInt64) }
| (fxx as t)".convert_u/i64"
{ CONVERT (floatop t Float32Op.ConvertUInt64 Float64Op.ConvertUInt64) }
| (ixx as t)".select" { SELECT ( intop t Int32Op.Select Int64Op.Select) }
| (fxx as t)".select" { SELECT ( floatop t Float32Op.Select Float64Op.Select) }
| "f64.promote/f32" { CONVERT (Values.Float64 Float64Op.PromoteFloat32) }
| "f32.demote/f64" { CONVERT (Values.Float32 Float32Op.DemoteFloat64) }
| "f32.reinterpret/i32" { CONVERT (Values.Float32 Float32Op.ReinterpretInt) }
| "f64.reinterpret/i64" { CONVERT (Values.Float64 Float64Op.ReinterpretInt) }
| "i32.reinterpret/f32" { CONVERT (Values.Int32 Int32Op.ReinterpretFloat) }
| "i64.reinterpret/f64" { CONVERT (Values.Int64 Int64Op.ReinterpretFloat) }

| (ixx as t)".select" { SELECT ( intop t Int32Op.Select Int64Op.Select) }
| (fxx as t)".select" { SELECT ( floatop t Float32Op.Select Float64Op.Select) }

| "page_size" { PAGE_SIZE }
| "memory_size" { MEMORY_SIZE }
| "grow_memory" { GROW_MEMORY }
Expand Down
2 changes: 1 addition & 1 deletion ml-proto/spec/check.ml
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ let rec check_expr c et e =
let t = type_selectop selectop in
check_expr c (Some Int32Type) e1;
check_expr c (Some t) e2;
check_expr c (Some t) e3;
check_expr c (Some t) e3

| Host (hostop, es) ->
let ({ins; out}, hasmem) = type_hostop hostop in
Expand Down
2 changes: 1 addition & 1 deletion ml-proto/spec/sugar.ml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ let convert (cvt, e) =
Convert (cvt, e)

let select (selectop, cond, e1, e2) =
Select(selectop, cond, e1, e2)
Select (selectop, cond, e1, e2)

let host (hostop, es) =
Host (hostop, es)
Expand Down

0 comments on commit d41552b

Please sign in to comment.