don't codegen top-level code (#17)

Author: jjergus

src/RouterCLILookupCodegenBuilder.hack

@@ -72,11 +72,20 @@ final class RouterCLILookupCodegenBuilder {
       ->setShebangLine('#!/usr/bin/env hhvm')
       ->setFileType(CodegenFileType::HACK_PARTIAL)
       ->setGeneratedFrom($this->generatedFrom)
-      ->setPseudoMainHeader($this->getInitCode())
       ->addClass($this->getCodegenClass($router_classname, $utility_classname))
-      ->setPseudoMainFooterf(
-        '(new %s())->main($argv);',
-        $utility_classname,
+      ->addFunction(
+        $this->cg->codegenFunction('hack_router_cli_lookup_generated_main')
+          ->addEmptyUserAttribute('__EntryPoint')
+          ->setReturnType('void')
+          ->setBodyf(
+            "%s\n".
+            '$argv = '.
+            '\\Facebook\\TypeAssert\\matches<KeyedContainer<int, string>>('.
+            "\\HH\\global_get('argv'));\n".
+            "(new %s())->main(\$argv);\n",
+            $this->getInitCode(),
+            $utility_classname,
+          ),
       );
 
     if ($namespace !== null) {
@@ -165,8 +174,7 @@ final class RouterCLILookupCodegenBuilder {
       '/../',
     };
     $autoloader_files = ImmSet {
-      'hh_autoload.php',
-      'autoload.php',
+      'autoload.hack',
     };
     $full_autoloader_files = Set { };
     foreach ($autoloader_files as $file) {
@@ -201,6 +209,7 @@ final class RouterCLILookupCodegenBuilder {
       ->addLine('exit(1);')
       ->endIfBlock()
       ->addLine('require_once($autoloader);')
+      ->addLine('\\Facebook\\AutoloadMap\\initialize();')
       ->endManualSection()
       ->getCode();
   }

tests/examples/codegen/lookup-path.php

@@ -7,29 +7,37 @@
  * To re-generate this file run vendor/hhvm/hacktest/bin/hacktest
  *
  *
- * @partially-generated SignedSource<<584ccd4103e1cb5ddaa5cdc80ba52017>>
+ * @partially-generated SignedSource<<c6a69f51450330c9524afac2290c7b3d>>
  */
 namespace Facebook\HackRouter\CodeGen\Tests\Generated;
-/* BEGIN MANUAL SECTION init */
-$autoloader = null;
-$autoloader_candidates = ImmSet {
-  __DIR__.'/vendor/hh_autoload.php',
-  __DIR__.'/../vendor/hh_autoload.php',
-  __DIR__.'/../../vendor/hh_autoload.php',
-  __DIR__.'/../../../vendor/hh_autoload.php',
-};
-foreach ($autoloader_candidates as $candidate) {
-  if (\file_exists($candidate)) {
-    $autoloader = $candidate;
-    break;
+
+<<__EntryPoint>>
+function hack_router_cli_lookup_generated_main(): void {
+  /* BEGIN MANUAL SECTION init */
+  $autoloader = null;
+  $autoloader_candidates = ImmSet {
+    __DIR__.'/vendor/autoload.hack',
+    __DIR__.'/../vendor/autoload.hack',
+    __DIR__.'/../../vendor/autoload.hack',
+    __DIR__.'/../../../vendor/autoload.hack',
+  };
+  foreach ($autoloader_candidates as $candidate) {
+    if (\file_exists($candidate)) {
+      $autoloader = $candidate;
+      break;
+    }
   }
+  if ($autoloader === null) {
+    \fwrite(\STDERR, "Can't find autoloader.\n");
+    exit(1);
+  }
+  require_once($autoloader);
+  \Facebook\AutoloadMap\initialize();
+  /* END MANUAL SECTION */
+
+  $argv = \Facebook\TypeAssert\matches<KeyedContainer<int, string>>(\HH\global_get('argv'));
+  (new MySiteRouterCLILookup())->main($argv);
 }
-if ($autoloader === null) {
-  \fwrite(\STDERR, "Can't find autoloader.\n");
-  exit(1);
-}
-require_once($autoloader);
-/* END MANUAL SECTION */
 
 final class MySiteRouterCLILookup {
 
@@ -84,5 +92,3 @@ public function main(KeyedContainer<int, string> $argv): void {
     }
   }
 }
-
-(new MySiteRouterCLILookup())->main($argv);