|
@@ -24,14 +24,14 @@ let phase ir =
|
|
|
prerr_endline "- Load input file";
|
|
prerr_endline "- Load input file";
|
|
|
match ir with
|
|
match ir with
|
|
|
| Args args ->
|
|
| Args args ->
|
|
|
- let display_name = match args.filename with
|
|
|
|
|
|
|
+ let display_name = match args.infile with
|
|
|
| Some filename -> filename
|
|
| Some filename -> filename
|
|
|
| None -> "<stdin>"
|
|
| None -> "<stdin>"
|
|
|
in
|
|
in
|
|
|
let bufsize = 512 in
|
|
let bufsize = 512 in
|
|
|
|
|
|
|
|
if args.cpp then
|
|
if args.cpp then
|
|
|
- let cpp_out = match args.filename with
|
|
|
|
|
|
|
+ let cpp_out = match args.infile with
|
|
|
| Some filename ->
|
|
| Some filename ->
|
|
|
Unix.open_process_in ("cpp " ^ filename)
|
|
Unix.open_process_in ("cpp " ^ filename)
|
|
|
| None ->
|
|
| None ->
|
|
@@ -48,7 +48,7 @@ let phase ir =
|
|
|
let preprocessed = input_buffered cpp_out bufsize in
|
|
let preprocessed = input_buffered cpp_out bufsize in
|
|
|
FileContent (display_name, preprocessed, args)
|
|
FileContent (display_name, preprocessed, args)
|
|
|
else
|
|
else
|
|
|
- let content = match args.filename with
|
|
|
|
|
|
|
+ let content = match args.infile with
|
|
|
| Some filename -> input_all (open_in filename)
|
|
| Some filename -> input_all (open_in filename)
|
|
|
| None -> input_buffered stdin bufsize
|
|
| None -> input_buffered stdin bufsize
|
|
|
in
|
|
in
|