Joseph Ferano
26c53e0a19
The mechanical half, ahead of the parser change that needs it. tools/unit-return.py
fills the empty slot with () and rewrites Unit as () wherever a type is spelled --
(Fn [i32] Unit), (Map i32 Unit), a return type written out.
Deciding whether a defn already had a return type is the whole difficulty, and
the script does it the way parse.ml did: is_type_form is transcribed rather than
improved, because being identical to the parser it replaces is what makes the
sweep meaning-preserving. It is re-runnable, so the lanes that branched before
this can have the same pass at merge:
python3 tools/unit-return.py .
python3 tools/unit-return.py --in-strings test/test_flan.ml test/test_acceptance.ml \
test/test_session.ml emacs/test-flan-dev.el emacs/test-flan-mode.el
python3 tools/unit-return.py --raw-ml lib/prelude.ml
python3 tools/unit-return.py --in-html web/index.html
-v logs every defn it saw and what it decided, which is how a sweep of 440 sites
gets reviewed at all. Embedded modes pool a file's type declarations across all
its fragments, because a snippet split across concatenation -- decls ^ "(defn f
[s [u8]] Cursor ...)" -- cannot see the names the other half declared; pooled
names count only in bare-symbol position, for the same reason the prelude's do.
A fragment that cuts off mid-form is skipped rather than guessed at. Five sites
in test_flan.ml still needed a hand, and they are in this commit.
Two things ride along because the sweep needs them: parse.ml reads a lone () as
the return type of a function with no body, which was not a shape the old
optional slot could produce; and the map refusals name () rather than Unit, since
that is now the spelling a caller wrote.
48 lines
1.5 KiB
Plaintext
48 lines
1.5 KiB
Plaintext
;;;; Globals, 2-D fixed arrays, places, pointers, casts and match — the
|
|
;;;; milestone-2 surface calc-me does not reach.
|
|
(defconst rows 3)
|
|
(defconst cols 4)
|
|
(defvar grid [rows [cols i32]])
|
|
(defvar total i32)
|
|
(defconst pal [4 u32] [10 20 30 40])
|
|
|
|
(defstruct P [x i32 y i32])
|
|
(defstruct Line [a P b P])
|
|
|
|
(defn bump [p (Ptr P)] ()
|
|
(set (.x p) (+ (.x p) 1)))
|
|
|
|
(defn sum-grid [] i32
|
|
(let [t 0 r 0]
|
|
(while (< r rows)
|
|
(let [c 0]
|
|
(while (< c cols)
|
|
(set t (+ t (at grid r c)))
|
|
(set c (+ c 1))))
|
|
(set r (+ r 1)))
|
|
t))
|
|
|
|
(defn find [n i32] (Option i32)
|
|
(if (> n 0) (Some (* n 2)) None))
|
|
|
|
(defn main [] i32
|
|
(set (at grid 1 2) 7)
|
|
(set (at grid 0 0) 5)
|
|
(set total (sum-grid))
|
|
(print total) (println "") ; 12
|
|
(print (at pal 2)) (println "") ; 30
|
|
(let [p (P {.x 1 .y 2})] ; :y omitted is zeroed
|
|
(bump (addr p))
|
|
(print (.x p)) (println "") ; 2
|
|
(let [l (Line {.a p})]
|
|
(print (.y (.a l))) (println ""))) ; 2
|
|
(print (/ 7 2)) (println "") ; 3 integer divide
|
|
(print (/ (f64 7) 2.0)) (println "") ; 3.5 float divide
|
|
(print (match (find 21) (Some v) v None 0)) (println "") ; 42
|
|
(print (match (find -1) (Some v) v None 99)) (println "") ; 99
|
|
(let [q (addr total)]
|
|
(print (deref q)) (println "") ; 12
|
|
(set (deref q) 123)
|
|
(print total) (println "")) ; 123
|
|
0)
|