From 0d222090287314e99e8ceaa7e1ba2b8c023bbe56 Mon Sep 17 00:00:00 2001 From: phink Date: Mon, 17 Dec 2018 12:15:49 +0100 Subject: [PATCH] Micheline: fix forgotten annotation --- src/bin_client/test/test_contracts_macros.sh | 4 ++-- src/lib_micheline/micheline_parser.ml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/bin_client/test/test_contracts_macros.sh b/src/bin_client/test/test_contracts_macros.sh index c0be67801..b24073612 100644 --- a/src/bin_client/test/test_contracts_macros.sh +++ b/src/bin_client/test/test_contracts_macros.sh @@ -152,9 +152,9 @@ assert_fails $client transfer 1 from bootstrap1 to big_map_mem -arg '(Pair 3 Fal bake_after $client transfer 1 from bootstrap1 to big_map_mem -arg '(Pair 4 False)' --burn-cap 10 assert_fails $client transfer 1 from bootstrap1 to big_map_mem -arg '(Pair 4 True)' --burn-cap 10 assert_fails $client typecheck data '3' against type \ - '(int @aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)' + '(int :aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)' $client typecheck data '3' against type \ - '(int @aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)' + '(int :aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)' init_with_transfer $contract_macros_dir/big_map_get_add.tz $key1\ '(Pair { Elt 0 1 ; Elt 1 2 ; Elt 2 3 } Unit)' \ diff --git a/src/lib_micheline/micheline_parser.ml b/src/lib_micheline/micheline_parser.ml index eee137851..a52aeeb4e 100644 --- a/src/lib_micheline/micheline_parser.ml +++ b/src/lib_micheline/micheline_parser.ml @@ -2,6 +2,7 @@ (* *) (* Open Source License *) (* Copyright (c) 2018 Dynamic Ledger Solutions, Inc. *) +(* Copyright (c) 2018 Nomadic Labs. *) (* *) (* Permission is hereby granted, free of charge, to any person obtaining a *) (* copy of this software and associated documentation files (the "Software"),*) @@ -680,9 +681,9 @@ and do_check ?(toplevel = false) errors = function let parse_expression ?check tokens = let result = match tokens with - | ({ token = Open_paren } as token) :: { token = Ident name } :: { token = Annot _ } :: rest -> + | ({ token = Open_paren } as token) :: { token = Ident name } :: { token = Annot annot } :: rest -> let annots, rest = annots rest in - let mode = Wrapped (token, name, [], annots) in + let mode = Wrapped (token, name, [], annot :: annots) in parse ?check [] rest [ mode ; Expression None ] | ({ token = Open_paren } as token) :: { token = Ident name } :: rest -> let mode = Wrapped (token, name, [], []) in