diff options
Diffstat (limited to 'src/boot/fe')
| -rw-r--r-- | src/boot/fe/ast.ml | 13 | ||||
| -rw-r--r-- | src/boot/fe/item.ml | 18 | ||||
| -rw-r--r-- | src/boot/fe/lexer.mll | 1 | ||||
| -rw-r--r-- | src/boot/fe/token.ml | 2 |
4 files changed, 34 insertions, 0 deletions
diff --git a/src/boot/fe/ast.ml b/src/boot/fe/ast.ml index 6e6483e3..b3a13df8 100644 --- a/src/boot/fe/ast.ml +++ b/src/boot/fe/ast.ml @@ -415,6 +415,7 @@ and mod_item' = | MOD_ITEM_mod of (mod_view * mod_items) | MOD_ITEM_fn of fn | MOD_ITEM_obj of obj + | MOD_ITEM_const of (ty * expr option) and mod_item_decl = { @@ -1438,6 +1439,18 @@ and fmt_mod_item (ff:Format.formatter) (id:ident) (item:mod_item) : unit = | MOD_ITEM_obj obj -> fmt_obj ff id params obj + + | MOD_ITEM_const (ty,e) -> + fmt ff "const "; + fmt_ty ff ty; + begin + match e with + None -> () + | Some e -> + fmt ff " = "; + fmt_expr ff e + end; + fmt ff ";" end and fmt_import (ff:Format.formatter) (ident:ident) (name:name) : unit = diff --git a/src/boot/fe/item.ml b/src/boot/fe/item.ml index a74952cc..3bf61f8c 100644 --- a/src/boot/fe/item.ml +++ b/src/boot/fe/item.ml @@ -19,6 +19,13 @@ let rec parse_expr (ps:pstate) : (Ast.stmt array * Ast.expr) = let pexp = ctxt "expr" Pexp.parse_pexp ps in Pexp.desugar_expr ps pexp +and parse_prim_expr (ps:pstate) : Ast.expr = + let pexp = ctxt "expr" Pexp.parse_pexp ps in + let (stmts, expr) = Pexp.desugar_expr ps pexp in + if Array.length stmts = 0 + then expr + else raise (Parse_err (ps, "expected primitive expression")) + and parse_expr_atom (ps:pstate) : (Ast.stmt array * Ast.atom) = let pexp = ctxt "expr" Pexp.parse_pexp ps in Pexp.desugar_expr_atom ps pexp @@ -944,6 +951,17 @@ and parse_mod_item (ps:pstate) (decl params (Ast.MOD_ITEM_fn fn))) |] end + | CONST -> + bump ps; + let ty = Pexp.parse_ty ps in + let ident = Pexp.parse_ident ps in + expect ps EQ; + let expr = parse_prim_expr ps in + expect ps SEMI; + let bpos = lexpos ps in + [| (ident, span ps apos bpos + (decl [||] (Ast.MOD_ITEM_const (ty, Some expr)))) |] + | MOD -> bump ps; let (ident, params) = parse_ident_and_params ps "mod" in diff --git a/src/boot/fe/lexer.mll b/src/boot/fe/lexer.mll index af8eab6a..58b27ec1 100644 --- a/src/boot/fe/lexer.mll +++ b/src/boot/fe/lexer.mll @@ -110,6 +110,7 @@ ("export", EXPORT); ("let", LET); + ("const", CONST); ("log", LOG); ("spawn", SPAWN); diff --git a/src/boot/fe/token.ml b/src/boot/fe/token.ml index 64aef2a4..e6f8cd4b 100644 --- a/src/boot/fe/token.ml +++ b/src/boot/fe/token.ml @@ -93,6 +93,7 @@ type token = (* Value / stmt declarators *) | LET + | CONST (* Magic runtime services *) | LOG @@ -246,6 +247,7 @@ let rec string_of_tok t = (* Value / stmt declarators. *) | LET -> "let" + | CONST -> "const" (* Magic runtime services *) | LOG -> "log" |