Skip to content

Commit 9adf49f

Browse files
Merge pull request #87 from Chia-Network/20240305-add-assign-support-and-upgrade-clvm-tools-rs
Add assign support (complex bindings) and upgrade clvm_tools_rs to current
2 parents 45c4e47 + e4a0275 commit 9adf49f

13 files changed

+380
-214
lines changed

test/collatz.cl

+8-3
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,20 @@
77
;; Determine if number is odd
88
;; test.
99
(defun-inline odd (X) (logand X 1))
10+
1011
;; Actual collatz function
1112
;; determines number of step til 1
1213
(defun collatz (N X)
1314
(if (= X 1) ; We got 1
1415
N ; Return the number of steps
1516
(let ((incN (+ N 1))) ; Next N
16-
(if (odd X) ; Is it odd?
17-
(collatz incN (+ 1 (* 3 X))) ; Odd? 3 X + 1
18-
(collatz incN (/ X 2)) ; Even? X / 2
17+
(assign
18+
(two three) (list 2 3)
19+
20+
(if (odd X) ; Is it odd?
21+
(collatz incN (+ 1 (* three X))) ; Odd? 3 X + 1
22+
(collatz incN (/ X two)) ; Even? X / 2
23+
)
1924
)
2025
)
2126
)

test/test/test.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -384,13 +384,12 @@ describe("Basic element tests", function() {
384384

385385
// Pgup right 7 space QQEX C-f defun-inline C-f logand right 6 Q
386386
// find a monaco-list-rows with a descendant that contains QQEX.
387-
await sendPgUp();
388-
await sendRight(7);
387+
await findString(driver, 'two three');
388+
await sendRight(1);
389389
await sendString(" QQEX");
390390

391-
await findString(driver, 'defun-inline');
392-
await findString(driver, 'logand');
393-
await sendRight(5);
391+
await findString(driver, '(odd X');
392+
await sendRight(1);
394393
await sendString(" Q");
395394

396395
let monacoLists = await driver.findElements(By.css(".monaco-list"));

0 commit comments

Comments
 (0)