From 12be2fad53bc8a5fb42cd21e53d6bde62d25ae6e Mon Sep 17 00:00:00 2001 From: Andrew Whatson Date: Tue, 16 Aug 2022 23:07:52 +1000 Subject: [PATCH] Resolve some missing symbols --- TODO.org | 6 +++--- ps-compiler/prescheme/merge.scm | 2 ++ ps-compiler/prescheme/primop/c-arith.scm | 1 + ps-compiler/prescheme/primop/c-base.scm | 4 ++++ ps-compiler/prescheme/primop/c-io.scm | 4 +++- ps-compiler/prescheme/primop/c-vector.scm | 6 +++++- 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/TODO.org b/TODO.org index 17f9614..ac90100 100644 --- a/TODO.org +++ b/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 diff --git a/ps-compiler/prescheme/merge.scm b/ps-compiler/prescheme/merge.scm index f01cf0a..435b1a0 100644 --- a/ps-compiler/prescheme/merge.scm +++ b/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)) diff --git a/ps-compiler/prescheme/primop/c-arith.scm b/ps-compiler/prescheme/primop/c-arith.scm index 05e8358..84f6bed 100644 --- a/ps-compiler/prescheme/primop/c-arith.scm +++ b/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 diff --git a/ps-compiler/prescheme/primop/c-base.scm b/ps-compiler/prescheme/primop/c-base.scm index 2854762..5eb96b4 100644 --- a/ps-compiler/prescheme/primop/c-base.scm +++ b/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)) diff --git a/ps-compiler/prescheme/primop/c-io.scm b/ps-compiler/prescheme/primop/c-io.scm index 25aa65c..47d5530 100644 --- a/ps-compiler/prescheme/primop/c-io.scm +++ b/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) diff --git a/ps-compiler/prescheme/primop/c-vector.scm b/ps-compiler/prescheme/primop/c-vector.scm index 3493b39..8e85856 100644 --- a/ps-compiler/prescheme/primop/c-vector.scm +++ b/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)