mirror of
https://github.com/kanaka/mal.git
synced 2024-09-11 13:55:55 +03:00
refactor atoms out of step4 and step5
also inline step4-and-5-specific versions of env.jq and interp.jq
This commit is contained in:
AnotherTest
parent
c7714aca17
commit
413107d1e6
10
jq/env.jq
10
jq/env.jq
@ -253,7 +253,7 @@ def env_set_(env; key; value):
|
||||
env_set(env; key; value)
|
||||
end;
|
||||
|
||||
def addToEnv6(envexp; name):
|
||||
def addToEnv(envexp; name):
|
||||
envexp.expr as $value
|
||||
| envexp.env as $rawEnv
|
||||
| (if $rawEnv.isReplEnv then
|
||||
@ -266,14 +266,6 @@ def addToEnv6(envexp; name):
|
||||
env: $newEnv
|
||||
};
|
||||
|
||||
def addToEnv(envexp; name):
|
||||
if envexp.env.replEnv != null then
|
||||
addToEnv6(envexp; name)
|
||||
else {
|
||||
expr: envexp.expr,
|
||||
env: env_set_(envexp.env; name; envexp.expr)
|
||||
} end;
|
||||
|
||||
def _env_remove_references(refs):
|
||||
if . != null then
|
||||
{
|
||||
|
||||
31
jq/interp.jq
31
jq/interp.jq
@ -22,17 +22,7 @@ def extractReplEnv(env):
|
||||
def extractEnv(env):
|
||||
env | .currentEnv // .;
|
||||
|
||||
def hasReplEnv(env):
|
||||
env | has("replEnv");
|
||||
|
||||
def cWrapEnv(renv; atoms; cond):
|
||||
if cond then
|
||||
wrapEnv(renv; atoms)
|
||||
else
|
||||
.
|
||||
end;
|
||||
|
||||
def cUpdateReplEnv(renv; cond):
|
||||
def updateReplEnv(renv):
|
||||
def findpath:
|
||||
if .env.parent then
|
||||
.path += ["parent"] |
|
||||
@ -41,12 +31,8 @@ def cUpdateReplEnv(renv; cond):
|
||||
else
|
||||
.path
|
||||
end;
|
||||
if cond then
|
||||
({ env: ., path: [] } | findpath) as $path |
|
||||
setpath($path; renv)
|
||||
else
|
||||
.
|
||||
end;
|
||||
({ env: ., path: [] } | findpath) as $path |
|
||||
setpath($path; renv);
|
||||
|
||||
def extractCurrentReplEnv(env):
|
||||
def findpath:
|
||||
@ -85,19 +71,18 @@ def addFrees(newEnv; frees):
|
||||
def interpret(arguments; env; _eval):
|
||||
extractReplEnv(env) as $replEnv |
|
||||
extractAtoms(env) as $envAtoms |
|
||||
hasReplEnv(env) as $hasReplEnv |
|
||||
(if $DEBUG then _debug("INTERP: \(. | pr_str(env))") else . end) |
|
||||
(select(.kind == "fn") |
|
||||
arg_check(arguments) |
|
||||
(select(.function == "eval") |
|
||||
# special function
|
||||
{ expr: arguments[0], env: $replEnv|cWrapEnv($replEnv; $envAtoms; $hasReplEnv) }
|
||||
{ expr: arguments[0], env: $replEnv|wrapEnv($replEnv; $envAtoms) }
|
||||
| _eval
|
||||
| .env as $xenv
|
||||
| extractReplEnv($xenv) as $xreplenv
|
||||
| setpath(
|
||||
["env", "currentEnv"];
|
||||
extractEnv(env) | cUpdateReplEnv($xreplenv; $hasReplEnv))
|
||||
extractEnv(env) | updateReplEnv($xreplenv))
|
||||
) //
|
||||
(select(.function == "reset!") |
|
||||
# env modifying function
|
||||
@ -170,7 +155,7 @@ def interpret(arguments; env; _eval):
|
||||
env_multiset($fnEnv; $fn.names; $fn) as $fnEnv |
|
||||
{
|
||||
env: env_multiset($fnEnv; $fn.names; $fn)
|
||||
| cWrapEnv($replEnv; $envAtoms; $hasReplEnv),
|
||||
| wrapEnv($replEnv; $envAtoms),
|
||||
expr: $fn.body
|
||||
}
|
||||
| . as $dot
|
||||
@ -182,8 +167,8 @@ def interpret(arguments; env; _eval):
|
||||
{
|
||||
expr: .expr,
|
||||
env: extractEnv(env)
|
||||
| cUpdateReplEnv($xreplenv; $hasReplEnv)
|
||||
| cWrapEnv($xreplenv; $envexp.env.atoms; $hasReplEnv)
|
||||
| updateReplEnv($xreplenv)
|
||||
| wrapEnv($xreplenv; $envexp.env.atoms)
|
||||
}
|
||||
# | . as $dot
|
||||
# | _debug("FNPOST " + (.expr | pr_str) + " " + (env_req($dot.expr.env; $fn.binds[0]) | pr_str))
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
include "reader";
|
||||
include "printer";
|
||||
include "utils";
|
||||
include "interp";
|
||||
include "env";
|
||||
include "core";
|
||||
|
||||
def read_line:
|
||||
@ -13,6 +11,374 @@ def read_line:
|
||||
def READ:
|
||||
read_str | read_form | .value;
|
||||
|
||||
# Environment Functions
|
||||
|
||||
def childEnv(binds; exprs):
|
||||
{
|
||||
parent: .,
|
||||
fallback: null,
|
||||
environment: [binds, exprs] | transpose | (
|
||||
. as $dot | reduce .[] as $item (
|
||||
{ value: [], seen: false, name: null, idx: 0 };
|
||||
if $item[1] != null then
|
||||
if .seen then
|
||||
{
|
||||
value: (.value[1:-1] + (.value|last[1].value += [$item[1]])),
|
||||
seen: true,
|
||||
name: .name
|
||||
}
|
||||
else
|
||||
if $item[0] == "&" then
|
||||
$dot[.idx+1][0] as $name | {
|
||||
value: (.value + [[$name, {kind:"list", value: [$item[1]]}]]),
|
||||
seen: true,
|
||||
name: $name
|
||||
}
|
||||
else
|
||||
{
|
||||
value: (.value + [$item]),
|
||||
seen: false,
|
||||
name: null
|
||||
}
|
||||
end
|
||||
end | (.idx |= .idx + 1)
|
||||
else
|
||||
if $item[0] == "&" then
|
||||
$dot[.idx+1][0] as $name | {
|
||||
value: (.value + [[$name, {kind:"list", value: []}]]),
|
||||
seen: true,
|
||||
name: $name
|
||||
}
|
||||
else . end
|
||||
end
|
||||
)
|
||||
) | .value | map({(.[0]): .[1]}) | add
|
||||
};
|
||||
|
||||
def pureChildEnv:
|
||||
{
|
||||
parent: .,
|
||||
environment: {},
|
||||
fallback: null
|
||||
};
|
||||
|
||||
def rootEnv:
|
||||
{
|
||||
parent: null,
|
||||
fallback: null,
|
||||
environment: {}
|
||||
};
|
||||
|
||||
def inform_function(name):
|
||||
(.names += [name]) | (.names |= unique);
|
||||
|
||||
def inform_function_multi(names):
|
||||
. as $dot | reduce names[] as $name(
|
||||
$dot;
|
||||
inform_function($name)
|
||||
);
|
||||
|
||||
def env_multiset(keys; value):
|
||||
(if value.kind == "function" then # multiset not allowed on atoms
|
||||
value | inform_function_multi(keys)
|
||||
else
|
||||
value
|
||||
end) as $value | {
|
||||
parent: .parent,
|
||||
environment: (
|
||||
.environment + (reduce keys[] as $key(.environment; .[$key] |= value))
|
||||
),
|
||||
fallback: .fallback
|
||||
};
|
||||
|
||||
def env_multiset(env; keys; value):
|
||||
env | env_multiset(keys; value);
|
||||
|
||||
def env_set($key; $value):
|
||||
(if $value.kind == "function" or $value.kind == "atom" then
|
||||
# inform the function/atom of its names
|
||||
($value |
|
||||
if $value.kind == "atom" then
|
||||
# check if the one we have is newer
|
||||
env_req(env; key) as $ours |
|
||||
if $ours.last_modified > $value.last_modified then
|
||||
$ours
|
||||
else
|
||||
# update modification timestamp
|
||||
$value | .last_modified |= now
|
||||
end
|
||||
else
|
||||
.
|
||||
end) | inform_function($key)
|
||||
else
|
||||
$value
|
||||
end) as $value | {
|
||||
parent: .parent,
|
||||
environment: (.environment + (.environment | .[$key] |= $value)), # merge together, as .environment[key] |= value does not work
|
||||
fallback: .fallback
|
||||
};
|
||||
|
||||
def env_dump_keys:
|
||||
def _dump1:
|
||||
.environment // {} | keys;
|
||||
if . == null then [] else
|
||||
if .parent == null then
|
||||
(
|
||||
_dump1 +
|
||||
(.fallback | env_dump_keys)
|
||||
)
|
||||
else
|
||||
(
|
||||
_dump1 +
|
||||
(.parent | env_dump_keys) +
|
||||
(.fallback | env_dump_keys)
|
||||
)
|
||||
end | unique
|
||||
end;
|
||||
|
||||
def env_find(env):
|
||||
if env.environment[.] == null then
|
||||
if env.parent then
|
||||
env_find(env.parent) // if env.fallback then env_find(env.fallback) else null end
|
||||
else
|
||||
null
|
||||
end
|
||||
else
|
||||
env
|
||||
end;
|
||||
|
||||
def env_get(env):
|
||||
. as $key | $key | env_find(env).environment[$key] as $value |
|
||||
if $value == null then
|
||||
jqmal_error("'\($key)' not found")
|
||||
else
|
||||
if $value.kind == "atom" then
|
||||
$value.identity as $id |
|
||||
$key | env_find(env.parent).environment[$key] as $possibly_newer |
|
||||
if $possibly_newer.identity == $id and $possibly_newer.last_modified > $value.last_modified then
|
||||
$possibly_newer
|
||||
else
|
||||
$value
|
||||
end
|
||||
else
|
||||
$value
|
||||
end
|
||||
end;
|
||||
|
||||
def env_get(env; key):
|
||||
key | env_get(env);
|
||||
|
||||
def env_req(env; key):
|
||||
key as $key | key | env_find(env).environment[$key] as $value |
|
||||
if $value == null then
|
||||
null
|
||||
else
|
||||
if $value.kind == "atom" then
|
||||
$value.identity as $id |
|
||||
$key | env_find(env.parent).environment[$key] as $possibly_newer |
|
||||
if $possibly_newer.identity == $id and $possibly_newer.last_modified > $value.last_modified then
|
||||
$possibly_newer
|
||||
else
|
||||
$value
|
||||
end
|
||||
else
|
||||
$value
|
||||
end
|
||||
end;
|
||||
|
||||
def env_set(env; $key; $value):
|
||||
(if $value.kind == "function" or $value.kind == "atom" then
|
||||
# inform the function/atom of its names
|
||||
$value | (.names += [$key]) | (.names |= unique) |
|
||||
if $value.kind == "atom" then
|
||||
# check if the one we have is newer
|
||||
env_req(env; $key) as $ours |
|
||||
if $ours.last_modified > $value.last_modified then
|
||||
$ours
|
||||
else
|
||||
# update modification timestamp
|
||||
$value | .last_modified |= now
|
||||
end
|
||||
else
|
||||
.
|
||||
end
|
||||
else
|
||||
$value
|
||||
end) as $value | {
|
||||
parent: env.parent,
|
||||
environment: ((env.environment // jqmal_error("Environment empty in \(env | keys)")) + (env.environment | .[$key] |= $value)), # merge together, as env.environment[key] |= value does not work
|
||||
fallback: env.fallback
|
||||
};
|
||||
|
||||
def env_setfallback(env; fallback):
|
||||
{
|
||||
parent: env.parent,
|
||||
fallback: fallback,
|
||||
environment: env.environment
|
||||
};
|
||||
|
||||
def addEnv(env):
|
||||
{
|
||||
expr: .,
|
||||
env: env
|
||||
};
|
||||
|
||||
def addToEnv(env; name; expr):
|
||||
{
|
||||
expr: expr,
|
||||
env: env_set(env; name; expr)
|
||||
};
|
||||
|
||||
|
||||
def wrapEnv(atoms):
|
||||
{
|
||||
replEnv: .,
|
||||
currentEnv: .,
|
||||
atoms: atoms,
|
||||
isReplEnv: true
|
||||
};
|
||||
|
||||
def wrapEnv(replEnv; atoms):
|
||||
{
|
||||
replEnv: replEnv,
|
||||
currentEnv: .,
|
||||
atoms: atoms, # id -> value
|
||||
isReplEnv: (replEnv == .) # should we allow separate copies?
|
||||
};
|
||||
|
||||
def unwrapReplEnv:
|
||||
.replEnv;
|
||||
|
||||
def unwrapCurrentEnv:
|
||||
.currentEnv;
|
||||
|
||||
def env_set6(env; key; value):
|
||||
if env.isReplEnv then
|
||||
env_set(env.currentEnv; key; value) | wrapEnv(env.atoms)
|
||||
else
|
||||
env_set(env.currentEnv; key; value) | wrapEnv(env.replEnv; env.atoms)
|
||||
end;
|
||||
|
||||
def env_set_(env; key; value):
|
||||
if env.currentEnv != null then
|
||||
env_set6(env; key; value)
|
||||
else
|
||||
env_set(env; key; value)
|
||||
end;
|
||||
|
||||
def addToEnv6(envexp; name):
|
||||
envexp.expr as $value
|
||||
| envexp.env as $rawEnv
|
||||
| (if $rawEnv.isReplEnv then
|
||||
env_set_($rawEnv.currentEnv; name; $value) | wrapEnv($rawEnv.atoms)
|
||||
else
|
||||
env_set_($rawEnv.currentEnv; name; $value) | wrapEnv($rawEnv.replEnv; $rawEnv.atoms)
|
||||
end) as $newEnv
|
||||
| {
|
||||
expr: $value,
|
||||
env: $newEnv
|
||||
};
|
||||
|
||||
def addToEnv(envexp; name):
|
||||
if envexp.env.replEnv != null then
|
||||
addToEnv6(envexp; name)
|
||||
else {
|
||||
expr: envexp.expr,
|
||||
env: env_set_(envexp.env; name; envexp.expr)
|
||||
} end;
|
||||
|
||||
def _env_remove_references(refs):
|
||||
if . != null then
|
||||
{
|
||||
environment: (.environment | to_entries | map(select(.key as $key | refs | contains([$key]) | not)) | from_entries),
|
||||
parent: (.parent | _env_remove_references(refs)),
|
||||
fallback: (.fallback | _env_remove_references(refs))
|
||||
}
|
||||
else . end;
|
||||
|
||||
def env_remove_references(refs):
|
||||
. as $env
|
||||
| if has("replEnv") then
|
||||
.currentEnv |= _env_remove_references(refs)
|
||||
else
|
||||
_env_remove_references(refs)
|
||||
end;
|
||||
|
||||
# Evaluation
|
||||
|
||||
def arg_check(args):
|
||||
if .inputs < 0 then
|
||||
if (abs(.inputs) - 1) > (args | length) then
|
||||
jqmal_error("Invalid number of arguments (expected at least \(abs(.inputs) - 1), got \(args|length))")
|
||||
else
|
||||
.
|
||||
end
|
||||
else if .inputs != (args|length) then
|
||||
jqmal_error("Invalid number of arguments (expected \(.inputs), got \(args|length))")
|
||||
else
|
||||
.
|
||||
end end;
|
||||
|
||||
def addFrees(newEnv; frees):
|
||||
. as $env
|
||||
| reduce frees[] as $free (
|
||||
$env;
|
||||
. as $dot
|
||||
| env_req(newEnv; $free) as $lookup
|
||||
| if $lookup != null then
|
||||
env_set_(.; $free; $lookup)
|
||||
else
|
||||
.
|
||||
end)
|
||||
| . as $env
|
||||
| $env;
|
||||
|
||||
def interpret(arguments; env; _eval):
|
||||
(if $DEBUG then _debug("INTERP: \(. | pr_str(env))") else . end) |
|
||||
(select(.kind == "fn") |
|
||||
arg_check(arguments) |
|
||||
(core_interp(arguments; env) | addEnv(env))
|
||||
) //
|
||||
(select(.kind == "function") as $fn |
|
||||
# todo: arg_check
|
||||
(.body | pr_str(env)) as $src |
|
||||
# _debug("INTERP " + $src) |
|
||||
# _debug("FREES " + ($fn.free_referencess | tostring)) |
|
||||
env_setfallback((.env | addFrees(env; $fn.free_referencess)); env) | childEnv($fn.binds; arguments) as $fnEnv |
|
||||
# tell it about its surroundings
|
||||
(reduce $fn.free_referencess[] as $name (
|
||||
$fnEnv;
|
||||
. as $env | try env_set(
|
||||
.;
|
||||
$name;
|
||||
$name | env_get(env) | . as $xvalue
|
||||
| if $xvalue.kind == "function" then
|
||||
setpath(["free_referencess"]; $fn.free_referencess)
|
||||
else
|
||||
$xvalue
|
||||
end
|
||||
) catch $env)) as $fnEnv |
|
||||
# tell it about itself
|
||||
env_multiset($fnEnv; $fn.names; $fn) as $fnEnv |
|
||||
{
|
||||
env: env_multiset($fnEnv; $fn.names; $fn),
|
||||
expr: $fn.body
|
||||
}
|
||||
| . as $dot
|
||||
# | _debug("FNEXEC " + (.expr | pr_str) + " " + (env_req($dot.env; $fn.binds[0]) | pr_str))
|
||||
| _eval
|
||||
| . as $envexp
|
||||
|
|
||||
{
|
||||
expr: .expr,
|
||||
env: env
|
||||
}
|
||||
# | . as $dot
|
||||
# | _debug("FNPOST " + (.expr | pr_str) + " " + (env_req($dot.expr.env; $fn.binds[0]) | pr_str))
|
||||
# | _debug("INTERP " + $src + " = " + (.expr|pr_str))
|
||||
) //
|
||||
jqmal_error("Unsupported function kind \(.kind)");
|
||||
|
||||
def recurseflip(x; y):
|
||||
recurse(y; x);
|
||||
|
||||
|
||||
370
jq/step5_tco.jq
370
jq/step5_tco.jq
@ -1,8 +1,6 @@
|
||||
include "reader";
|
||||
include "printer";
|
||||
include "utils";
|
||||
include "interp";
|
||||
include "env";
|
||||
include "core";
|
||||
|
||||
def read_line:
|
||||
@ -13,6 +11,374 @@ def read_line:
|
||||
def READ:
|
||||
read_str | read_form | .value;
|
||||
|
||||
# Environment Functions
|
||||
|
||||
def childEnv(binds; exprs):
|
||||
{
|
||||
parent: .,
|
||||
fallback: null,
|
||||
environment: [binds, exprs] | transpose | (
|
||||
. as $dot | reduce .[] as $item (
|
||||
{ value: [], seen: false, name: null, idx: 0 };
|
||||
if $item[1] != null then
|
||||
if .seen then
|
||||
{
|
||||
value: (.value[1:-1] + (.value|last[1].value += [$item[1]])),
|
||||
seen: true,
|
||||
name: .name
|
||||
}
|
||||
else
|
||||
if $item[0] == "&" then
|
||||
$dot[.idx+1][0] as $name | {
|
||||
value: (.value + [[$name, {kind:"list", value: [$item[1]]}]]),
|
||||
seen: true,
|
||||
name: $name
|
||||
}
|
||||
else
|
||||
{
|
||||
value: (.value + [$item]),
|
||||
seen: false,
|
||||
name: null
|
||||
}
|
||||
end
|
||||
end | (.idx |= .idx + 1)
|
||||
else
|
||||
if $item[0] == "&" then
|
||||
$dot[.idx+1][0] as $name | {
|
||||
value: (.value + [[$name, {kind:"list", value: []}]]),
|
||||
seen: true,
|
||||
name: $name
|
||||
}
|
||||
else . end
|
||||
end
|
||||
)
|
||||
) | .value | map({(.[0]): .[1]}) | add
|
||||
};
|
||||
|
||||
def pureChildEnv:
|
||||
{
|
||||
parent: .,
|
||||
environment: {},
|
||||
fallback: null
|
||||
};
|
||||
|
||||
def rootEnv:
|
||||
{
|
||||
parent: null,
|
||||
fallback: null,
|
||||
environment: {}
|
||||
};
|
||||
|
||||
def inform_function(name):
|
||||
(.names += [name]) | (.names |= unique);
|
||||
|
||||
def inform_function_multi(names):
|
||||
. as $dot | reduce names[] as $name(
|
||||
$dot;
|
||||
inform_function($name)
|
||||
);
|
||||
|
||||
def env_multiset(keys; value):
|
||||
(if value.kind == "function" then # multiset not allowed on atoms
|
||||
value | inform_function_multi(keys)
|
||||
else
|
||||
value
|
||||
end) as $value | {
|
||||
parent: .parent,
|
||||
environment: (
|
||||
.environment + (reduce keys[] as $key(.environment; .[$key] |= value))
|
||||
),
|
||||
fallback: .fallback
|
||||
};
|
||||
|
||||
def env_multiset(env; keys; value):
|
||||
env | env_multiset(keys; value);
|
||||
|
||||
def env_set($key; $value):
|
||||
(if $value.kind == "function" or $value.kind == "atom" then
|
||||
# inform the function/atom of its names
|
||||
($value |
|
||||
if $value.kind == "atom" then
|
||||
# check if the one we have is newer
|
||||
env_req(env; key) as $ours |
|
||||
if $ours.last_modified > $value.last_modified then
|
||||
$ours
|
||||
else
|
||||
# update modification timestamp
|
||||
$value | .last_modified |= now
|
||||
end
|
||||
else
|
||||
.
|
||||
end) | inform_function($key)
|
||||
else
|
||||
$value
|
||||
end) as $value | {
|
||||
parent: .parent,
|
||||
environment: (.environment + (.environment | .[$key] |= $value)), # merge together, as .environment[key] |= value does not work
|
||||
fallback: .fallback
|
||||
};
|
||||
|
||||
def env_dump_keys:
|
||||
def _dump1:
|
||||
.environment // {} | keys;
|
||||
if . == null then [] else
|
||||
if .parent == null then
|
||||
(
|
||||
_dump1 +
|
||||
(.fallback | env_dump_keys)
|
||||
)
|
||||
else
|
||||
(
|
||||
_dump1 +
|
||||
(.parent | env_dump_keys) +
|
||||
(.fallback | env_dump_keys)
|
||||
)
|
||||
end | unique
|
||||
end;
|
||||
|
||||
def env_find(env):
|
||||
if env.environment[.] == null then
|
||||
if env.parent then
|
||||
env_find(env.parent) // if env.fallback then env_find(env.fallback) else null end
|
||||
else
|
||||
null
|
||||
end
|
||||
else
|
||||
env
|
||||
end;
|
||||
|
||||
def env_get(env):
|
||||
. as $key | $key | env_find(env).environment[$key] as $value |
|
||||
if $value == null then
|
||||
jqmal_error("'\($key)' not found")
|
||||
else
|
||||
if $value.kind == "atom" then
|
||||
$value.identity as $id |
|
||||
$key | env_find(env.parent).environment[$key] as $possibly_newer |
|
||||
if $possibly_newer.identity == $id and $possibly_newer.last_modified > $value.last_modified then
|
||||
$possibly_newer
|
||||
else
|
||||
$value
|
||||
end
|
||||
else
|
||||
$value
|
||||
end
|
||||
end;
|
||||
|
||||
def env_get(env; key):
|
||||
key | env_get(env);
|
||||
|
||||
def env_req(env; key):
|
||||
key as $key | key | env_find(env).environment[$key] as $value |
|
||||
if $value == null then
|
||||
null
|
||||
else
|
||||
if $value.kind == "atom" then
|
||||
$value.identity as $id |
|
||||
$key | env_find(env.parent).environment[$key] as $possibly_newer |
|
||||
if $possibly_newer.identity == $id and $possibly_newer.last_modified > $value.last_modified then
|
||||
$possibly_newer
|
||||
else
|
||||
$value
|
||||
end
|
||||
else
|
||||
$value
|
||||
end
|
||||
end;
|
||||
|
||||
def env_set(env; $key; $value):
|
||||
(if $value.kind == "function" or $value.kind == "atom" then
|
||||
# inform the function/atom of its names
|
||||
$value | (.names += [$key]) | (.names |= unique) |
|
||||
if $value.kind == "atom" then
|
||||
# check if the one we have is newer
|
||||
env_req(env; $key) as $ours |
|
||||
if $ours.last_modified > $value.last_modified then
|
||||
$ours
|
||||
else
|
||||
# update modification timestamp
|
||||
$value | .last_modified |= now
|
||||
end
|
||||
else
|
||||
.
|
||||
end
|
||||
else
|
||||
$value
|
||||
end) as $value | {
|
||||
parent: env.parent,
|
||||
environment: ((env.environment // jqmal_error("Environment empty in \(env | keys)")) + (env.environment | .[$key] |= $value)), # merge together, as env.environment[key] |= value does not work
|
||||
fallback: env.fallback
|
||||
};
|
||||
|
||||
def env_setfallback(env; fallback):
|
||||
{
|
||||
parent: env.parent,
|
||||
fallback: fallback,
|
||||
environment: env.environment
|
||||
};
|
||||
|
||||
def addEnv(env):
|
||||
{
|
||||
expr: .,
|
||||
env: env
|
||||
};
|
||||
|
||||
def addToEnv(env; name; expr):
|
||||
{
|
||||
expr: expr,
|
||||
env: env_set(env; name; expr)
|
||||
};
|
||||
|
||||
|
||||
def wrapEnv(atoms):
|
||||
{
|
||||
replEnv: .,
|
||||
currentEnv: .,
|
||||
atoms: atoms,
|
||||
isReplEnv: true
|
||||
};
|
||||
|
||||
def wrapEnv(replEnv; atoms):
|
||||
{
|
||||
replEnv: replEnv,
|
||||
currentEnv: .,
|
||||
atoms: atoms, # id -> value
|
||||
isReplEnv: (replEnv == .) # should we allow separate copies?
|
||||
};
|
||||
|
||||
def unwrapReplEnv:
|
||||
.replEnv;
|
||||
|
||||
def unwrapCurrentEnv:
|
||||
.currentEnv;
|
||||
|
||||
def env_set6(env; key; value):
|
||||
if env.isReplEnv then
|
||||
env_set(env.currentEnv; key; value) | wrapEnv(env.atoms)
|
||||
else
|
||||
env_set(env.currentEnv; key; value) | wrapEnv(env.replEnv; env.atoms)
|
||||
end;
|
||||
|
||||
def env_set_(env; key; value):
|
||||
if env.currentEnv != null then
|
||||
env_set6(env; key; value)
|
||||
else
|
||||
env_set(env; key; value)
|
||||
end;
|
||||
|
||||
def addToEnv6(envexp; name):
|
||||
envexp.expr as $value
|
||||
| envexp.env as $rawEnv
|
||||
| (if $rawEnv.isReplEnv then
|
||||
env_set_($rawEnv.currentEnv; name; $value) | wrapEnv($rawEnv.atoms)
|
||||
else
|
||||
env_set_($rawEnv.currentEnv; name; $value) | wrapEnv($rawEnv.replEnv; $rawEnv.atoms)
|
||||
end) as $newEnv
|
||||
| {
|
||||
expr: $value,
|
||||
env: $newEnv
|
||||
};
|
||||
|
||||
def addToEnv(envexp; name):
|
||||
if envexp.env.replEnv != null then
|
||||
addToEnv6(envexp; name)
|
||||
else {
|
||||
expr: envexp.expr,
|
||||
env: env_set_(envexp.env; name; envexp.expr)
|
||||
} end;
|
||||
|
||||
def _env_remove_references(refs):
|
||||
if . != null then
|
||||
{
|
||||
environment: (.environment | to_entries | map(select(.key as $key | refs | contains([$key]) | not)) | from_entries),
|
||||
parent: (.parent | _env_remove_references(refs)),
|
||||
fallback: (.fallback | _env_remove_references(refs))
|
||||
}
|
||||
else . end;
|
||||
|
||||
def env_remove_references(refs):
|
||||
. as $env
|
||||
| if has("replEnv") then
|
||||
.currentEnv |= _env_remove_references(refs)
|
||||
else
|
||||
_env_remove_references(refs)
|
||||
end;
|
||||
|
||||
# Evaluation
|
||||
|
||||
def arg_check(args):
|
||||
if .inputs < 0 then
|
||||
if (abs(.inputs) - 1) > (args | length) then
|
||||
jqmal_error("Invalid number of arguments (expected at least \(abs(.inputs) - 1), got \(args|length))")
|
||||
else
|
||||
.
|
||||
end
|
||||
else if .inputs != (args|length) then
|
||||
jqmal_error("Invalid number of arguments (expected \(.inputs), got \(args|length))")
|
||||
else
|
||||
.
|
||||
end end;
|
||||
|
||||
def addFrees(newEnv; frees):
|
||||
. as $env
|
||||
| reduce frees[] as $free (
|
||||
$env;
|
||||
. as $dot
|
||||
| env_req(newEnv; $free) as $lookup
|
||||
| if $lookup != null then
|
||||
env_set_(.; $free; $lookup)
|
||||
else
|
||||
.
|
||||
end)
|
||||
| . as $env
|
||||
| $env;
|
||||
|
||||
def interpret(arguments; env; _eval):
|
||||
(if $DEBUG then _debug("INTERP: \(. | pr_str(env))") else . end) |
|
||||
(select(.kind == "fn") |
|
||||
arg_check(arguments) |
|
||||
(core_interp(arguments; env) | addEnv(env))
|
||||
) //
|
||||
(select(.kind == "function") as $fn |
|
||||
# todo: arg_check
|
||||
(.body | pr_str(env)) as $src |
|
||||
# _debug("INTERP " + $src) |
|
||||
# _debug("FREES " + ($fn.free_referencess | tostring)) |
|
||||
env_setfallback((.env | addFrees(env; $fn.free_referencess)); env) | childEnv($fn.binds; arguments) as $fnEnv |
|
||||
# tell it about its surroundings
|
||||
(reduce $fn.free_referencess[] as $name (
|
||||
$fnEnv;
|
||||
. as $env | try env_set(
|
||||
.;
|
||||
$name;
|
||||
$name | env_get(env) | . as $xvalue
|
||||
| if $xvalue.kind == "function" then
|
||||
setpath(["free_referencess"]; $fn.free_referencess)
|
||||
else
|
||||
$xvalue
|
||||
end
|
||||
) catch $env)) as $fnEnv |
|
||||
# tell it about itself
|
||||
env_multiset($fnEnv; $fn.names; $fn) as $fnEnv |
|
||||
{
|
||||
env: env_multiset($fnEnv; $fn.names; $fn),
|
||||
expr: $fn.body
|
||||
}
|
||||
| . as $dot
|
||||
# | _debug("FNEXEC " + (.expr | pr_str) + " " + (env_req($dot.env; $fn.binds[0]) | pr_str))
|
||||
| _eval
|
||||
| . as $envexp
|
||||
|
|
||||
{
|
||||
expr: .expr,
|
||||
env: env
|
||||
}
|
||||
# | . as $dot
|
||||
# | _debug("FNPOST " + (.expr | pr_str) + " " + (env_req($dot.expr.env; $fn.binds[0]) | pr_str))
|
||||
# | _debug("INTERP " + $src + " = " + (.expr|pr_str))
|
||||
) //
|
||||
jqmal_error("Unsupported function kind \(.kind)");
|
||||
|
||||
def recurseflip(x; y):
|
||||
recurse(y; x);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user