[Guile-rpc-bugs] [PATCH 1/1] Fix imports for Guile-3.0.

[Maxime Devos]

* modules/rpc/compiler/parser.scm: Import 'lexer' explicitly.
* modules/rpc/rpc/portmap.scm: Import 'match:substring' instead
  of 'make-regexp'.
* modules/rcp/rpc/server.scm: Import 'xdr-encode!' explicitly.
* utils/grpc-compile.in: Import many bindings explicitly.
---
 modules/rpc/compiler/parser.scm |  2 +-
 modules/rpc/rpc/portmap.scm     |  2 +-
 modules/rpc/rpc/server.scm      |  3 ++-
 utils/grpc-compile.in           | 17 +++++++++++++++--
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/modules/rpc/compiler/parser.scm b/modules/rpc/compiler/parser.scm
index 64df529..c50043e 100644
--- a/modules/rpc/compiler/parser.scm
+++ b/modules/rpc/compiler/parser.scm
@@ -17,7 +17,7 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (rpc compiler parser)
-  :autoload    (rpc compiler lexer) (lexer-init)
+  :autoload    (rpc compiler lexer) (lexer-init lexer)
   :use-module  (system base lalr)
   :use-module  (srfi srfi-1)
   :use-module  (srfi srfi-34)
diff --git a/modules/rpc/rpc/portmap.scm b/modules/rpc/rpc/portmap.scm
index 98ccd49..ec26905 100644
--- a/modules/rpc/rpc/portmap.scm
+++ b/modules/rpc/rpc/portmap.scm
@@ -22,7 +22,7 @@
   :use-module (rpc xdr types)
 
   :autoload   (ice-9 rdelim)        (read-line)
-  :autoload   (ice-9 regex)         (make-regexp)
+  :autoload   (ice-9 regex)         (match:substring)
   :autoload   (srfi srfi-1)         (find)
 
   :export (%portmapper-port %portmapper-version-number
diff --git a/modules/rpc/rpc/server.scm b/modules/rpc/rpc/server.scm
index 3c4f3d9..6ecc1ba 100644
--- a/modules/rpc/rpc/server.scm
+++ b/modules/rpc/rpc/server.scm
@@ -19,7 +19,8 @@
 (define-module (rpc rpc server)
   :use-module (rpc rpc)
   :autoload   (rpc rpc types)       (rpc-message)
-  :autoload   (rpc xdr)             (xdr-type-size xdr-decode xdr-error?)
+  :autoload   (rpc xdr)             (xdr-type-size xdr-encode! xdr-decode
+                                     xdr-error?)
   :autoload   (rpc rpc transports)  (rpc-record-marking-input-port
                                      send-rpc-record)
   :autoload   (srfi srfi-1)         (find fold alist-delete!)
diff --git a/utils/grpc-compile.in b/utils/grpc-compile.in
index 477abbc..8b8175d 100644
--- a/utils/grpc-compile.in
+++ b/utils/grpc-compile.in
@@ -31,8 +31,21 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0"    \
 (define-module (guile-rpc compile)
   :autoload   (rpc compiler)         (rpc-language->scheme-server
                                       rpc-language->scheme-client
-                                      *compiler-options*)
-  :autoload   (rpc compiler parser)  (rpc-language->sexp *parser-options*)
+                                      *compiler-options*
+                                      compiler-error?
+                                      compiler-unknown-type-error?
+                                      compiler-unknown-constant-error?
+                                      compiler-unknown-type-error?
+                                      compiler-duplicate-identifier-error?
+                                      compiler-error:location
+                                      compiler-unknown-type-error:type-name
+                                      
compiler-unknown-constant-error:constant-name
+                                      compiler-duplicate-identifier-error:name
+                                      
compiler-duplicate-identifier-error:previous-location)
+  :autoload   (rpc compiler parser)  (rpc-language->sexp *parser-options*
+                                      location-line location-column
+                                      lexer-error? parser-error?
+                                      parser-error:token)
   :autoload   (rpc compiler lexer)   (*strip-%-comments?*)
   :autoload   (ice-9 pretty-print)   (pretty-print)
   :use-module (srfi srfi-1)
-- 
2.28.0