elvis/lci
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better styling for miniFun

Browse Source
This commit is contained in:
elvis
2025-01-27 00:18:23 +01:00
parent 6d5587692c
commit 5e8b339440
3 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/miniFun/Semantics.ml
View File

@ -5,14 +5,17 @@ Random.self_init ()
let (let*) = Result.bind let (let*) = Result.bind
let rec evaluate (mem: memory) (command: t_exp) : (permittedValues, [> error]) result = let rec evaluate (mem: memory) (command: t_exp) :
(permittedValues, [> error]) result =
match command with match command with
Integer n -> Ok (IntegerPermitted n) Integer n -> Ok (IntegerPermitted n)
| Boolean b -> Ok (BooleanPermitted b) | Boolean b -> Ok (BooleanPermitted b)
| Variable v -> ( | Variable v -> (
match VariableMap.find_opt v mem.assignments with match VariableMap.find_opt v mem.assignments with
None -> Error (`AbsentAssignment ("The variable " ^ v ^ " is not defined.")) | None ->
| Some a -> Ok a Error (`AbsentAssignment ("The variable " ^ v ^ " is not defined."))
| Some a ->
Ok a
) )
| Tuple (x, y) -> ( | Tuple (x, y) -> (
let* xval = evaluate mem x in let* xval = evaluate mem x in

6
lib/miniFun/TypeChecker.ml
View File

@ -5,7 +5,8 @@ Random.self_init ()
let (let*) = Result.bind let (let*) = Result.bind
let rec evaluate_type (program: t_exp) (context: ftype VariableMap.t) : (ftype, [> typechecking_error]) result = let rec evaluate_type (program: t_exp) (context: ftype VariableMap.t) :
(ftype, [> typechecking_error]) result =
match program with match program with
Integer _ -> Ok IntegerType Integer _ -> Ok IntegerType
| Boolean _ -> Ok BooleanType | Boolean _ -> Ok BooleanType
@ -25,7 +26,8 @@ let rec evaluate_type (program: t_exp) (context: ftype VariableMap.t) : (ftype,
the type of the body using the bindings for the input *) the type of the body using the bindings for the input *)
match typef with match typef with
FunctionType (tin, tout) -> ( FunctionType (tin, tout) -> (
let* typefbody = evaluate_type fbody (VariableMap.add x tin context) in let* typefbody = evaluate_type fbody (VariableMap.add x tin context)
in
if (typefbody = tout) then if (typefbody = tout) then
Ok typef Ok typef
else else

55
lib/miniFun/Types.ml
View File

@ -9,33 +9,34 @@ type ftype =
| FunctionType of ftype * ftype | FunctionType of ftype * ftype
type t_exp = type t_exp =
Integer of int (* x := a *) Integer of int (* x := a *)
| Boolean of bool (* v *) | Boolean of bool (* v *)
| Variable of variable (* x *) | Variable of variable (* x *)
| Tuple of t_exp * t_exp (* (a, b) *) | Tuple of t_exp * t_exp (* (a, b) *)
| Function of variable * ftype * t_exp (* lambda x: t. x *) | Function of variable * ftype * t_exp (* lambda x: t. x *)
| Application of t_exp * t_exp (* x x *) | Application of t_exp * t_exp (* x x *)
| Plus of t_exp * t_exp (* x + x *) | Plus of t_exp * t_exp (* x + x *)
| Minus of t_exp * t_exp (* x - x *) | Minus of t_exp * t_exp (* x - x *)
| Times of t_exp * t_exp (* x * x *) | Times of t_exp * t_exp (* x * x *)
| Division of t_exp * t_exp (* x / x *) | Division of t_exp * t_exp (* x / x *)
| Modulo of t_exp * t_exp (* x % x *) | Modulo of t_exp * t_exp (* x % x *)
| Power of t_exp * t_exp (* x ^ x *) | Power of t_exp * t_exp (* x ^ x *)
| PowerMod of t_exp * t_exp * t_exp (* (x ^ x) % x *) | PowerMod of t_exp * t_exp * t_exp (* (x ^ x) % x *)
| Rand of t_exp (* rand(0, x) *) | Rand of t_exp (* rand(0, x) *)
| BAnd of t_exp * t_exp (* x && x *) | BAnd of t_exp * t_exp (* x && x *)
| BOr of t_exp * t_exp (* x || x *) | BOr of t_exp * t_exp (* x || x *)
| BNot of t_exp (* not x *) | BNot of t_exp (* not x *)
| First of t_exp (* fst x *) | First of t_exp (* fst x *)
| Second of t_exp (* scn x *) | Second of t_exp (* scn x *)
| Cmp of t_exp * t_exp (* x == x *) | Cmp of t_exp * t_exp (* x == x *)
| CmpLess of t_exp * t_exp (* x < x *) | CmpLess of t_exp * t_exp (* x < x *)
| CmpLessEq of t_exp * t_exp (* x <= x *) | CmpLessEq of t_exp * t_exp (* x <= x *)
| CmpGreater of t_exp * t_exp (* x > x *) | CmpGreater of t_exp * t_exp (* x > x *)
| CmpGreaterEq of t_exp * t_exp (* x >= x *) | CmpGreaterEq of t_exp * t_exp (* x >= x *)
| IfThenElse of t_exp * t_exp * t_exp (* if b then c else c *) | IfThenElse of t_exp * t_exp * t_exp (* if b then c else c *)
| LetIn of variable * t_exp * t_exp (* let x = x in x *) | LetIn of variable * t_exp * t_exp (* let x = x in x *)
| LetFun of variable * variable * ftype * t_exp * t_exp (* let rec x. y: t. x in x*) | LetFun of variable * variable * ftype * t_exp * t_exp
(* let rec x. y: t. x in x*)
type permittedValues = type permittedValues =
IntegerPermitted of int IntegerPermitted of int