balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Proto: Implement new JSON structure for script expressions.

Browse Source
This commit is contained in:
Benjamin Canou 2016-09-09 17:04:55 +02:00
parent e80ce1e8d5
commit d2d78dc8d6
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/proto/bootstrap/script_repr.ml
View File

@ -43,7 +43,19 @@ let expr_encoding =
let string_encoding = let string_encoding =
obj1 (req "string" string) in obj1 (req "string" string) in
let prim_encoding expr_encoding = let prim_encoding expr_encoding =
obj2 (req "prim" string) (opt "args" @@ list expr_encoding) in let json =
union
[ case string
(function (v, []) -> Some v | _ -> None)
(fun v -> (v, [])) ;
case (assoc (list expr_encoding))
(fun (v, args) -> Some [ (v, args) ])
(function
| [ (v, args) ] -> (v, args)
| _ -> Json.cannot_destruct "invalid script expression") ] in
let binary =
obj2 (req "prim" string) (req "args" (list expr_encoding)) in
splitted ~json ~binary in
let seq_encoding expr_encoding = let seq_encoding expr_encoding =
list expr_encoding in list expr_encoding in
mu "tezosScriptExpression" (fun expr_encoding -> mu "tezosScriptExpression" (fun expr_encoding ->
@ -61,12 +73,9 @@ let expr_encoding =
(fun v -> String (-1, v)) ; (fun v -> String (-1, v)) ;
case ~tag:3 (prim_encoding expr_encoding) case ~tag:3 (prim_encoding expr_encoding)
(function (function
| Prim (_, v, []) -> Some (v, None) | Prim (_, v, args) -> Some (v, args)
| Prim (_, v, args) -> Some (v, Some args)
| _ -> None) | _ -> None)
(function (function (prim, args) -> Prim (-1, prim, args)) ;
| (prim, None) -> Prim (-1, prim, [])
| (prim, Some args) -> Prim (-1, prim, args)) ;
case ~tag:4 (seq_encoding expr_encoding) case ~tag:4 (seq_encoding expr_encoding)
(function Seq (_, v) -> Some v | _ -> None) (function Seq (_, v) -> Some v | _ -> None)
(fun args -> Seq (-1, args)) ]) (fun args -> Seq (-1, args)) ])