protobuf: add :gerbil/core import in generated module (mighty-gerbils…

…#970) Seems there are some issues with the module loader in expanded protobuf modules
jeffhhk · Oct 4, 2023 · ccf72e2 · ccf72e2
1 parent f0d8312
commit ccf72e2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/std/protobuf/proto.ss b/src/std/protobuf/proto.ss
@@ -14,7 +14,9 @@
 
 (defrules begin-module%% ()
   ((_ . body)
-   (%%begin-module (export #t) . body)))
+   (%%begin-module (import (only-in :gerbil/core load-module)
+                           (for-syntax (only-in :gerbil/core load-module)))
+                   (export #t) . body)))
 
 (defsyntax (begin-protobuf stx)
   (def (parse-body body)

diff --git a/src/std/protobuf/protobuf-test.ss b/src/std/protobuf/protobuf-test.ss
@@ -108,12 +108,12 @@
 
     (test-case "test parser"
       (check (gx#import-module (path-expand "potpourri-test.proto"
-                                            (path-directory (this-source-file))))
+                                 (path-directory (this-source-file))))
              ? gx#module-context?))
 
     (test-case "test import"
       (check (gx#import-module (path-expand "potpourri-test2.proto"
-                                            (path-directory (this-source-file))))
+                                 (path-directory (this-source-file))))
              ? gx#module-context?))
 
     ))