st/lama_byterun
1
0
Fork 0
mirror of https://github.com/ProgramSnail/Lama.git synced 2025-12-15 11:18:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated spec

Browse source
This commit is contained in:
Dmitry Boulytchev 2020-08-10 20:55:10 +03:00
parent 6f9d0850c7
commit 94e4b16267
7 changed files with 48 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
stdlib/Data.lama
View file

@ -13,10 +13,19 @@ public infix =?= at < (x, y) {
fun alreadyEq (x, y) {
fun find (x) {
fun walk (r) {
case r of
[#unboxed] -> r
| [x] -> walk (x)
esac
fun walkrec (p1, p2, r) {
case p2 of
[_] -> p2 [0] := r
| _ -> skip
esac;
case r of
[#unboxed] -> r
| [x] -> walkrec (r, p1, x)
esac
}
walkrec ({}, {}, r)
}
case findMap (deref (m), x) of
@ -43,7 +52,14 @@ public infix =?= at < (x, y) {
if rx == ry
then true
else
rx [0] := ry;
if rx[0] < ry[0]
then
ry [0] := ry [0] + rx [0];
rx [0] := ry
else
rx [0] := rx [0] + ry [0];
ry [0] := rx
fi;
false
fi
esac
@ -63,7 +79,7 @@ public infix =?= at < (x, y) {
if alreadyEq (x, y)
then 0
else
local diff = x.rawTag - y.rawTag;
local diff = x.kindOf - y.kindOf;
if diff != 0 then diff
else