balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged tuples and records so that x.4 is valid in principle

Browse Source
This commit is contained in:
Georges Dupéron 2019-03-14 16:46:18 +01:00
parent 332f18bb80
commit 9c5d31eca1
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Typecheck2.ml
View File

@ -10,8 +10,6 @@ module O = struct
type var_name = name_and_region type var_name = name_and_region
type field_name = name_and_region type field_name = name_and_region
type record_key = [`Field of field_name | `Component of int]
type pattern = type pattern =
PVar of var_name PVar of var_name
| PWild | PWild
@ -25,19 +23,17 @@ module O = struct
| PSome of pattern | PSome of pattern
| PCons of pattern * pattern | PCons of pattern * pattern
| PNull | PNull
| PRecord of record_key precord | PRecord of (field_name * pattern) list
and 'key precord = ('key * pattern) list
type type_constructor = type type_constructor =
| Option Option
| List | List
| Set | Set
| Map | Map
type type_expr_case = type type_expr_case =
| Sum of (type_name * type_expr) list Sum of (type_name * type_expr) list
| Record of record_key type_record | Record of (field_name * type_expr) list
| TypeApp of type_constructor * (type_expr list) | TypeApp of type_constructor * (type_expr list)
| Function of { arg: type_expr; ret: type_expr } | Function of { arg: type_expr; ret: type_expr }
| Ref of type_expr | Ref of type_expr
@ -45,7 +41,6 @@ module O = struct
| Int | Int
| Unit | Unit
| Bool | Bool
and 'key type_record = ('key * type_expr) list
and type_expr = { type_expr: type_expr_case; name: string option; orig: AST.type_expr } and type_expr = { type_expr: type_expr_case; name: string option; orig: AST.type_expr }
@ -57,11 +52,9 @@ module O = struct
App of { operator: operator; arguments: expr list } App of { operator: operator; arguments: expr list }
| Var of typed_var | Var of typed_var
| Constant of constant | Constant of constant
| Record of record_key expr_record | Record of (field_name * expr) list
| Lambda of lambda | Lambda of lambda
and 'key expr_record = ('key * expr) list
and expr = { expr: expr_case; ty:type_expr; orig: asttodo } and expr = { expr: expr_case; ty:type_expr; orig: asttodo }
and decl = { var: typed_var; value: expr; orig: asttodo } and decl = { var: typed_var; value: expr; orig: asttodo }
@ -76,8 +69,8 @@ module O = struct
and operator_case = and operator_case =
Function of var_name Function of var_name
| Construcor of var_name | Construcor of var_name
| UpdateField of record_key | UpdateField of field_name
| GetField of record_key | GetField of field_name
| Or | And | Lt | Leq | Gt | Geq | Equal | Neq | Cat | Cons | Add | Sub | Mult | Div | Mod | Or | And | Lt | Leq | Gt | Geq | Equal | Neq | Cat | Cons | Add | Sub | Mult | Div | Mod
| Neg | Not | Neg | Not
| Set | Set

17
Typecheck2.mli
View File

@ -10,8 +10,6 @@ module O : sig
type var_name = name_and_region type var_name = name_and_region
type field_name = name_and_region type field_name = name_and_region
type record_key = [`Field of field_name | `Component of int]
type pattern = type pattern =
PVar of var_name PVar of var_name
| PWild | PWild
@ -25,9 +23,7 @@ module O : sig
| PSome of pattern | PSome of pattern
| PCons of pattern * pattern | PCons of pattern * pattern
| PNull | PNull
| PRecord of record_key precord | PRecord of (field_name * pattern) list
and 'key precord = ('key * pattern) list
type type_constructor = type type_constructor =
Option Option
@ -37,7 +33,7 @@ module O : sig
type type_expr_case = type type_expr_case =
Sum of (type_name * type_expr) list Sum of (type_name * type_expr) list
| Record of record_key type_record | Record of (field_name * type_expr) list
| TypeApp of type_constructor * (type_expr list) | TypeApp of type_constructor * (type_expr list)
| Function of { arg: type_expr; ret: type_expr } | Function of { arg: type_expr; ret: type_expr }
| Ref of type_expr | Ref of type_expr
@ -45,7 +41,6 @@ module O : sig
| Int | Int
| Unit | Unit
| Bool | Bool
and 'key type_record = ('key * type_expr) list
and type_expr = { type_expr: type_expr_case; name: string option; orig: AST.type_expr } and type_expr = { type_expr: type_expr_case; name: string option; orig: AST.type_expr }
@ -57,11 +52,9 @@ module O : sig
App of { operator: operator; arguments: expr list } App of { operator: operator; arguments: expr list }
| Var of typed_var | Var of typed_var
| Constant of constant | Constant of constant
| Record of record_key expr_record | Record of (field_name * expr) list
| Lambda of lambda | Lambda of lambda
and 'key expr_record = ('key * expr) list
and expr = { expr: expr_case; ty:type_expr; orig: asttodo } and expr = { expr: expr_case; ty:type_expr; orig: asttodo }
and decl = { var: typed_var; value: expr; orig: asttodo } and decl = { var: typed_var; value: expr; orig: asttodo }
@ -76,8 +69,8 @@ module O : sig
and operator_case = and operator_case =
Function of var_name Function of var_name
| Construcor of var_name | Construcor of var_name
| UpdateField of record_key | UpdateField of field_name
| GetField of record_key | GetField of field_name
| Or | And | Lt | Leq | Gt | Geq | Equal | Neq | Cat | Cons | Add | Sub | Mult | Div | Mod | Or | And | Lt | Leq | Gt | Geq | Equal | Neq | Cat | Cons | Add | Sub | Mult | Div | Mod
| Neg | Not | Neg | Not
| Set | Set