[Heavy] Fix local define name hygiene issue

Author: ricejasonf

heavy/lib/OpGen.cpp

@@ -947,10 +947,17 @@ mlir::Value OpGen::createDefine(Value Id, Value DefineArgs, Value OrigCall) {
   // its syntax in the current environment.
   Value Env;
 
-  if (CurSyntaxClosure)
-    DefineArgs = Context.CreateSyntaxClosure(DefineArgs.getSourceLocation(),
-                                             DefineArgs,
-                                             CurSyntaxClosure->Env);
+  if (CurSyntaxClosure) {
+    // Save syntactic closure information for Id.
+    if (auto* S = dyn_cast<Symbol>(Id))
+      Id = Context.CreateSyntaxClosure(S->getSourceLocation(),
+                                       S, CurSyntaxClosure->Env);
+    // Save syntactic closure information for DefineArgs.
+    DefineArgs = DefineArgs == CurSyntaxClosure->Node
+      ? CurSyntaxClosure
+      : Context.CreateSyntaxClosure(DefineArgs.getSourceLocation(),
+                                    DefineArgs, CurSyntaxClosure->Env);
+  }
   Binding* B = Context.CreateBinding(Id, Undefined(DefineArgs));
   // Push to the local environment.
   Context.PushLocalBinding(B);

heavy/test/Evaluate/Inputs/my/lib.sld

@@ -32,13 +32,20 @@
               (attributes
                 `("info", (MakeAttr Arg))))) X))))
 
+  (define-syntax my-lambda
+    (syntax-rules (:)
+      ((my-lambda ((arg : type) ...) body ...)
+       (lambda (arg ...)
+         body ...))))
+
     (write "end of init")
     (newline)
     ) ; end begin
 
   (export hello-module
           hello-module-syntax
-          create-op-literal)
+          create-op-literal
+          my-lambda)
 )
 (write "end of module")
 (newline)

heavy/test/Evaluate/load-module.scm

@@ -5,7 +5,9 @@
 ; CHECK-NEXT: "end of init"
 (import (my lib))
 (import (only (heavy builtins)
-              write newline lambda))
+              write newline lambda
+              + define
+              ))
 
 ; CHECK: "hello module!"
 ; CHECK-NEXT: 5
@@ -18,3 +20,15 @@
 ; CHECK: #op{"heavy.literal"() {info = #heavy<"42">}
 (write (create-op-literal ((lambda () #f)) 42))
 (newline)
+
+; CHECK: 42
+; CHECK-NEXT: 43
+; CHECK-NEXT: 44
+((my-lambda ((x : Int) (y : Int))
+  (define X (+ x 1)) ; define in syntax closure
+  (write x)
+  (newline)
+  (write X)
+  (newline)
+  (write y)) 42 44)
+(newline)