f6a4944 · wock · git.iko.soy

git.iko.soy/wock

on master help sign in

Actually fix slog

f6a4944iko2 years ago

nock/src/interpreter.rs+18−17

compare with master

unifiedsplit

@@ -323,24 +323,22 @@ fn ram(ctx: &mut InterpreterContext, tank: Rc<Noun>) -> Option<String> {

323 Noun::Cell { p, q, .. } => {

324 let tag = p.as_atom()?.to_bytes_le();

325 if tag == b"leaf" {

326− let mut bytes = crip(ctx, q.clone()).ok()?.as_atom()?.to_bytes_le();

326+ let mut bytes = crip(ctx, q.clone()).ok()?.as_bytes()?;

327 Some(String::from(str::from_utf8_mut(&mut bytes).ok()?))

328 } else if tag == b"palm" {

329− let (mid, foo) = q.as_cell()?;

329+ let (spacers, tanks) = q.as_cell()?;

330− let (open, foo) = foo.as_cell()?;

330+ let (mid, open, flat_open, close) = spacers.tuple_4()?;

331− let (flat_open, foo) = foo.as_cell()?;

332− let (close, tanks) = foo.as_cell()?;

333

331

334− let mut mid = mid.as_bytes()?;

332+ let mut mid = crip(ctx, mid.clone()).ok()?.as_bytes()?;

335 let mid = String::from(str::from_utf8_mut(&mut mid).ok()?);

333 let mid = String::from(str::from_utf8_mut(&mut mid).ok()?);

336

334

337− let mut open = open.as_bytes()?;

335+ let mut open = crip(ctx, open.clone()).ok()?.as_bytes()?;

338 let open = String::from(str::from_utf8_mut(&mut open).ok()?);

336 let open = String::from(str::from_utf8_mut(&mut open).ok()?);

339

337

340− let mut flat_open = flat_open.as_bytes()?;

338+ let mut flat_open = crip(ctx, flat_open.clone()).ok()?.as_bytes()?;

341 let flat_open = String::from(str::from_utf8_mut(&mut flat_open).ok()?);

339 let flat_open = String::from(str::from_utf8_mut(&mut flat_open).ok()?);

342

340

343− let mut close = close.as_bytes()?;

341+ let mut close = crip(ctx, close.clone()).ok()?.as_bytes()?;

344 let close = String::from(str::from_utf8_mut(&mut close).ok()?);

342 let close = String::from(str::from_utf8_mut(&mut close).ok()?);

345

343

346 let mut target = String::new();

344 let mut target = String::new();

@@ -363,17 +361,16 @@ fn ram(ctx: &mut InterpreterContext, tank: Rc<Noun>) -> Option<String> {

363

361

364 Some(target)

362 Some(target)

365 } else if tag == b"rose" {

363 } else if tag == b"rose" {

366− let (mid, foo) = q.as_cell()?;

364+ let (spacers, tanks) = q.as_cell()?;

367− let (open, foo) = foo.as_cell()?;

365+ let (mid, open, close) = spacers.tuple_3()?;

368− let (close, tanks) = foo.as_cell()?;

369

366

370− let mut mid = mid.as_bytes()?;

367+ let mut mid = crip(ctx, mid.clone()).ok()?.as_bytes()?;

371 let mid = String::from(str::from_utf8_mut(&mut mid).ok()?);

368 let mid = String::from(str::from_utf8_mut(&mut mid).ok()?);

372

369

373− let mut open = open.as_bytes()?;

370+ let mut open = crip(ctx, open.clone()).ok()?.as_bytes()?;

374 let open = String::from(str::from_utf8_mut(&mut open).ok()?);

371 let open = String::from(str::from_utf8_mut(&mut open).ok()?);

375

372

376− let mut close = close.as_bytes()?;

373+ let mut close = crip(ctx, close.clone()).ok()?.as_bytes()?;

377 let close = String::from(str::from_utf8_mut(&mut close).ok()?);

374 let close = String::from(str::from_utf8_mut(&mut close).ok()?);

378

375

379 let mut target = String::new();

376 let mut target = String::new();

@@ -417,9 +414,13 @@ pub fn ram_ttank(ctx: &mut InterpreterContext, ttank: TTank) -> String {

417 let tank = match tar(ctx, subj.clone(), &q) {

414 let tank = match tar(ctx, subj.clone(), &q) {

418 Ok(gate) => match eval_pulled_gate(ctx, gate) {

415 Ok(gate) => match eval_pulled_gate(ctx, gate) {

419 Ok(tank) => tank,

416 Ok(tank) => tank,

417+ Err(_) => {

420− Err(_) => return String::new(),

418+ return String::new();

419+ }

421 },

420 },

421+ Err(_) => {

422− Err(_) => return String::new(),

422+ return String::new();

423+ }

423 };

424 };

424 ram(ctx, tank).unwrap_or(String::new())

425 ram(ctx, tank).unwrap_or(String::new())

425}

426}

nock/src/noun.rs+46

@@ -111,6 +111,52 @@ impl<'a> Noun {

111 }

112 }

113

114+ pub fn tuple_2(self: &Self) -> Option<(&Rc<Noun>, &Rc<Noun>)> {

115+ self.as_cell()

116+ }

117+

118+ pub fn tuple_3(self: &Self) -> Option<(&Rc<Noun>, &Rc<Noun>, &Rc<Noun>)> {

119+ let (a, b) = self.as_cell()?;

120+ let (b, c) = b.as_cell()?;

121+

122+ Some((a, b, c))

123+ }

124+ pub fn tuple_4(self: &Self) -> Option<(&Rc<Noun>, &Rc<Noun>, &Rc<Noun>, &Rc<Noun>)> {

125+ let (a, b) = self.as_cell()?;

126+ let (b, c) = b.as_cell()?;

127+ let (c, d) = c.as_cell()?;

128+

129+ Some((a, b, c, d))

130+ }

131+

132+ pub fn tuple_5(self: &Self) -> Option<(&Rc<Noun>, &Rc<Noun>, &Rc<Noun>, &Rc<Noun>, &Rc<Noun>)> {

133+ let (a, b) = self.as_cell()?;

134+ let (b, c) = b.as_cell()?;

135+ let (c, d) = c.as_cell()?;

136+ let (d, e) = d.as_cell()?;

137+

138+ Some((a, b, c, d, e))

139+ }

140+

141+ pub fn tuple_6(

142+ self: &Self,

143+ ) -> Option<(

144+ &Rc<Noun>,

145+ &Rc<Noun>,

146+ &Rc<Noun>,

147+ &Rc<Noun>,

148+ &Rc<Noun>,

149+ &Rc<Noun>,

150+ )> {

151+ let (a, b) = self.as_cell()?;

152+ let (b, c) = b.as_cell()?;

153+ let (c, d) = c.as_cell()?;

154+ let (d, e) = d.as_cell()?;

155+ let (e, f) = e.as_cell()?;

156+

157+ Some((a, b, c, d, e, f))

158+ }

159+

114 pub fn is_sig(self: &Self) -> bool {

160 pub fn is_sig(self: &Self) -> bool {

115 match self {

161 match self {

116 Noun::Atom(n) if *n == Atom::ZERO => true,

162 Noun::Atom(n) if *n == Atom::ZERO => true,

nock/wock.hoon+15−10

@@ -1,16 +1,21 @@

1=>

2|%

3+++ hop

4+ |$ step

5+ $%

6+ [%fetch request:http]

7+ ==

3++ wock-app

8++ wock-app

4− |$ [model event]

9+ |$ [model step]

5 $_ ^?

10 $_ ^?

6 |%

11 |%

7 ++ init *model

12 ++ init *model

8 ++ view |~ model *manx

13 ++ view |~ model *manx

9− ++ move |~ [model event] *model

14+ ++ move |~ [model step] *model

10 --

15 --

11++ app

16++ app

12− |* [model=mold event=mold]

17+ |* [model=mold step=mold]

13− |= app=(wock-app model event)

18+ |= app=(wock-app model step)

14 |= [cmd=@tas args=*]

19 |= [cmd=@tas args=*]

15 ?+ cmd !!

20 ?+ cmd !!

16 %init

21 %init

@@ -18,19 +23,19 @@

18 %view

23 %view

19 (view.app (model args))

24 (view.app (model args))

20 %move

25 %move

21− =/ [=model event-tape=tape payload=*] (,[model tape *] args)

26+ =/ [=model step-tape=tape payload=*] (,[model tape *] args)

22− (move.app [model (event [(crip event-tape) payload])])

27+ (move.app [model (step [(crip step-tape) payload])])

23 ==

28 ==

24--

29--

25=>

30=>

26|%

31|%

27−+$ event

32++$ step

28 $%

33 $%

29 [%inc ~]

34 [%inc ~]

30 [%dec ~]

35 [%dec ~]

31 ==

36 ==

32--

37--

33−%- (app @ud event)

38+%- (app @ud step)

34|%

39|%

35++ view

40++ view

36 |= count=@ud

41 |= count=@ud

@@ -40,9 +45,9 @@

40 ;button(on-click "inc"): +

45 ;button(on-click "inc"): +

41 ;button(on-click "dec"): -

46 ;button(on-click "dec"): -

42 ==

47 ==

43−++ init 8

48+++ init 11

44++ move

49++ move

45− |= [model=@ud step=event]

50+ |= [model=@ud step=step]

46 ^- @ud

51 ^- @ud

47 ?- -.step

52 ?- -.step

48 %inc +(model)

53 %inc +(model)

wock.nock

Binary file not shown.