st/lama_byterun
1
0
Fork 0
mirror of https://github.com/ProgramSnail/Lama.git synced 2025-12-05 22:38:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better scoping in repeat/for, lazy expression (no implicit import yet)

Browse source
This commit is contained in:
Dmitry Boulytchev 2020-02-14 08:13:52 +03:00
parent cf78cd20e3
commit 556ce81106
11 changed files with 42 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
regression/orig/test103.log
View file

@ -1,3 +1 @@
> > > 0
0
5
> > > 5

10
regression/orig/test104.log Normal file
View file

@ -0,0 +1,10 @@
> 0
1
2
3
4
5
6
7
8
9

4
regression/test068.expr
View file

@ -1,4 +1,4 @@
fun lazy (f) {
fun makeLazy (f) {
local flag = 0, value = 0;
return fun () {
@ -12,7 +12,7 @@ fun lazy (f) {
}
}
local l = lazy (fun () {write (1); return 800});
local l = makeLazy (fun () {write (1); return 800});
local x = read ();
write (l ());

4
regression/test099.expr
View file

@ -1,4 +1,4 @@
fun lazy (f) {
fun makeLazy (f) {
local flag = 0, value = 0;
fun () {
@ -12,7 +12,7 @@ fun lazy (f) {
}
}
local l = lazy (fun () {write (1); 800});
local l = makeLazy (fun () {write (1); 800});
local x = read ();
write (l ());

8
regression/test103.expr
View file

@ -1,4 +1,8 @@
local x;
repeat
local n = read ();
write (n)
until n > 0
x := n
until n > 0;
write (x)

5
regression/test104.expr Normal file
View file

@ -0,0 +1,5 @@
local n = read ();
for local i; i := 0, i<10, i := i + 1 do
write (i)
od

1
regression/test104.input Normal file
View file

@ -0,0 +1 @@
5

2
src/Driver.ml
View file

@ -14,7 +14,7 @@ let parse cmd =
"case"; "of"; "esac"; "when";
"boxed"; "unboxed"; "string"; "sexp"; "array";
"infix"; "infixl"; "infixr"; "at"; "before"; "after";
"true"; "false"]
"true"; "false"; "lazy"]
in
Util.parse
(object

12
src/Language.ml
View file

@ -731,8 +731,14 @@ module Expr =
| %"while" e:parse[def][infix][Val] %"do" s:scope[def][infix][Void][parse def]
=> {isVoid atr} => %"od" {materialize atr (While (e, s))}
| %"for" i:parse[def][infix][Void] "," c:parse[def][infix][Val] "," s:parse[def][infix][Void] %"do" b:scope[def][infix][Void][parse def] => {isVoid atr} => %"od"
{materialize atr (Seq (i, While (c, Seq (b, s))))}
| %"for" i:scope[def][infix][Void][parse def] ","
c:parse[def][infix][Val] ","
s:parse[def][infix][Void] %"do" b:scope[def][infix][Void][parse def] => {isVoid atr} => %"od"
{materialize atr
(match i with
| Scope (defs, i) -> Scope (defs, Seq (i, While (c, Seq (b, s))))
| _ -> Seq (i, While (c, Seq (b, s))))
}
| %"repeat" s:scope[def][infix][Void][parse def] %"until" e:basic[def][infix][Val] => {isVoid atr} => {
materialize atr @@
@ -754,6 +760,8 @@ module Expr =
| %"case" l:$ e:parse[def][infix][Val] %"of" bs:!(Util.listBy)[ostap ("|")][ostap (!(Pattern.parse) -"->" scope[def][infix][atr][parse def])] %"esac"
{Case (e, bs, l#coord, atr)}
| l:$ %"lazy" e:basic[def][infix][Val] => {notRef atr} :: (not_a_reference l) => {ignore atr (Call (Var "makeLazy", [Lambda ([], e)]))}
| -"(" parse[def][infix][atr] -")"
)

2
stdlib/Lazy.expr
View file

@ -1,4 +1,4 @@
public fun lazy (f) {
public fun makeLazy (f) {
local value, set = false;
fun () {