Make the version error correct using \HHVM_VERSION (#286)

hhvm · Apr 16, 2020 · 64badd6 · 64badd6
1 parent d9a772b
commit 64badd6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/codegen/version.hack b/codegen/version.hack
diff --git a/src/SchemaVersionError.hack b/src/SchemaVersionError.hack
@@ -17,11 +17,9 @@ final class SchemaVersionError extends ParseError {
       $targetFile,
       null,
       Str\format(
-        "AST version mismatch: expected '%s' (%d.%d.%d), but got '%s'",
+        "AST version mismatch: expected '%s' (%s), but got '%s'",
         SCHEMA_VERSION,
-        \intdiv(HHVM_VERSION_ID, 10000),
-        \intdiv(HHVM_VERSION_ID, 100) % 100,
-        HHVM_VERSION_ID % 100,
+        HHVM_VERSION,
         $version,
       ),
     );

diff --git a/src/__Private/codegen/CodegenVersion.hack b/src/__Private/codegen/CodegenVersion.hack
@@ -33,6 +33,11 @@ final class CodegenVersion extends CodegenBase {
           ->setType('int')
           ->setValue(\HHVM_VERSION_ID, HackBuilderValues::export()),
       )
+      ->addConstant(
+        $cg->codegenConstant('HHVM_VERSION')
+          ->setType('string')
+          ->setValue(\HHVM_VERSION, HackBuilderValues::export()),
+      )
       ->save();
   }
 }