[build] Restore help metadata, to translate to C++

oilshell · Aug 9, 2023 · 2bf0578 · 2bf0578
1 parent 7ba1609
commit 2bf0578
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/bin/NINJA_subgraph.py b/bin/NINJA_subgraph.py
@@ -59,7 +59,7 @@ def NinjaGraph(ru):
 
           '//frontend/arg_types',
           '//frontend/consts',
-          #'//frontend/help_meta',
+          '//frontend/help_meta',
           '//frontend/id_kind.asdl',
           '//frontend/option.asdl',
           '//frontend/signal',

diff --git a/core/shell.py b/core/shell.py
@@ -82,15 +82,11 @@
     from core import optview
     from frontend.py_readline import Readline
 
-TOPIC_META = {}  # type: Dict[str, str]
-
 if mylib.PYTHON:
     try:
         from _devbuild.gen import help_meta  # type: ignore
-        TOPIC_META = help_meta.TopicMetadata()
     except ImportError:
-        # This happens in the 'minimal' dev build
-        pass
+        help_meta = None
 
 
 def MakeBuiltinArgv(argv1):
@@ -626,7 +622,13 @@ def Main(lang, arg_r, environ, login_shell, loader, readline):
     AddProcess(builtins, mem, shell_ex, ext_prog, fd_state, job_control,
                job_list, waiter, tracer, search_path, errfmt)
 
-    help_data = TOPIC_META
+    if mylib.PYTHON:
+        if help_meta:
+            help_data = help_meta.TopicMetadata()
+        else:
+            help_data = {}  # minimal build
+    else:
+        help_data = help_meta.TopicMetadata()
     builtins[builtin_i.help] = builtin_misc.Help(lang, loader, help_data,
                                                  errfmt)
 

diff --git a/cpp/preamble.h b/cpp/preamble.h
@@ -8,8 +8,7 @@
 #include "_gen/core/runtime.asdl.h"
 #include "_gen/frontend/arg_types.h"
 #include "_gen/frontend/consts.h"
-// TODO: restore this
-// #include "_gen/frontend/help_meta.h"
+#include "_gen/frontend/help_meta.h"
 #include "_gen/frontend/id_kind.asdl.h"  // syntax.asdl depends on this
 #include "_gen/frontend/option.asdl.h"
 #include "_gen/frontend/signal.h"

diff --git a/doctools/help_gen.py b/doctools/help_gen.py
@@ -506,7 +506,7 @@ def TopicMetadata():
 #include "mycpp/runtime.h"
 
 namespace help_meta {
-List<Str*>* TopicMetadata();
+Dict<Str*, Str*>* TopicMetadata();
 }
 ''')
 
@@ -515,7 +515,7 @@ def TopicMetadata():
 #include "mycpp/runtime.h"
 
 namespace help_meta {
-List<Str*>* TopicMetadata() {
+Dict<Str*, Str*>* TopicMetadata() {
   return nullptr;
 }
 }

diff --git a/mycpp/cppgen_pass.py b/mycpp/cppgen_pass.py
@@ -396,6 +396,10 @@ def __init__(self,
 
         self.imported_names = set()  # MemberExpr -> module::Foo() or self->foo
 
+        # HACK for conditional import inside mylib.PYTHON
+        # in core/shell.py
+        self.imported_names.add('help_meta')
+
         # So we can report multiple at once
         # module path, line number, message
         self.errors_keep_going: List[Tuple[str, int, str]] = []