urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-05 19:46:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Put the source disc in +scaffold

Browse Source
This commit is contained in:
Elliot Glaysher 2018-05-21 10:58:59 -07:00
parent 30ecfc50b7
commit 1647f60213
2 changed files with 59 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
gen/ford-turbo.hoon
View File

@ -210,11 +210,17 @@
:- :- [1 19] :- :- [1 19]
:- ~ :- ~
:_ [[1 19] ""] :_ [[1 19] ""]
:* %309 ~ ~ ~ ^- scaffold:ford-gate
:* %direct %dbug [/~nul/desk/~1234.5.6/bar/foo [[1 1] [1 19]]] :* source-disc=[~nul %desk]
(ream '!. |=(a=@ud +(a))') zuse-version=%309
== structures=~
~ libraries=~
cranes=~
^= sources
:* %direct %dbug [/~nul/desk/~1234.5.6/bar/foo [[1 1] [1 19]]]
(ream '!. |=(a=@ud +(a))')
==
~
== ==
%+ (full (parse-scaffold:ford-gate [[~nul %desk %da ~1234.5.6] /foo/bar])) %+ (full (parse-scaffold:ford-gate [[~nul %desk %da ~1234.5.6] /foo/bar]))
[1 1] [1 1]
@ -233,7 +239,8 @@
[%leaf "failed to parse at {<p.parsed>}"]~ [%leaf "failed to parse at {<p.parsed>}"]~
%- expect-eq !> %- expect-eq !>
:_ p.u.q.parsed :_ p.u.q.parsed
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
cranes=~ cranes=~
@ -258,7 +265,8 @@
[%leaf "failed to parse at {<p.parsed>}"]~ [%leaf "failed to parse at {<p.parsed>}"]~
%- expect-eq !> %- expect-eq !>
:_ p.u.q.parsed :_ p.u.q.parsed
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~[[`%struct %struct] [`%face %other]] structures=~[[`%struct %struct] [`%face %other]]
libraries=~[[`%library %library] [~ %thing]] libraries=~[[`%library %library] [~ %thing]]
cranes=~ cranes=~
@ -284,7 +292,8 @@
[%leaf "failed to parse at {<p.parsed>}"]~ [%leaf "failed to parse at {<p.parsed>}"]~
%- expect-eq !> %- expect-eq !>
:_ p.u.q.parsed :_ p.u.q.parsed
:* zuse-version=400 :* source-disc=[~nul %desk]
zuse-version=400
structures=~ structures=~
libraries=~ libraries=~
cranes=~ cranes=~
@ -310,7 +319,8 @@
[%leaf "failed to parse at {<p.parsed>}"]~ [%leaf "failed to parse at {<p.parsed>}"]~
%- expect-eq !> %- expect-eq !>
:_ p.u.q.parsed :_ p.u.q.parsed
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
^= crane ^= crane
@ -341,7 +351,8 @@
[%leaf "failed to parse at {<p.parsed>}"]~ [%leaf "failed to parse at {<p.parsed>}"]~
%- expect-eq !> %- expect-eq !>
:_ p.u.q.parsed :_ p.u.q.parsed
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
^= crane ^= crane
@ -373,7 +384,8 @@
[%leaf "failed to parse at {<p.parsed>}"]~ [%leaf "failed to parse at {<p.parsed>}"]~
%- expect-eq !> %- expect-eq !>
:_ p.u.q.parsed :_ p.u.q.parsed
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
^= crane ^= crane
@ -405,7 +417,8 @@
[%leaf "failed to parse at {<p.parsed>}"]~ [%leaf "failed to parse at {<p.parsed>}"]~
%- expect-eq !> %- expect-eq !>
:_ p.u.q.parsed :_ p.u.q.parsed
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
^= crane ^= crane
@ -434,7 +447,8 @@
[%leaf "failed to parse at {<p.parsed>}"]~ [%leaf "failed to parse at {<p.parsed>}"]~
%- expect-eq !> %- expect-eq !>
:_ p.u.q.parsed :_ p.u.q.parsed
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
^= crane ^= crane
@ -472,7 +486,8 @@
[%leaf "failed to parse at {<p.parsed>}"]~ [%leaf "failed to parse at {<p.parsed>}"]~
%- expect-eq !> %- expect-eq !>
:_ p.u.q.parsed :_ p.u.q.parsed
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
^= crane ^= crane
@ -506,7 +521,8 @@
[%leaf "failed to parse at {<p.parsed>}"]~ [%leaf "failed to parse at {<p.parsed>}"]~
%- expect-eq !> %- expect-eq !>
:_ p.u.q.parsed :_ p.u.q.parsed
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
^= crane ^= crane
@ -533,7 +549,8 @@
[%leaf "failed to parse at {<p.parsed>}"]~ [%leaf "failed to parse at {<p.parsed>}"]~
%- expect-eq !> %- expect-eq !>
:_ p.u.q.parsed :_ p.u.q.parsed
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
^= crane ^= crane
@ -562,7 +579,8 @@
[%leaf "failed to parse at {<p.parsed>}"]~ [%leaf "failed to parse at {<p.parsed>}"]~
%- expect-eq !> %- expect-eq !>
:_ p.u.q.parsed :_ p.u.q.parsed
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
^= crane ^= crane
@ -589,7 +607,8 @@
[%leaf "failed to parse at {<p.parsed>}"]~ [%leaf "failed to parse at {<p.parsed>}"]~
%- expect-eq !> %- expect-eq !>
:_ p.u.q.parsed :_ p.u.q.parsed
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
^= crane ^= crane
@ -625,7 +644,8 @@
[%leaf "failed to parse at {<p.parsed>}"]~ [%leaf "failed to parse at {<p.parsed>}"]~
%- expect-eq !> %- expect-eq !>
:_ p.u.q.parsed :_ p.u.q.parsed
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
^= crane ^= crane
@ -656,7 +676,8 @@
[%leaf "failed to parse at {<p.parsed>}"]~ [%leaf "failed to parse at {<p.parsed>}"]~
%- expect-eq !> %- expect-eq !>
:_ p.u.q.parsed :_ p.u.q.parsed
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
^= crane ^= crane
@ -694,7 +715,8 @@
[%leaf "failed to parse at {<p.parsed>}"]~ [%leaf "failed to parse at {<p.parsed>}"]~
%- expect-eq !> %- expect-eq !>
:_ p.u.q.parsed :_ p.u.q.parsed
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
^= crane ^= crane
@ -720,7 +742,8 @@
[%leaf "failed to parse at {<p.parsed>}"]~ [%leaf "failed to parse at {<p.parsed>}"]~
%- expect-eq !> %- expect-eq !>
:_ p.u.q.parsed :_ p.u.q.parsed
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
^= crane ^= crane
@ -2245,7 +2268,8 @@
:: ::
^= moves ^= moves
:~ :* duct=~[/hood] %give %made ~1234.5.6 %complete %success %hood :~ :* duct=~[/hood] %give %made ~1234.5.6 %complete %success %hood
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
cranes=~ cranes=~
@ -3915,6 +3939,7 @@
%plan %plan
source-path=[[~nul %home] /bar/foo] source-path=[[~nul %home] /bar/foo]
query-string=`coin`[%$ *dime] query-string=`coin`[%$ *dime]
source-disc=[~nul %desk]
zuse-version=309 zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
@ -4423,7 +4448,8 @@
:* duct=~[/path] type=~ %make ~nul :* duct=~[/path] type=~ %make ~nul
%pin ~1234.5.6 %pin ~1234.5.6
:* %plan [[~nul %home] /hoon/other/lib] *coin :* %plan [[~nul %home] /hoon/other/lib] *coin
:* zuse-version=309 :* source-disc=[~nul %desk]
zuse-version=309
structures=~ structures=~
libraries=~ libraries=~
cranes=[%fsts %data [%fszp %noun]]~ cranes=[%fsts %data [%fszp %noun]]~

