Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Why3
why3
Commits
2726d45a
Commit
2726d45a
authored
May 07, 2012
by
Andrei Paskevich
Browse files
fix driver import with relative paths
parent
9e5aab7b
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/driver/driver.ml
View file @
2726d45a
...
...
@@ -56,14 +56,12 @@ let load_plugin dir (byte,nat) =
Dynlink
.
loadfile_private
file
let
load_file
file
=
let
basename
=
Filename
.
dirname
file
in
let
c
=
open_in
file
in
let
lb
=
Lexing
.
from_channel
c
in
Loc
.
set_file
file
lb
;
let
to_close
=
Stack
.
create
()
in
Stack
.
push
c
to_close
;
let
input_lexer
s
=
let
filename
=
Sysutil
.
absolutize_filename
basename
s
in
let
input_lexer
filename
=
let
c
=
open_in
filename
in
Stack
.
push
c
to_close
;
let
lb
=
Lexing
.
from_channel
c
in
...
...
src/driver/driver_lexer.mll
View file @
2726d45a
...
...
@@ -122,6 +122,8 @@ rule token = parse
Loc
.
transfer_loc
lexbuf
lex_dumb
;
match
tok
with
|
INPUT
filename
->
let
dirname
=
Filename
.
dirname
lexbuf
.
lex_curr_p
.
pos_fname
in
let
filename
=
Sysutil
.
absolutize_filename
dirname
filename
in
Stack
.
push
(
input_lexbuf
filename
)
s
;
multifile
lex_dumb
|
EOF
->
ignore
(
Stack
.
pop
s
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment