From 988217e2324c2f09571428963926dd433bb22bc9 Mon Sep 17 00:00:00 2001
From: "Jan (janneke) Nieuwenhuizen" <janneke@gnu.org>
Date: Mon, 20 Apr 2020 19:47:04 +0200
Subject: [PATCH] core: Prepare for M2-Planet: module.c.

* src/module.c: Rewrite C constructs not supported by M2-Planet.
---
 src/mes.c    |  2 ++
 src/module.c | 12 +++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/mes.c b/src/mes.c
index ee961111..9a4f4893 100644
--- a/src/mes.c
+++ b/src/mes.c
@@ -28,6 +28,8 @@
 #include <string.h>
 #include <string.h>
 
+// char const *MES_PKGDATADIR = "mes";
+
 SCM
 alloc (long n)
 {
diff --git a/src/module.c b/src/module.c
index 48db2330..adcbf9da 100644
--- a/src/module.c
+++ b/src/module.c
@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -24,20 +24,19 @@
 #include <assert.h>
 
 SCM
-make_module_type ()             ///(internal))
+make_module_type ()             /*:(internal)) */
 {
-  SCM record_type = cell_symbol_record_type;    // FIXME
   SCM fields = cell_nil;
   fields = cons (cstring_to_symbol ("globals"), fields);
   fields = cons (cstring_to_symbol ("locals"), fields);
   fields = cons (cstring_to_symbol ("name"), fields);
   fields = cons (fields, cell_nil);
   fields = cons (cell_symbol_module, fields);
-  return make_struct (record_type, fields, cell_unspecified);
+  return make_struct (cell_symbol_record_type, fields, cell_unspecified);
 }
 
 SCM
-make_initial_module (SCM a)     ///((internal))
+make_initial_module (SCM a)     /*:((internal)) */
 {
   SCM module_type = make_module_type ();
   a = acons (cell_symbol_module, module_type, a);
@@ -71,7 +70,6 @@ make_initial_module (SCM a)     ///((internal))
 SCM
 module_printer (SCM module)
 {
-  //module = m0;
   fdputs ("#<", __stdout);
   display_ (struct_ref_ (module, 2));
   fdputc (' ', __stdout);
@@ -90,7 +88,7 @@ module_printer (SCM module)
 SCM
 module_variable (SCM module, SCM name)
 {
-  //SCM locals = struct_ref_ (module, 3);
+  /*SCM locals = struct_ref_ (module, 3);*/
   SCM locals = module;
   SCM x = assq (name, locals);
   if (x == cell_f)