Infix moved to Ostap; atribute added in module Expr to avoid balancing expression tree

This commit is contained in:
kverty 2019-08-14 01:59:44 +03:00
parent 6a72e69d32
commit 8197ea1d20
2 changed files with 202 additions and 298 deletions

View file

@ -30,32 +30,32 @@ let parse infile =
] s
end
)
(ostap (!(Language.parse Language.Infix.default) -EOF))
(ostap (!(Language.parse Language.Expr.defaultInfix) -EOF))
let main =
try
let interpret = Sys.argv.(1) = "-i" in
let stack = Sys.argv.(1) = "-s" in
let to_compile = not (interpret || stack) in
let infile = Sys.argv.(if not to_compile then 2 else 1) in
let infile = Sys.argv.(if not to_compile then 2 else 1) in
match (try parse infile with Language.Semantic_error msg -> `Fail msg) with
| `Ok prog ->
if to_compile
then
then
let basename = Filename.chop_suffix infile ".expr" in
ignore @@ X86.build prog basename
else
ignore @@ X86.build prog basename
else
let rec read acc =
try
let r = read_int () in
Printf.printf "> ";
read (acc @ [r])
read (acc @ [r])
with End_of_file -> acc
in
let input = read [] in
let output =
if interpret
then Language.eval prog input
let input = read [] in
let output =
if interpret
then Language.eval prog input
else SM.run (SM.compile prog) input
in
List.iter (fun i -> Printf.printf "%d\n" i) output