st/lama_byterun
1
0
Fork 0
mirror of https://github.com/ProgramSnail/Lama.git synced 2025-12-24 23:58:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/hw2'

Browse source 
* origin/hw2:
  Fixed common.ml/Syntax.ml
  Fixed common.mlyet again
  Fixed SM.run
  Added SM.run
  Fixed common.ml
  Sync
  Added CONST instruction
This commit is contained in:
Podkopaev Anton 2018-03-06 17:58:54 +03:00
commit 29cd925266
4 changed files with 281 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Language.ml
View file

@ -94,12 +94,9 @@ type t = Stmt.t
(* Top-level evaluator
eval : t -> int list -> int list
eval : int list -> t -> int list
Takes a program and its input stream, and returns the output stream
*)
let eval p i =
let eval i p =
let _, _, o = Stmt.eval (Expr.empty, i, []) p in o
(* Top-level parser *)
let parse = Stmt.parse

4
src/SM.ml
View file

@ -28,11 +28,11 @@ let eval _ = failwith "Not yet implemented"
(* Top-level evaluation
val run : prg -> int list -> int list
val run : int list -> prg -> int list
Takes an input stream, a program, and returns an output stream this program calculates
*)
let run p i = let (_, (_, _, o)) = eval ([], (Expr.empty, i, [])) p in o
let run i p = let (_, (_, _, o)) = eval ([], (Syntax.Expr.empty, i, [])) p in o
(* Stack machine compiler