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.
56 lines
2.0 KiB
Plaintext
56 lines
2.0 KiB
Plaintext
;;;; raylib [core] example - input mouse wheel
|
|
;;;;
|
|
;;;; examples/core/core_input_mouse_wheel.c. Needed get-mouse-wheel-move, now
|
|
;;;; bound.
|
|
;;;;
|
|
;;;; This is the first example with a `TextFormat` in it. The C draws
|
|
;;;;
|
|
;;;; DrawText(TextFormat("Box position Y: %03i", boxPositionY), ...)
|
|
;;;;
|
|
;;;; and the number half of that is now sayable: (string (i64->bytes n)).
|
|
;;;; What is not is the "%03" — i64->bytes has no field width — so the label
|
|
;;;; is drawn with draw-text and the number with draw-int-padded from
|
|
;;;; examples/digits.flan, which draws the leading zeroes itself and then the
|
|
;;;; number in one call. A number wider than three digits is drawn in full,
|
|
;;;; exactly as printf's minimum-width means.
|
|
;;;;
|
|
;;;; The position is signed and goes negative as soon as the box scrolls past
|
|
;;;; the top, which is why draw-int-padded handles a sign at all.
|
|
|
|
(import rl "vendor:raylib")
|
|
(import d "digits.flan")
|
|
|
|
(defconst screen-width 800)
|
|
(defconst screen-height 450)
|
|
|
|
(defconst scroll-speed 4)
|
|
|
|
(defvar box-y i32)
|
|
|
|
(defn main [] ()
|
|
(rl/init-window screen-width screen-height
|
|
"raylib [core] example - input mouse wheel")
|
|
(defer (rl/close-window))
|
|
|
|
(set box-y (- (/ screen-height 2) 40))
|
|
|
|
(rl/set-target-fps 60)
|
|
|
|
(until (rl/window-should-close?)
|
|
;; Update. The wheel reading is a per-frame delta, so it is 0.0 on every
|
|
;; frame the wheel did not turn and this is a no-op then.
|
|
(set box-y (- box-y (i32 (* (rl/get-mouse-wheel-move) (f32 scroll-speed)))))
|
|
|
|
;; Draw
|
|
(rl/begin-drawing)
|
|
(rl/clear-background rl/raywhite)
|
|
(rl/draw-rectangle (- (/ screen-width 2) 40) box-y 80 80 rl/maroon)
|
|
(rl/draw-text "Use mouse wheel to move the cube up and down!" 10 10 20
|
|
rl/gray)
|
|
;; The two halves of the C's one TextFormat call: the literal, measured,
|
|
;; and then the number starting where it ended.
|
|
(rl/draw-text "Box position Y: " 10 40 20 rl/lightgray)
|
|
(d/draw-int-padded box-y 3 (+ 10 (rl/measure-text "Box position Y: " 20))
|
|
40 20 rl/lightgray)
|
|
(rl/end-drawing)))
|