Merge branch '8-reporting-of-error-messages' into 'dev'
Fixed regression (empty lists in Ligodity) See merge request ligolang/ligo!25
This commit is contained in:
commit
3583d067cc
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@
|
||||
/dune-project
|
||||
*~
|
||||
cache/*
|
||||
Version.ml
|
||||
|
@ -104,7 +104,7 @@ let keywords = Token.[
|
||||
"and", None;
|
||||
"as", None;
|
||||
"asr", None;
|
||||
"assert", None;
|
||||
(* "assert", None;*)
|
||||
"class", None;
|
||||
"constraint", None;
|
||||
"do", None;
|
||||
|
@ -179,11 +179,18 @@ tuple(item):
|
||||
(* Possibly empty semicolon-separated values between brackets *)
|
||||
|
||||
list_of(item):
|
||||
lbracket sepseq(item,semi) rbracket {
|
||||
{opening = LBracket $1;
|
||||
elements = $2;
|
||||
terminator = None;
|
||||
closing = RBracket $3} }
|
||||
lbracket sep_or_term_list(item,semi) rbracket {
|
||||
let elements, terminator = $2 in {
|
||||
opening = LBracket $1;
|
||||
elements = Some elements;
|
||||
terminator;
|
||||
closing = RBracket $3}
|
||||
}
|
||||
| lbracket rbracket {
|
||||
{opening = LBracket $1;
|
||||
elements = None;
|
||||
terminator = None;
|
||||
closing = RBracket $2} }
|
||||
|
||||
(* Main *)
|
||||
|
||||
|
@ -1 +0,0 @@
|
||||
let version = "UNKNOWN"
|
Loading…
Reference in New Issue
Block a user