2019-09-27 13:33:25 +00:00
|
|
|
(* Driver for the parser of Ligodity *)
|
2019-05-12 19:31:22 +02:00
|
|
|
|
|
|
|
(* Error printing and exception tracing *)
|
|
|
|
|
2019-07-24 15:43:51 +02:00
|
|
|
let () = Printexc.record_backtrace true
|
2019-05-12 19:31:22 +02:00
|
|
|
|
2019-05-15 15:03:15 +02:00
|
|
|
(* Reading the command-line options *)
|
|
|
|
|
2019-10-07 16:33:34 +02:00
|
|
|
let options = EvalOpt.read "CameLIGO" ".mligo"
|
2019-05-15 15:03:15 +02:00
|
|
|
|
|
|
|
open EvalOpt
|
|
|
|
|
2019-09-27 13:33:25 +00:00
|
|
|
(* Auxiliary functions *)
|
|
|
|
|
|
|
|
let sprintf = Printf.sprintf
|
|
|
|
|
|
|
|
(* Extracting the input file *)
|
|
|
|
|
|
|
|
let file =
|
|
|
|
match options.input with
|
|
|
|
None | Some "-" -> false
|
|
|
|
| Some _ -> true
|
|
|
|
|
|
|
|
(* Error printing and exception tracing *)
|
|
|
|
|
|
|
|
let () = Printexc.record_backtrace true
|
|
|
|
|
|
|
|
let external_ text =
|
|
|
|
Utils.highlight (Printf.sprintf "External error: %s" text); exit 1;;
|
|
|
|
|
|
|
|
type Error.t += ParseError
|
|
|
|
|
|
|
|
let error_to_string = function
|
|
|
|
ParseError -> "Syntax error.\n"
|
|
|
|
| _ -> assert false
|
|
|
|
|
|
|
|
let print_error ?(offsets=true) mode Region.{region; value} ~file =
|
|
|
|
let msg = error_to_string value in
|
|
|
|
let reg = region#to_string ~file ~offsets mode in
|
|
|
|
Utils.highlight (sprintf "Parse error %s:\n%s%!" reg msg)
|
|
|
|
|
|
|
|
(* Path for CPP inclusions (#include) *)
|
2019-05-12 19:31:22 +02:00
|
|
|
|
|
|
|
let lib_path =
|
2019-05-15 15:03:15 +02:00
|
|
|
match options.libs with
|
2019-05-12 19:31:22 +02:00
|
|
|
[] -> ""
|
|
|
|
| libs -> let mk_I dir path = Printf.sprintf " -I %s%s" dir path
|
|
|
|
in List.fold_right mk_I libs ""
|
|
|
|
|
2019-09-27 13:33:25 +00:00
|
|
|
(* Preprocessing the input source and opening the input channels *)
|
2019-05-12 19:31:22 +02:00
|
|
|
|
2019-09-27 13:33:25 +00:00
|
|
|
let prefix =
|
2019-05-15 15:03:15 +02:00
|
|
|
match options.input with
|
2019-09-27 13:33:25 +00:00
|
|
|
None | Some "-" -> "temp"
|
|
|
|
| Some file -> Filename.(file |> basename |> remove_extension)
|
2019-05-12 19:31:22 +02:00
|
|
|
|
2019-09-27 13:33:25 +00:00
|
|
|
let suffix = ".pp.mligo"
|
|
|
|
|
|
|
|
let pp_input =
|
|
|
|
if Utils.String.Set.mem "cpp" options.verbose
|
|
|
|
then prefix ^ suffix
|
|
|
|
else let pp_input, pp_out = Filename.open_temp_file prefix suffix
|
|
|
|
in close_out pp_out; pp_input
|
|
|
|
|
|
|
|
let cpp_cmd =
|
|
|
|
match options.input with
|
|
|
|
None | Some "-" ->
|
|
|
|
Printf.sprintf "cpp -traditional-cpp%s - > %s"
|
|
|
|
lib_path pp_input
|
|
|
|
| Some file ->
|
|
|
|
Printf.sprintf "cpp -traditional-cpp%s %s > %s"
|
|
|
|
lib_path file pp_input
|
|
|
|
|
|
|
|
let () =
|
|
|
|
if Utils.String.Set.mem "cpp" options.verbose
|
|
|
|
then Printf.eprintf "%s\n%!" cpp_cmd;
|
|
|
|
if Sys.command cpp_cmd <> 0 then
|
|
|
|
external_ (Printf.sprintf "the command \"%s\" failed." cpp_cmd)
|
|
|
|
|
|
|
|
(* Instanciating the lexer *)
|
|
|
|
|
|
|
|
module Lexer = Lexer.Make (LexToken)
|
|
|
|
|
|
|
|
module Log = LexerLog.Make (Lexer)
|
|
|
|
|
|
|
|
let Lexer.{read; buffer; get_pos; get_last; close} =
|
|
|
|
Lexer.open_token_stream (Some pp_input)
|
|
|
|
|
|
|
|
and cout = stdout
|
|
|
|
|
|
|
|
let log = Log.output_token ~offsets:options.offsets
|
|
|
|
options.mode options.cmd cout
|
|
|
|
|
|
|
|
and close_all () = close (); close_out cout
|
2019-05-12 19:31:22 +02:00
|
|
|
|
|
|
|
(* Tokeniser *)
|
|
|
|
|
2019-09-27 13:33:25 +00:00
|
|
|
let tokeniser = read ~log
|
|
|
|
|
|
|
|
(* Main *)
|
2019-05-12 19:31:22 +02:00
|
|
|
|
|
|
|
let () =
|
|
|
|
try
|
2019-09-27 13:33:25 +00:00
|
|
|
let ast = Parser.contract tokeniser buffer in
|
|
|
|
if Utils.String.Set.mem "ast" options.verbose
|
Refactoring of Ligodity (CameLIGO) and making an AST pretty-printer
- AST.ml/AST.mli:
- The AST now distinguishes the constructors `None` and `Some` as being
predefined, as in PascaLIGO. See type `AST.constr_pattern`.
- I removed the nodes specific to Liquidity,
e.g. `let%entry`, and, in particular, the natural literals
ending with `p`. Now it should be `n`, as in `10n`.
- I renamed the node `TAlias` to `TVar`.
- I have applied the rule of expanding type expressions after `of` when
those were not records.
- The type of the argument to a data constructor is now
`type_expr`, instead of `cartesian`.
- I added the patterns for bytes (`PBytes`) and natural literals (`PNat`).
- I renamed the node `Sugar` into
`PListComp` (meaning "pattern of list comprehension").
- Record types in CameLIGO now must have at least one field declaration.
- Replaced the type `closing` and `opening` with one type `compound`,
which captures only the right combinations of opening and closing.
- Components of tuples in a selection must not be written
between parentheses. For example, `a.b.(1).(0)` is now
`a.b.1.0`, as in PascaLIGO.
- LexToken.mli/LexToken.mll
- I renamed the string literal `Str` into `String`.
- I added the tokens `C_None` and `C_Some` (to distinguish the
constructors `None` and `Some`. See AST.ml)
- Fixed the function `mk_sym` so it does not fail with `failwith`, but
with `Error Invalid_symbol`.
- Lexer.mll (shared)
- I removed the character `%` from the identifiers (used to
support Liquidity, like `entry%point` and `match%nat`).
- I adde to the hint on broken strings: "or insert a backslash"
(from a Gitlab issue).
- ParToken.mly
- I added the tokens `C_None` and `C_Some` (to distinguish the
constructors `None` and `Some`. See AST.ml and LexToken.mll)
- Parser.mly
- Fixed the order of declarations in the AST (it was reversed).
- I removed syntax support for Liquidity.
- I added user-defined constructor applications to irrefutable
patterns (the ones afer a `let`), even though only the type
checker can decide that they are truly irrefutable because they
are the only constructors of their types.
- I added natural numbers and bytes to patterns.
- Access of tuple components do not require parentheses now, like
`a.b.1.0`.
- I refactored the semantic actions.
- I added the empty sequence `begin end`.
- ParserLog.ml/ParserLog.mli
- I added a pretty-printer for the AST (with source locations).
- ParserMain.ml
- The CLI for the pretty-printer is now `--verbose=ast`.
- The old CLI `--verbose=ast` is now `--verbose=ast-tokens`.
- ligodity.ml (simplifier)
- I removed the constructions of sets, lists and maps with
`Set [...]`, `List [...]` and `Map [...]`, as there are already
better ways (that is, more like the OCaml's way), like
`Set.literal [...]` and `Map.literal [...]`. (The case for lists
was entirely redundant with the rest of the language as it is.)
- Everywhere there is now a non-empty list of elements, I made a
change. In particular, I removed a corner case ("let without
binding"), thanks to more precise OCaml types for non-empty
lists.
- I ported all the changes to the AST above.
- region.ml (vendors)
- I changed the method `compact` so the end-line is not repeated
if it is the same as the start line: this is even more compact. I
use this in the new pretty-printer for the AST (see above)
- I updated all the CameLIGO contracts.
2019-11-04 23:51:47 +01:00
|
|
|
then let buffer = Buffer.create 131 in
|
|
|
|
begin
|
|
|
|
ParserLog.offsets := options.offsets;
|
|
|
|
ParserLog.mode := options.mode;
|
|
|
|
ParserLog.pp_ast buffer ast;
|
|
|
|
Buffer.output_buffer stdout buffer
|
|
|
|
end
|
|
|
|
else if Utils.String.Set.mem "ast-tokens" options.verbose
|
2019-10-09 16:07:13 +02:00
|
|
|
then let buffer = Buffer.create 131 in
|
|
|
|
begin
|
2019-09-27 13:33:25 +00:00
|
|
|
ParserLog.offsets := options.offsets;
|
|
|
|
ParserLog.mode := options.mode;
|
2019-10-09 16:07:13 +02:00
|
|
|
ParserLog.print_tokens buffer ast;
|
|
|
|
Buffer.output_buffer stdout buffer
|
2019-09-27 13:33:25 +00:00
|
|
|
end
|
2019-05-12 19:31:22 +02:00
|
|
|
with
|
2019-09-27 13:33:25 +00:00
|
|
|
Lexer.Error err ->
|
|
|
|
close_all ();
|
|
|
|
Lexer.print_error ~offsets:options.offsets
|
|
|
|
options.mode err ~file
|
2019-05-12 19:31:22 +02:00
|
|
|
| Parser.Error ->
|
2019-09-27 13:33:25 +00:00
|
|
|
let region = get_last () in
|
|
|
|
let error = Region.{region; value=ParseError} in
|
|
|
|
let () = close_all () in
|
|
|
|
print_error ~offsets:options.offsets
|
|
|
|
options.mode error ~file
|
2019-05-12 19:31:22 +02:00
|
|
|
| Sys_error msg -> Utils.highlight msg
|