[refactor] Get rid of _devbuild/gen/help_index.py

It's simpler to translate with a text file and the 'loader'.

bin/oil.py

@@ -49,11 +49,6 @@ def _tlog(msg):
 _ = id_kind
 from _devbuild.gen.option_asdl import option_i
 from _devbuild.gen.syntax_asdl import source
-# Hack because we don't want libcmark.so dependency for build/dev.sh minimal
-try:
-  from _devbuild.gen import help_index  # generated file
-except ImportError:
-  help_index = None
 
 from core import alloc
 from core import error
@@ -260,7 +255,7 @@ def AppBundleMain(argv):
 
     if first_arg in ('-h', '--help'):
       errfmt = None  # not needed here
-      help_builtin = builtin_misc.Help(loader, help_index, errfmt)
+      help_builtin = builtin_misc.Help(loader, errfmt)
       help_builtin.Run(main.MakeBuiltinArgv(['bundle-usage']))
       sys.exit(0)
 

build/doc.sh

@@ -274,8 +274,7 @@ readonly CODE_DIR=_devbuild/gen
 
 # NOTE: Should eventually take .html instead of .md
 help-index-cards() {
-  local py_out=$CODE_DIR/help_index.py
-  _make-help cards-for-index $TEXT_DIR $py_out < $HTML_DIR/doc/help-index.html
+  _make-help cards-for-index $TEXT_DIR < $HTML_DIR/doc/help-index.html
 }
 
 help-cards() {

core/main.py

@@ -11,11 +11,6 @@
 from _devbuild.gen.option_asdl import option_i, builtin_i
 from _devbuild.gen.runtime_asdl import cmd_value
 from _devbuild.gen.syntax_asdl import source
-# Hack because we don't want libcmark.so dependency for build/dev.sh minimal
-try:
-  from _devbuild.gen import help_index  # generated file
-except ImportError:
-  help_index = None
 
 from asdl import runtime
 
@@ -216,7 +211,7 @@ def ShellMain(lang, argv0, arg_r, environ, login_shell, loader, line_input):
   arena = alloc.Arena()
   errfmt = ui.ErrorFormatter(arena)
 
-  help_builtin = builtin_misc.Help(loader, help_index, errfmt)
+  help_builtin = builtin_misc.Help(loader, errfmt)
   if flag.help:
     help_builtin.Run(MakeBuiltinArgv(['%s-usage' % lang]))
     return 0

doctools/make_help.py

@@ -330,7 +330,6 @@ def main(argv):
     # Extract sections from help-index.html and make them into "cards".
 
     out_dir = argv[2]
-    py_out = argv[3]
 
     groups = []
 
@@ -348,10 +347,12 @@ def main(argv):
 
       groups.append(group_id)
 
-    with open(py_out, 'w') as f:
-      f.write('GROUPS = %s\n' % pprint.pformat(groups))
+    groups_out = os.path.join(out_dir, 'groups.txt')
+    with open(groups_out, 'w') as f:
+      for g in groups:
+        print(g, file=f)
     log('')
-    log('Wrote %s', py_out)
+    log('Wrote %s', groups_out)
 
   elif action == 'cards':
     # Split help into cards.

osh/builtin_misc.py

@@ -519,12 +519,20 @@ def Run(self, cmd_val):
   # Needs a different _ResourceLoader to translate
   class Help(vm._Builtin):
 
-    def __init__(self, loader, help_index, errfmt):
-      # type: (_ResourceLoader, Any, ErrorFormatter) -> None
+    def __init__(self, loader, errfmt):
+      # type: (_ResourceLoader, ErrorFormatter) -> None
       self.loader = loader
-      self.help_index = help_index
       self.errfmt = errfmt
 
+    def _Groups(self):
+      # type: () -> List[str]
+      # TODO: cache this?
+      f = self.loader.open('_devbuild/help/groups.txt')
+      lines = f.readlines()
+      f.close()
+      groups = [line.rstrip() for line in lines]
+      return groups
+
     def Run(self, cmd_val):
       # type: (cmd_value__Argv) -> int
 
@@ -543,7 +551,7 @@ def Run(self, cmd_val):
         groups = cmd_val.argv[2:]
         if len(groups) == 0:
           # Print the whole index
-          groups = self.help_index.GROUPS
+          groups = self._Groups()
 
         for group in groups:
           try:

osh/builtin_misc_test.py

@@ -6,10 +6,6 @@
 
 import unittest
 
-try:
-  from _devbuild.gen import help_index
-except ImportError:
-  help_index = None
 from core import pyutil
 from frontend import flag_def  # side effect: flags are defined!
 _ = flag_def
@@ -46,7 +42,7 @@ def testPrintHelp(self):
     # generated?  Because I don't want to deal with a C toolchain for it.
 
     loader = pyutil.GetResourceLoader()
-    builtin_misc.Help([], help_index, loader)
+    builtin_misc.Help([], loader)
 
 if __name__ == '__main__':
   unittest.main()