balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed the #include directive.

Browse Source
This commit is contained in:
Christian Rinderknecht 2020-04-09 18:41:55 +02:00
parent 3ed303f60d
commit 6c02482bf9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vendors/Preprocessor/Preproc.mll vendored
View File

@ -199,7 +199,7 @@ let error_to_string = function
let format ?(offsets=true) Region.{region; value} ~file = let format ?(offsets=true) Region.{region; value} ~file =
let msg = error_to_string value let msg = error_to_string value
and reg = region#to_string ~file ~offsets `Byte in and reg = region#to_string ~file ~offsets `Byte in
let value = sprintf "Preprocessing error %s:\n%s\n" reg msg let value = sprintf "Preprocessing error %s:\n%s" reg msg
in Region.{value; region} in Region.{value; region}
exception Error of (Buffer.t * error Region.reg) exception Error of (Buffer.t * error Region.reg)
@ -499,6 +499,7 @@ rule scan state = parse
match find path incl_file state.opt#libs with match find path incl_file state.opt#libs with
Some p -> p Some p -> p
| None -> stop (File_not_found incl_file) state reg in | None -> stop (File_not_found incl_file) state reg in
let () = print state (sprintf "\n# 1 \"%s\" 1\n" incl_path) in
let incl_buf = Lexing.from_channel incl_chan in let incl_buf = Lexing.from_channel incl_chan in
let () = let () =
let open Lexing in let open Lexing in
@ -507,9 +508,7 @@ rule scan state = parse
let state = {state with incl = incl_chan::state.incl} in let state = {state with incl = incl_chan::state.incl} in
let state' = let state' =
{state with env=Env.empty; mode=Copy; trace=[]} in {state with env=Env.empty; mode=Copy; trace=[]} in
let state' = push_dir incl_dir state' in let state' = scan (push_dir incl_dir state') incl_buf in
print state (sprintf "\n# 1 \"%s\" 1\n" incl_path);
let state' = scan state' incl_buf in
let state = {state with incl = state'.incl} in let state = {state with incl = state'.incl} in
let path = let path =
if path = "" then base if path = "" then base
@ -748,6 +747,8 @@ and preproc state = parse
the end. *) the end. *)
let lex opt buffer = let lex opt buffer =
let path = buffer.Lexing.lex_curr_p.Lexing.pos_fname in
let dir = [Filename.dirname path] in
let state = { let state = {
env = Env.empty; env = Env.empty;
mode = Copy; mode = Copy;
@ -756,7 +757,7 @@ let lex opt buffer =
out = Buffer.create 80; out = Buffer.create 80;
incl = []; incl = [];
opt; opt;
dir = [] dir
} in } in
match preproc state buffer with match preproc state buffer with
state -> List.iter close_in state.incl; state -> List.iter close_in state.incl;