[Heavy] Fix clang integration

Author: ricejasonf

clang/lib/Parse/ParseDeclHeavy.cpp

@@ -316,7 +316,7 @@ bool Parser::ParseHeavyScheme() {
     };
 
     heavy::Context& Context = HeavyScheme->getContext();
-    heavy::base::InitParseSourceFile(Context, ParseSourceFileFn);
+    heavy::builtins::InitParseSourceFile(Context, ParseSourceFileFn);
     HEAVY_CLANG_VAR(diag_error).init(Context,
                                      Context.CreateLambda(diag_error));
     HEAVY_CLANG_VAR(diag_warning).init(Context,
@@ -398,7 +398,7 @@ bool Parser::ParseHeavyScheme() {
 
   // Do the thing.
   heavy::TokenKind Terminator = heavy::tok::r_brace;
-  HeavyScheme->ProcessTopLevelCommands(SchemeLexer, heavy::base::eval,
+  HeavyScheme->ProcessTopLevelCommands(SchemeLexer, heavy::builtins::eval,
                                        ErrorHandler, Terminator);
 
   // Return control to C++ Lexer

heavy/lib/Context.cpp

@@ -1634,6 +1634,8 @@ SyntaxClosure* Context::CreateSyntaxClosure(SourceLocation Loc, Value Node,
 
 EnvEntry Context::GetSyntax(EnvEntry Entry) {
   heavy::Value V = Entry.Value;
+  if (!V)
+    return EnvEntry();
   if (auto* B = dyn_cast<Binding>(V)) {
     V = B->getValue();
     // Unwrap any ExternName to see if it is a syntax.

heavy/test/Clang/import.cpp

@@ -1,4 +1,4 @@
-// RUN: clang++ -I %S/Inputs -fsyntax-only -Xclang -fheavy -Xclang -verify %s
+// RUN: clang++ -I %S/Inputs -I %heavy_module_path -fsyntax-only -Xclang -fheavy -Xclang -verify %s
 
 #include <type_traits>
 

heavy/test/Clang/source-loc.cpp

@@ -8,7 +8,7 @@
 // expected-note@14{{this is a bar in a list}}
 namespace foo {
 heavy_scheme {
-(import (heavy base) (heavy clang))
+(import (heavy builtins) (heavy clang))
 (define foo 'foo)
 (define bar "bar")
 (define baz '(foo bar))

heavy/test/Nbdl/context.cpp

@@ -26,7 +26,7 @@ namespace moo {
 }
 
 heavy_scheme {
-(import (heavy base)
+(import (heavy builtins)
         (heavy clang)
         (heavy mlir)
         (nbdl comp))

heavy/test/Nbdl/context_error.cpp

@@ -1,7 +1,7 @@
 // RUN: clang++ --std=c++23 -I %S/Inputs -fsyntax-only -Xclang -fheavy -Xclang -verify %s
 
 heavy_scheme {
-(import (heavy base)
+(import (heavy builtins)
         (heavy clang)
         (heavy mlir)
         (nbdl comp))