CatalaLang/catala
1
1
Fork 0
mirror of https://github.com/CatalaLang/catala.git synced 2024-11-08 07:51:43 +03:00
Code Issues Projects Releases Wiki Activity

Pass-specific literals

Browse Source
This commit is contained in:
Louis Gesbert 2022-07-27 12:18:14 +02:00
parent b5579cde3d
commit ebf97a0995
5 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/dcalc/ast.ml
View File

@ -77,6 +77,7 @@ type _ mark =
| Typed : typed -> typed mark
| Inferring : inferring -> inferring mark
type lit = dcalc glit
type 'm expr = (dcalc, 'm mark) gexpr
and 'm marked_expr = (dcalc, 'm mark) marked_gexpr

1
compiler/dcalc/ast.mli
View File

@ -53,6 +53,7 @@ type _ mark =
| Typed : typed -> typed mark
| Inferring : inferring -> inferring mark
type lit = dcalc glit
type 'm expr = (dcalc, 'm mark) gexpr
and 'm marked_expr = (dcalc, 'm mark) marked_gexpr

2
compiler/lcalc/ast.ml
View File

@ -20,6 +20,8 @@ module D = Dcalc.Ast
type 'm mark = 'm D.mark
type lit = lcalc glit
type 'm expr = (lcalc, 'm mark) gexpr
and 'm marked_expr = (lcalc, 'm mark) marked_gexpr

2
compiler/lcalc/ast.mli
View File

@ -23,6 +23,8 @@ include module type of Astgen
type 'm mark = 'm Dcalc.Ast.mark
type lit = lcalc glit
type 'm expr = (lcalc, 'm mark) gexpr
and 'm marked_expr = (lcalc, 'm mark) marked_gexpr

22
compiler/utils/astgen.ml
View File

@ -55,16 +55,6 @@ and typ =
type date = Runtime.date
type duration = Runtime.duration
type lit =
| LBool of bool
| LEmptyError (* Fixme: exclude for lcalc *)
| LInt of Runtime.integer
| LRat of Runtime.decimal
| LMoney of Runtime.money
| LUnit
| LDate of date
| LDuration of duration
type op_kind =
| KInt
| KRat
@ -124,13 +114,23 @@ type dcalc = [ `Dcalc ]
type lcalc = [ `Lcalc ]
type scalc = [ `Scalc ]
type 'a glit =
| LBool: bool -> 'a glit
| LEmptyError: [< desugared | scopelang | dcalc ] glit
| LInt: Runtime.integer -> 'a glit
| LRat: Runtime.decimal -> 'a glit
| LMoney: Runtime.money -> 'a glit
| LUnit: 'a glit
| LDate: date -> 'a glit
| LDuration: duration -> 'a glit
type ('a, 'm) marked_gexpr = (('a, 'm) gexpr, 'm) Marked.t
(** The expressions use the {{:https://lepigre.fr/ocaml-bindlib/} Bindlib}
library, based on higher-order abstract syntax *)
and ('a, 'm) gexpr =
(* Constructors common to all ASTs *)
| ELit : lit -> ('a, 'm) gexpr
| ELit : 'a glit -> ('a, 'm) gexpr
| EApp : ('a, 'm) marked_gexpr * ('a, 'm) marked_gexpr list -> ('a, 'm) gexpr
| EOp : operator -> ('a, 'm) gexpr
| EArray : ('a, 'm) marked_gexpr list -> ('a, 'm) gexpr