Merge branch 'gardening/fix-ast' into 'dev'

Change T_operator in the AST and Reorder folder See merge request ligolang/ligo!656
2020-06-03 12:54:24 +00:00 · 2020-06-03 12:54:24 +00:00 · c380729785
commit c380729785
parent b29c667901 8f529a059a
204 changed files with 268 additions and 445 deletions
--- a/src/bin/expect_tests/contract_tests.ml
+++ b/src/bin/expect_tests/contract_tests.ml
@ -1321,7 +1321,7 @@ let%expect_test _ =
 let%expect_test _ =
  run_ligo_bad [ "compile-contract" ; contract "bad_type_operator.ligo" ; "main" ] ;
  [%expect {|
-    ligo: bad type operator (TO_Map (unit,unit)):
+    ligo: bad type operator (type_operator: Map (binding)):
     If you're not sure how to fix this error, you can
     do one of the following:
--- a/src/passes/01-parser/cameligo.ml
+++ b/src/passes/01-parser/cameligo.ml
--- a/src/passes/01-parser/cameligo.mli
+++ b/src/passes/01-parser/cameligo.mli
--- a/src/passes/01-parser/cameligo/.AST.ml.tag
+++ b/src/passes/01-parser/cameligo/.AST.ml.tag
--- a/src/passes/01-parser/cameligo/.LexerMain.tag
+++ b/src/passes/01-parser/cameligo/.LexerMain.tag
--- a/src/passes/01-parser/cameligo/.Parser.mly.tag
+++ b/src/passes/01-parser/cameligo/.Parser.mly.tag
--- a/src/passes/01-parser/cameligo/.ParserMain.tag
+++ b/src/passes/01-parser/cameligo/.ParserMain.tag
--- a/src/passes/01-parser/cameligo/.Unlexer.tag
+++ b/src/passes/01-parser/cameligo/.Unlexer.tag
--- a/src/passes/01-parser/cameligo/.gitignore
+++ b/src/passes/01-parser/cameligo/.gitignore
--- a/src/passes/01-parser/cameligo/.links
+++ b/src/passes/01-parser/cameligo/.links
--- a/src/passes/01-parser/cameligo/AST.ml
+++ b/src/passes/01-parser/cameligo/AST.ml
--- a/src/passes/01-parser/cameligo/LexToken.mli
+++ b/src/passes/01-parser/cameligo/LexToken.mli
--- a/src/passes/01-parser/cameligo/LexToken.mll
+++ b/src/passes/01-parser/cameligo/LexToken.mll
--- a/src/passes/01-parser/cameligo/LexerMain.ml
+++ b/src/passes/01-parser/cameligo/LexerMain.ml
--- a/src/passes/01-parser/cameligo/Makefile.cfg
+++ b/src/passes/01-parser/cameligo/Makefile.cfg
--- a/src/passes/01-parser/cameligo/ParToken.mly
+++ b/src/passes/01-parser/cameligo/ParToken.mly
--- a/src/passes/01-parser/cameligo/Parser.mly
+++ b/src/passes/01-parser/cameligo/Parser.mly
--- a/src/passes/01-parser/cameligo/ParserLog.ml
+++ b/src/passes/01-parser/cameligo/ParserLog.ml
--- a/src/passes/01-parser/cameligo/ParserLog.mli
+++ b/src/passes/01-parser/cameligo/ParserLog.mli
--- a/src/passes/01-parser/cameligo/ParserMain.ml
+++ b/src/passes/01-parser/cameligo/ParserMain.ml
--- a/src/passes/01-parser/cameligo/Scoping.ml
+++ b/src/passes/01-parser/cameligo/Scoping.ml
--- a/src/passes/01-parser/cameligo/Scoping.mli
+++ b/src/passes/01-parser/cameligo/Scoping.mli
--- a/src/passes/01-parser/cameligo/Tests/pp.mligo
+++ b/src/passes/01-parser/cameligo/Tests/pp.mligo
--- a/src/passes/01-parser/cameligo/Unlexer.ml
+++ b/src/passes/01-parser/cameligo/Unlexer.ml
--- a/src/passes/01-parser/cameligo/cameligo.ml
+++ b/src/passes/01-parser/cameligo/cameligo.ml
--- a/src/passes/01-parser/cameligo/dune
+++ b/src/passes/01-parser/cameligo/dune
--- a/src/passes/01-parser/cameligo/error.messages.checked-in
+++ b/src/passes/01-parser/cameligo/error.messages.checked-in
--- a/src/passes/01-parser/dune
+++ b/src/passes/01-parser/dune
--- a/src/passes/01-parser/parser.ml
+++ b/src/passes/01-parser/parser.ml
--- a/src/passes/01-parser/pascaligo.ml
+++ b/src/passes/01-parser/pascaligo.ml
--- a/src/passes/01-parser/pascaligo.mli
+++ b/src/passes/01-parser/pascaligo.mli
--- a/src/passes/01-parser/pascaligo/.LexerMain.tag
+++ b/src/passes/01-parser/pascaligo/.LexerMain.tag
--- a/src/passes/01-parser/pascaligo/.Parser.mly.tag
+++ b/src/passes/01-parser/pascaligo/.Parser.mly.tag
--- a/src/passes/01-parser/pascaligo/.ParserMain.tag
+++ b/src/passes/01-parser/pascaligo/.ParserMain.tag
--- a/src/passes/01-parser/pascaligo/.Unlexer.tag
+++ b/src/passes/01-parser/pascaligo/.Unlexer.tag
--- a/src/passes/01-parser/pascaligo/.gitignore
+++ b/src/passes/01-parser/pascaligo/.gitignore
--- a/src/passes/01-parser/pascaligo/.links
+++ b/src/passes/01-parser/pascaligo/.links
--- a/src/passes/01-parser/pascaligo/AST.ml
+++ b/src/passes/01-parser/pascaligo/AST.ml
--- a/src/passes/01-parser/pascaligo/Doc/misc.txt
+++ b/src/passes/01-parser/pascaligo/Doc/misc.txt
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo.md
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo.md
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo.txt
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo.txt
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_01.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_01.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_02.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_02.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_03.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_03.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_04.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_04.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_05.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_05.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_06.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_06.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_07.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_07.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_08.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_08.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_09.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_09.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_10.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_10.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_11.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_11.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_12.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_12.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_13.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_13.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_14.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_14.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_15.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_15.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_16.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_16.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_17.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_17.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_18.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_18.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_19.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_19.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_20.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_20.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_21.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_21.bnf
--- a/src/passes/01-parser/pascaligo/Doc/pascaligo_22.bnf
+++ b/src/passes/01-parser/pascaligo/Doc/pascaligo_22.bnf
--- a/src/passes/01-parser/pascaligo/LexToken.mli
+++ b/src/passes/01-parser/pascaligo/LexToken.mli
--- a/src/passes/01-parser/pascaligo/LexToken.mll
+++ b/src/passes/01-parser/pascaligo/LexToken.mll
--- a/src/passes/01-parser/pascaligo/LexerMain.ml
+++ b/src/passes/01-parser/pascaligo/LexerMain.ml
--- a/src/passes/01-parser/pascaligo/Makefile.cfg
+++ b/src/passes/01-parser/pascaligo/Makefile.cfg
--- a/src/passes/01-parser/pascaligo/Misc/.SParser.ml.tag
+++ b/src/passes/01-parser/pascaligo/Misc/.SParser.ml.tag
--- a/src/passes/01-parser/pascaligo/Misc/SParser.ml
+++ b/src/passes/01-parser/pascaligo/Misc/SParser.ml
--- a/src/passes/01-parser/pascaligo/Misc/SParserMain.ml
+++ b/src/passes/01-parser/pascaligo/Misc/SParserMain.ml
--- a/src/passes/01-parser/pascaligo/ParToken.mly
+++ b/src/passes/01-parser/pascaligo/ParToken.mly
--- a/src/passes/01-parser/pascaligo/Parser.mly
+++ b/src/passes/01-parser/pascaligo/Parser.mly
--- a/src/passes/01-parser/pascaligo/ParserLog.ml
+++ b/src/passes/01-parser/pascaligo/ParserLog.ml
--- a/src/passes/01-parser/pascaligo/ParserLog.mli
+++ b/src/passes/01-parser/pascaligo/ParserLog.mli
--- a/src/passes/01-parser/pascaligo/ParserMain.ml
+++ b/src/passes/01-parser/pascaligo/ParserMain.ml
--- a/src/passes/01-parser/pascaligo/Scoping.ml
+++ b/src/passes/01-parser/pascaligo/Scoping.ml
--- a/src/passes/01-parser/pascaligo/Scoping.mli
+++ b/src/passes/01-parser/pascaligo/Scoping.mli
--- a/src/passes/01-parser/pascaligo/Tests/a.ligo
+++ b/src/passes/01-parser/pascaligo/Tests/a.ligo
--- a/src/passes/01-parser/pascaligo/Tests/crowdfunding.ligo
+++ b/src/passes/01-parser/pascaligo/Tests/crowdfunding.ligo
--- a/src/passes/01-parser/pascaligo/Tests/pp.ligo
+++ b/src/passes/01-parser/pascaligo/Tests/pp.ligo
--- a/src/passes/01-parser/pascaligo/Unlexer.ml
+++ b/src/passes/01-parser/pascaligo/Unlexer.ml
--- a/src/passes/01-parser/pascaligo/dune
+++ b/src/passes/01-parser/pascaligo/dune
--- a/src/passes/01-parser/pascaligo/error.messages.checked-in
+++ b/src/passes/01-parser/pascaligo/error.messages.checked-in
--- a/src/passes/01-parser/pascaligo/pascaligo.ml
+++ b/src/passes/01-parser/pascaligo/pascaligo.ml
--- a/src/passes/01-parser/reasonligo.ml
+++ b/src/passes/01-parser/reasonligo.ml
--- a/src/passes/01-parser/reasonligo.mli
+++ b/src/passes/01-parser/reasonligo.mli
--- a/src/passes/01-parser/reasonligo/.LexerMain.tag
+++ b/src/passes/01-parser/reasonligo/.LexerMain.tag
--- a/src/passes/01-parser/reasonligo/.Parser.mly.tag
+++ b/src/passes/01-parser/reasonligo/.Parser.mly.tag
--- a/src/passes/01-parser/reasonligo/.ParserMain.tag
+++ b/src/passes/01-parser/reasonligo/.ParserMain.tag
--- a/src/passes/01-parser/reasonligo/.Unlexer.tag
+++ b/src/passes/01-parser/reasonligo/.Unlexer.tag
--- a/src/passes/01-parser/reasonligo/.gitignore
+++ b/src/passes/01-parser/reasonligo/.gitignore
--- a/src/passes/01-parser/reasonligo/.links
+++ b/src/passes/01-parser/reasonligo/.links
--- a/src/passes/01-parser/reasonligo/LexToken.mli
+++ b/src/passes/01-parser/reasonligo/LexToken.mli
--- a/src/passes/01-parser/reasonligo/LexToken.mll
+++ b/src/passes/01-parser/reasonligo/LexToken.mll
--- a/src/passes/01-parser/reasonligo/LexerMain.ml
+++ b/src/passes/01-parser/reasonligo/LexerMain.ml
--- a/src/passes/01-parser/reasonligo/Makefile.cfg
+++ b/src/passes/01-parser/reasonligo/Makefile.cfg
--- a/src/passes/01-parser/reasonligo/Misc/Misc.ml
+++ b/src/passes/01-parser/reasonligo/Misc/Misc.ml
--- a/src/passes/01-parser/reasonligo/ParToken.mly
+++ b/src/passes/01-parser/reasonligo/ParToken.mly
--- a/src/passes/01-parser/reasonligo/Parser.mly
+++ b/src/passes/01-parser/reasonligo/Parser.mly
--- a/src/passes/01-parser/reasonligo/ParserMain.ml
+++ b/src/passes/01-parser/reasonligo/ParserMain.ml
--- a/Show More
+++ b/Show More