ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-09-22 07:59:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up the vale test.

Browse Source
This commit is contained in:
Elliot Glaysher 2018-08-20 16:34:45 -07:00
parent 17e3279321
commit eca03bf6eb
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gen/ford-turbo.hoon
View File

@ -106,7 +106,7 @@
test-bunt
test-volt
test-vale
:: test-vale-error :: broken until type system is fixed
test-vale-error
test-cast
test-cast-grow
test-mute
@ -5223,12 +5223,14 @@
::
^= moves
:~ :* duct=~[/path] %give %made ~1234.5.6 %complete %error
:- %leaf
%+ weld
"ford: %vale failed: invalid input for mark: "
"/~nul/home/~1234.5.6/mar/foo/hoon"
~
== == ==
:~ :- %leaf
%+ weld
"ford: %vale failed: invalid input for mark: "
"/~nul/home/~1234.5.6/mar/foo/hoon"
::
:- %leaf
"ford: %call execution failed:"
== == == ==
::
;: weld
results1

25
sys/vane/ford.hoon
View File

@ -4548,11 +4548,18 @@
?~ call-result
(return-blocks [call-build]~)
::
?. ?=([~ %success %call *] call-result)
(wrap-error call-result)
?: ?=([~ %error *] call-result)
::
%- return-error
=/ =beam
[[ship.disc desk.disc %da date.build] spur.rail.u.path-result]
:* :- %leaf
"ford: %vale failed: invalid input for mark: {<(en-beam beam)>}"
message.u.call-result
==
::
?> ?=([~ %success %call *] call-result)
=/ product=vase vase.u.call-result
~& [%call-result u.call-result]
:: +grab might produce the wrong type
::
?. (~(nest ut p.mark-sample) | p.product)
@ -4560,17 +4567,11 @@
:~ leaf+"ford: %vale failed"
leaf+"+grab has wrong type in mark {<mark>} on disc {<disc>}"
==
:: check mold idempotence; if different, nest fail
::
?: =(q.product input)
=/ =build-result
[%success %vale [mark p.mark-sample q.product]]
::
(return-result build-result)
=/ =build-result
[%success %vale [mark p.mark-sample q.product]]
::
%- return-error
=/ =beam [[ship.disc desk.disc %da date.build] spur.rail.u.path-result]
[leaf+"ford: %vale failed: invalid input for mark: {<(en-beam beam)>}"]~
(return-result build-result)
::
++ make-walk
~% %make-walk ..^^$ ~