CharlesKWON
efb615bed9
Compiling _FiveSql2/test/test_sql_extreme.prg + a sweep of the FRB
demos surfaced four real bugs in the dynamic-compilation pipeline.
All fixes shipped together because they were on the same critical
path; each is independently revertible.
* **pcode FOR loop ignored STEP and direction.** emitFor in
compiler/genpc emitted a fixed `<= to` comparison and a hardcoded
`+1` increment, then deleted the actual step expression with
slice arithmetic on the byte buffer. Result: `FOR 5 TO 1 STEP
-1` exited on the first iteration; `FOR 1 TO 10 STEP 2` summed
1..10 (55) instead of 1+3+5+7+9 (25). Rewritten to mirror
gengo's emitFor: detect negative step from a literal `-N` or
unary MINUS, pick `<=` vs `>=` accordingly, and emit a clean
`var := var + step` increment per iteration.
* **pcode compound `+=` operator stored only the RHS.** emitAssign
looked at AssignExpr.Op only for the := case; +=/-=/etc.
silently took the same path, so `n += i` compiled as `n := i`,
discarding the accumulator. Loop reduces were wrong: `Reverse`
returned "" and `n := 0; FOR i ... n += i; NEXT` returned only
the last increment. New compoundBinOp helper maps PLUSEQ /
MINUSEQ / STAREQ / SLASHEQ / PERCENTEQ / POWEREQ to their
matching binary opcode; emitAssign emits `local + rhs ; pop
local` for compound forms.
* **Pcode body stack leaks polluted the caller's frame.** A pcode
function whose body left intermediate values on the data stack
(FOR control values, etc.) returned with extra entries past
its declared retVal. FrbDoFunc / FrbExecFunc / FrbRunFunc then
pushed retVal on top of those leaks, so the caller saw the
leaked values where its own preceding arguments should have
been: `? "Fibonacci(10) =", FrbDo(...), "(expect 55)"` printed
`1 55 (expect 55)` because the FOR loop's `1` lived in arg-1's
slot. Two new Thread methods (`SP()` / `SetSP(int)`) let the
three FRB dispatchers snapshot stack depth before the inner
call and clamp it back afterward, so the leaks evaporate before
they reach the caller's frame.
* **FrbExec / FrbRun recursed into the host's Main forever.** Both
looked up "MAIN" via t.VM().FindSymbol, which always resolved
to the OUTER program's Main since FRB modules deliberately keep
Main local. Compile + run + unload became compile + recurse +
OOM. Both now look up Main via mod.FindFunc("MAIN") (module
scope) — Frbload's policy of leaving Main module-local now
actually has the intended effect.
Plus an architectural improvement: in-memory compilation no longer
depends on shelling out to an external `five` binary. New
hbrtl.frbCompileInProc parses + preprocesses + generates pcode in
process, building a FrbModule directly. FrbCompile and FrbExec use
this exclusively, which means dynamic compilation works from any
directory regardless of PATH and without a second process. The
plugin-mode path (with its runtime-version-mismatch fragility) is
left available via hbrt.FrbCompileSource for callers that want it,
but FrbCompile no longer reaches for it by default.
Test suite: tests/frb/ holds five fixtures + a runner. 5/5 pass:
test_frb_simple / test_frb_pcode_load / test_frb_compile /
test_frb_loop / test_frb_step.
Other gates green:
go test ./... : PASS
FiveSql2 SQL:1999 : 43/43
Harbour compat : 56/56
std.ch suite : 14/14
FRB suite : 5/5
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
39 lines
1.1 KiB
Plaintext
39 lines
1.1 KiB
Plaintext
/* In-memory PRG compilation via FrbCompile / FrbExec. */
|
|
|
|
FUNCTION Main()
|
|
LOCAL pStr, cSource
|
|
|
|
/* 1. FrbCompile a small lib, call its functions */
|
|
cSource := ;
|
|
'FUNCTION Reverse(cStr)' + Chr(10) + ;
|
|
' LOCAL i, cResult := ""' + Chr(10) + ;
|
|
' FOR i := Len(cStr) TO 1 STEP -1' + Chr(10) + ;
|
|
' cResult += SubStr(cStr, i, 1)' + Chr(10) + ;
|
|
' NEXT' + Chr(10) + ;
|
|
' RETURN cResult' + Chr(10) + ;
|
|
'FUNCTION Triple(n)' + Chr(10) + ;
|
|
' RETURN n * 3' + Chr(10)
|
|
|
|
pStr := FrbCompile(cSource)
|
|
IF pStr == NIL
|
|
? "FAIL: FrbCompile returned NIL"
|
|
RETURN NIL
|
|
ENDIF
|
|
|
|
? "1. Reverse('Hello') =", FrbDo(pStr, "REVERSE", "Hello"), "(expect olleH)"
|
|
? "2. Triple(7) =", FrbDo(pStr, "TRIPLE", 7), "(expect 21)"
|
|
FrbUnload(pStr)
|
|
|
|
/* 2. One-shot FrbExec */
|
|
? "3. Sum 1..100 via FrbExec:"
|
|
? " ", FrbExec( ;
|
|
'FUNCTION Main()' + Chr(10) + ;
|
|
' LOCAL i, n := 0' + Chr(10) + ;
|
|
' FOR i := 1 TO 100' + Chr(10) + ;
|
|
' n += i' + Chr(10) + ;
|
|
' NEXT' + Chr(10) + ;
|
|
' RETURN n' + Chr(10) ), "(expect 5050)"
|
|
|
|
? "DONE"
|
|
RETURN NIL
|