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

Merge branch 'rinderknecht@fix-verbatim' into 'dev'

Browse Source 
Improved the lexing of verbatim strings for Michelson inclusion

See merge request ligolang/ligo!713
This commit is contained in:
Sander 2020-07-04 13:02:22 +00:00
commit 0b0de1ea59
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/passes/01-parsing/shared/Lexer.mll
View File

@ -516,11 +516,22 @@ and scan_string thread state = parse
scan_string (thread#push_char c) state lexbuf } scan_string (thread#push_char c) state lexbuf }
and scan_verbatim thread state = parse and scan_verbatim thread state = parse
| eof { fail thread#opening Unterminated_verbatim} nl as nl { let () = Lexing.new_line lexbuf
| "|}" { let _, _, state = state#sync lexbuf and state = state#set_pos (state#pos#new_line nl)
in thread, state } in scan_verbatim (thread#push_string nl) state lexbuf }
| _ as c { let _, _, state = state#sync lexbuf in | '#' blank* (natural as line) blank+ '"' (string as file) '"' {
scan_verbatim (thread#push_char c) state lexbuf } let _, _, state = state#sync lexbuf in
let flags, state = scan_flags state [] lexbuf in
let () = ignore flags in
let line = int_of_string line
and file = Filename.basename file in
let pos = state#pos#set ~file ~line ~offset:0 in
let state = state#set_pos pos in
scan_verbatim thread state lexbuf }
| eof { fail thread#opening Unterminated_verbatim }
| "|}" { let _, _, state = state#sync lexbuf in thread, state }
| _ as c { let _, _, state = state#sync lexbuf in
scan_verbatim (thread#push_char c) state lexbuf }
(* Finishing a block comment (* Finishing a block comment