19
lib/ford-turbo.hoon
View File

@ -345,11 +345,6 @@
:: of the hoon source which generated the scaffold, but can be :: of the hoon source which generated the scaffold, but can be
:: changed with `/:`.) :: changed with `/:`.)
:: ::
:: TODO: We may need to keep the original source-path for
:: resolving the disc in +gather-path-builds because we don't
:: want to prevent `/: /other-ship/other-desk/=/` from changing
:: where we load hoon renderers from.
::
path-to-render=rail path-to-render=rail
:: query-string: the query string of the http request :: query-string: the query string of the http request
:: ::
@ -452,7 +447,10 @@
:: built and combined into one final product. :: built and combined into one final product.
:: ::
+= scaffold += scaffold
$: :: zuse-version: the kelvin version of the standard library $: :: source-disc: the ship/desk this scaffold was parsed from
::
source-disc=disc
:: zuse-version: the kelvin version of the standard library
:: ::
zuse-version=@ud zuse-version=@ud
:: structures: files from %/sur which are included :: structures: files from %/sur which are included
@ -1402,7 +1400,10 @@
:: ::
=/ hoon-parser (vang & (en-beam src-beam)) =/ hoon-parser (vang & (en-beam src-beam))
|^ :: |^ ::
%+ cook |=(a=scaffold a) %+ cook
|= a=[@ud (list ^cable) (list ^cable) (list ^crane) (list ^brick)]
^- scaffold
[[p q]:src-beam a]
:: ::
%+ ifix [gay gay] %+ ifix [gay gay]
;~ plug ;~ plug
@ -3035,9 +3036,7 @@
++ make-plan ++ make-plan
|= [path-to-render=rail query-string=coin =scaffold] |= [path-to-render=rail query-string=coin =scaffold]
^- build-receipt ^- build-receipt
:: TODO: support cranes
:: TODO: support query-string :: TODO: support query-string
:: TODO: support source-path
:: TODO: support indirect hoons :: TODO: support indirect hoons
:: ::
:: blocks: accumulator for blocked sub-builds :: blocks: accumulator for blocked sub-builds
@ -3341,7 +3340,7 @@
%+ turn imports %+ turn imports
|= [prefix=?(%sur %lib) =cable] |= [prefix=?(%sur %lib) =cable]
^- ^build ^- ^build
[date.build [%path disc.path-to-render prefix file-path.cable]] [date.build [%path source-disc.scaffold prefix file-path.cable]]
:: +resolve-builds: run a list of builds and collect results :: +resolve-builds: run a list of builds and collect results
:: ::
:: If a build blocks, put its +tang in :error-message and stop. :: If a build blocks, put its +tang in :error-message and stop.