coop/rose-ash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ocaml: phase 1 unit/wildcard params + 180s timeout (+5 tests, 283 total)
Some checks failed
Test, Build, and Deploy / test-build-deploy (push) Failing after 34s
Details

Browse Source 
Parser: try-consume-param! handles ident, wildcard _ (fresh __wild_N
name), unit () (fresh __unit_N), typed (x : T) (skips signature).
parse-fun and parse-let (inline) reuse the helper; top-level
parse-decl-let inlines a similar test.

test.sh timeout bumped from 60s to 180s — the growing suite was hitting
the cap and reporting spurious failures.
This commit is contained in:
giles
2026-05-08 09:21:06 +00:00
parent c8bfd22786
commit 74b80e6b0e
3 changed files with 100 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
lib/ocaml/parser.sx
View File

@@ -282,6 +282,56 @@
(list :pcons lhs (parse-pattern-cons))))
(else lhs)))))
(set! parse-pattern (fn () (parse-pattern-cons)))
(define peek-tok-at
(fn (n)
(if (< (+ idx n) tok-len) (nth tokens (+ idx n)) nil)))
;; Param consumption — matches ident, `_` (wildcard), or `()`
;; (unit). Returns a fresh ident name or nil if no param at cursor.
(define wild-counter (list 0))
(define try-consume-param!
(fn ()
(cond
((and (check-tok? "ident" nil)
(= (ocaml-tok-value (peek-tok)) "_"))
(begin
(advance-tok!)
(set-nth! wild-counter 0 (+ (nth wild-counter 0) 1))
(str "__wild_" (nth wild-counter 0))))
((check-tok? "ident" nil)
(let ((nm (ocaml-tok-value (peek-tok))))
(begin (advance-tok!) nm)))
((and (at-op? "(") (= (ocaml-tok-value (peek-tok-at 1)) ")"))
(begin
(advance-tok!) (advance-tok!)
(set-nth! wild-counter 0 (+ (nth wild-counter 0) 1))
(str "__unit_" (nth wild-counter 0))))
((and (at-op? "(") (= (ocaml-tok-type (peek-tok-at 1)) "ident"))
;; (x : T) — typed param. Skip the `: T` part.
(let ((nm (ocaml-tok-value (peek-tok-at 1))))
(begin
(advance-tok!) (advance-tok!)
(when (at-op? ":")
(begin
;; Skip until matching `)`.
(let ((d 1))
(begin
(define skip
(fn ()
(cond
((>= idx tok-len) nil)
((at-op? "(")
(begin (set! d (+ d 1)) (advance-tok!) (skip)))
((at-op? ")")
(cond
((= d 1) nil)
(else (begin (set! d (- d 1)) (advance-tok!) (skip)))))
(else (begin (advance-tok!) (skip))))))
(skip)))))
(consume! "op" ")")
nm)))
(else nil))))
(define parse-expr (fn () nil))
(define parse-expr-no-seq (fn () nil))
(define parse-tuple (fn () nil))
@@ -492,14 +542,10 @@
(begin
(define
collect-params
(fn
()
(when
(check-tok? "ident" nil)
(begin
(append! params (ocaml-tok-value (peek-tok)))
(advance-tok!)
(collect-params)))))
(fn ()
(let ((nm (try-consume-param!)))
(when (not (= nm nil))
(begin (append! params nm) (collect-params))))))
(collect-params)
(when
(= (len params) 0)
@@ -522,14 +568,10 @@
(begin
(define
collect-params
(fn
()
(when
(check-tok? "ident" nil)
(begin
(append! params (ocaml-tok-value (peek-tok)))
(advance-tok!)
(collect-params)))))
(fn ()
(let ((nm (try-consume-param!)))
(when (not (= nm nil))
(begin (append! params nm) (collect-params))))))
(collect-params)
(consume! "op" "=")
(let
@@ -806,11 +848,22 @@
(begin
(define collect-params
(fn ()
(when (check-tok? "ident" nil)
(begin
(append! ps (ocaml-tok-value (peek-tok)))
(advance-tok!)
(collect-params)))))
(cond
((check-tok? "ident" nil)
(begin
(append! ps (ocaml-tok-value (peek-tok)))
(advance-tok!)
(collect-params)))
((and (at-op? "(")
(< (+ idx 1) tok-len)
(let ((t1 (nth tokens (+ idx 1))))
(and (= (ocaml-tok-type t1) "op")
(= (ocaml-tok-value t1) ")"))))
(begin
(advance-tok!) (advance-tok!)
(append! ps (str "__unit_" idx))
(collect-params)))
(else nil))))
(collect-params)
(consume! "op" "=")
(let ((expr-start (cur-pos)))