Resolve some missing symbols

TODO.org

@@ -71,8 +71,8 @@ involve:
 *** [?] annotated-read
  - the implementation of this package is missing from s48
 
-** ps-compiler/prescheme/package-defs.scm [16/27]
-*** [-] prescheme-compiler
+** ps-compiler/prescheme/package-defs.scm [18/27]
+*** [X] prescheme-compiler
 *** [-] prescheme-display
 *** [X] protocol
 *** [-] prescheme-front-end
@@ -95,7 +95,7 @@ involve:
 *** [X] ps-primops
 *** [X] ps-c-primops
 *** [-] primop-data
-*** [-] c-primop-data
+*** [X] c-primop-data
 *** [X] external-values
 *** [X] c
 *** [X] c-internal

ps-compiler/prescheme/merge.scm

@@ -29,6 +29,8 @@
   #:use-module (ps-compiler util syntax)
   #:export (form-head
             form-merged
+            form-return-count
+            set-form-return-count!
             form-tail-called?
             merged-procedure-reference
             merge-forms))

ps-compiler/prescheme/primop/c-arith.scm

@@ -10,6 +10,7 @@
   #:use-module (prescheme scheme48)
   #:use-module (prescheme platform)
   #:use-module (ps-compiler node node)
+  #:use-module (ps-compiler prescheme c-call)
   #:use-module (ps-compiler prescheme primop c-primop))
 
 (define-syntax define-c-arith-binop-generator

ps-compiler/prescheme/primop/c-base.scm

@@ -13,9 +13,13 @@
   #:use-module (ps-compiler node node)
   #:use-module (ps-compiler node node-util)
   #:use-module (ps-compiler node variable)
+  #:use-module (ps-compiler prescheme c)
+  #:use-module (ps-compiler prescheme c-call)
+  #:use-module (ps-compiler prescheme c-decl)
   #:use-module (ps-compiler prescheme form)
   #:use-module ((ps-compiler prescheme infer-early) #:select (get-variable-type))
   #:use-module (ps-compiler prescheme primop c-primop)
+  #:use-module (ps-compiler prescheme merge)
   #:use-module (ps-compiler prescheme spec)
   #:use-module (ps-compiler prescheme type)
   #:use-module (ps-compiler util util))

ps-compiler/prescheme/primop/c-io.scm

@@ -10,7 +10,9 @@
   #:use-module (ice-9 format)
   #:use-module (ps-compiler node node)
   #:use-module (ps-compiler node variable)
-  #:use-module (ps-compiler prescheme primop c-primop))
+  #:use-module (ps-compiler prescheme c-call)
+  #:use-module (ps-compiler prescheme primop c-primop)
+  #:use-module (ps-compiler util util))
 
 (define (write-c-io-call call port name . args)
   (format port name)

ps-compiler/prescheme/primop/c-vector.scm

@@ -10,9 +10,13 @@
   #:use-module (ice-9 format)
   #:use-module (ps-compiler node node)
   #:use-module (ps-compiler node node-util)
+  #:use-module (ps-compiler prescheme c)
+  #:use-module (ps-compiler prescheme c-call)
+  #:use-module (ps-compiler prescheme c-decl)
   #:use-module (ps-compiler prescheme primop c-primop)
   #:use-module (ps-compiler prescheme record)
-  #:use-module (ps-compiler prescheme type))
+  #:use-module (ps-compiler prescheme type)
+  #:use-module (ps-compiler util util))
 
 (define-c-generator make-vector #t
   (lambda (call port indent)