From ea4af374f9e5fc8fbf9ebd436e213b3b03ca7055 Mon Sep 17 00:00:00 2001 From: Christian Rinderknecht Date: Fri, 22 Mar 2019 14:11:32 +0100 Subject: [PATCH] Removed braces from the lexer and parser. --- Lexer.mll | 3 +-- ParToken.mly | 2 -- Parser.mly | 10 ---------- Tests/crowdfunding.ligo | 4 ++-- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/Lexer.mll b/Lexer.mll index 547599f3b..125dff093 100644 --- a/Lexer.mll +++ b/Lexer.mll @@ -459,8 +459,7 @@ let byte_seq = byte | byte (byte | '_')* byte let bytes = "0x" (byte_seq? as seq) let esc = "\\n" | "\\\"" | "\\\\" | "\\b" | "\\r" | "\\t" | "\\x" byte -let symbol = ';' | ',' - | '(' | ')' | '{' | '}' | '[' | ']' +let symbol = ';' | ',' | '(' | ')'| '[' | ']' | '#' | '|' | "->" | ":=" | '=' | ':' | '<' | "<=" | '>' | ">=" | "=/=" | '+' | '-' | '*' | '.' | '_' | '^' diff --git a/ParToken.mly b/ParToken.mly index 1487ff491..cfa0b913b 100644 --- a/ParToken.mly +++ b/ParToken.mly @@ -17,8 +17,6 @@ %token COMMA (* "," *) %token LPAR (* "(" *) %token RPAR (* ")" *) -%token LBRACE (* "{" *) -%token RBRACE (* "}" *) %token LBRACKET (* "[" *) %token RBRACKET (* "]" *) %token CONS (* "#" *) diff --git a/Parser.mly b/Parser.mly index 3d3cbddfe..9889ddf9c 100644 --- a/Parser.mly +++ b/Parser.mly @@ -61,16 +61,6 @@ par(X): in {region; value} } -braces(X): - LBRACE X RBRACE { - let region = cover $1 $3 - and value = { - lbrace = $1; - inside = $2; - rbrace = $3} - in {region; value} - } - brackets(X): LBRACKET X RBRACKET { let region = cover $1 $3 diff --git a/Tests/crowdfunding.ligo b/Tests/crowdfunding.ligo index 6c4272407..cd1f76f3b 100644 --- a/Tests/crowdfunding.ligo +++ b/Tests/crowdfunding.ligo @@ -13,7 +13,7 @@ entrypoint contribute (storage store : store; var operations : list (operation) := [] begin if now > store.deadline then - fail "Deadline passed"; + fail "Deadline passed"; else case store.backers[sender] of None -> store.backers[sender] := Some (amount) @@ -56,7 +56,7 @@ entrypoint claim (storage store : store; const sender : address) else begin operations := [Transfer (sender, amount)]; - remove sender from map store.backers; + remove sender from map store.backers end end end with (store, operations)