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

Parsing workaround

Browse source
This commit is contained in:
Dmitry Boulytchev 2020-01-24 22:30:49 +03:00
parent c0c18e3aa2
commit 811c24d5a6
2 changed files with 40 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Driver.ml
View file

@ -32,7 +32,7 @@ let parse cmd =
] s
end
)
(ostap (p:!(Language.parse cmd) -EOF))
(if cmd#is_workaround then ostap (p:!(Language.constparse cmd) -EOF) else ostap (p:!(Language.parse cmd) -EOF))
exception Commandline_error of string
@ -46,6 +46,9 @@ class options args =
val infile = ref (None : string option)
val paths = ref [try Sys.getenv "RC_RUNTIME" with _ -> "../runtime"]
val mode = ref (`Default : [`Default | `Eval | `SM | `Compile ])
(* Workaround until Ostap starts to memoize properly *)
val const = ref false
(* end of the workaround *)
val dump = ref 0
val help = ref false
initializer
@ -53,6 +56,9 @@ class options args =
match self#peek with
| Some opt ->
(match opt with
(* Workaround until Ostap starts to memoize properly *)
| "-w" -> self#set_workaround
(* end of the workaround *)
| "-c" -> self#set_mode `Compile
| "-I" -> (match self#peek with None -> raise (Commandline_error "path expected after '-I' specifier") | Some path -> self#add_include_path path)
| "-s" -> self#set_mode `SM
@ -68,6 +74,11 @@ class options args =
loop ()
| None -> ()
in loop ()
(* Workaround until Ostap starts to memoize properly *)
method is_workaround = !const
method private set_workaround =
const := true
(* end of the workaround *)
method private set_dump mask =
dump := !dump lor mask
method private set_infile name =

30
src/Language.ml
View file

@ -741,7 +741,23 @@ module Expr =
| -"(" parse[def][infix][atr] -")"
)
end
(* Workaround until Ostap starts to memoize properly *)
ostap (
constexpr:
n:DECIMAL {Const n}
| s:STRING {String s}
| c:CHAR {Const (Char.code c)}
| %"true" {Const 1}
| %"false" {Const 0}
| "[" es:!(Util.list0)[constexpr] "]" {Array es}
| "{" es:!(Util.list0)[constexpr] "}" {match es with [] -> Const 0 | _ -> List.fold_right (fun x acc -> Sexp ("cons", [x; acc])) es (Const 0)}
| t:UIDENT args:(-"(" !(Util.list)[constexpr] -")")? {Sexp (t, match args with None -> [] | Some args -> args)}
| l:$ x:LIDENT {Loc.attach x l#coord; Var x}
| -"(" constexpr -")"
)
(* end of the workaround *)
end
(* Infix helpers *)
module Infix =
@ -885,7 +901,7 @@ module Infix =
module Definition =
struct
(* The type for a definition: aither a function/infix, or a local variable *)
(* The type for a definition: either a function/infix, or a local variable *)
type t = string * [`Fun of string list * Expr.t | `Variable of Expr.t option]
let unopt_mod = function None -> `Local | Some m -> m
@ -910,6 +926,13 @@ module Definition =
| `Ok infix' -> unopt_mod m, op, name, infix', true
| `Fail msg -> report_error ~loc:(Some l#coord) msg
};
(* Workaround until Ostap starts to memoize properly *)
const_var: l:$ name:LIDENT "=" value:!(Expr.constexpr) {
Loc.attach name l#coord;
name, (`Public, `Variable (Some value))
};
constdef: %"public" d:!(Util.list (const_var)) ";" {d};
(* end of the workaround *)
local_var[m][infix][expr][def]: l:$ name:LIDENT value:(-"=" expr[def][infix][Expr.Val])? {
Loc.attach name l#coord;
match m, value with
@ -1051,6 +1074,9 @@ ostap (
in
is, infix
};
(* Workaround until Ostap starts to memoize properly *)
constparse[cmd]: <(is, infix)> : imports[cmd] d:!(Definition.constdef) {(is, []), Expr.Scope (d, Expr.Skip)};
(* end of the workaround *)
parse[cmd]:
<(is, infix)> : imports[cmd] <(d, infix')> : definitions[infix] expr:!(Expr.parse definitions infix' Expr.Weak)? {
(is, Infix.extract_exports infix'), Expr.Scope (d, match expr with None -> Expr.Skip | Some e -> e)