[Heavy] Fix add-argument; Remove func return values from IR

Author: ricejasonf

heavy/lib/Mlir.cpp

@@ -356,8 +356,8 @@ void add_argument(Context& C, ValueRefs Args) {
   heavy::SourceLocation Loc= Args[2].getSourceLocation();
   if (!Block)
     return C.RaiseError("expecting mlir.block: {}", Args[0]);
-  if (Type)
-    return C.RaiseError("expecting mlir.block: {}", Args[1]);
+  if (!Type)
+    return C.RaiseError("expecting mlir.type: {}", Args[1]);
 
   mlir::OpBuilder* Builder = getCurrentBuilder(C);
   if (!Builder)

heavy/lib/OpGen.cpp

@@ -448,12 +448,12 @@ mlir::FunctionType OpGen::createFunctionType(unsigned Arity,
   mlir::Type ClosureT   = Builder.getType<HeavyContextTy>();
   mlir::Type ValueT     = Builder.getType<HeavyValueTy>();
 
-  llvm::SmallVector<mlir::Type, 16> Types{};
+  llvm::SmallVector<mlir::Type, 16> ArgTypes{};
   // push the closure type
-  Types.push_back(ClosureT);
+  ArgTypes.push_back(ClosureT);
   if (Arity > 0) {
     for (unsigned i = 0; i < Arity - 1; i++) {
-      Types.push_back(ValueT);
+      ArgTypes.push_back(ValueT);
     }
 
     mlir::Type LastParamT;
@@ -468,10 +468,10 @@ mlir::FunctionType OpGen::createFunctionType(unsigned Arity,
       LastParamT = Builder.getType<HeavyValueRefsTy>();
       break;
     }
-    Types.push_back(LastParamT);
+    ArgTypes.push_back(LastParamT);
   }
 
-  return Builder.getFunctionType(Types, ValueT);
+  return Builder.getFunctionType(ArgTypes, /*ResultTypes*/{});
 }
 
 heavy::FuncOp OpGen::createFunction(SourceLocation Loc,

heavy/test/Evaluate/create-op.scm

@@ -2,6 +2,10 @@
 (import (heavy builtins))
 (import (heavy mlir))
 
+(load-dialect "func")
+(load-dialect "heavy")
+
+(define !heavy.context (type "!heavy.context"))
 (define !heavy.value (type "!heavy.value"))
 
 ; CHECK: #op{%0 = "heavy.literal"() {info = #heavy<"\22foo\22">} : () -> !heavy.value
@@ -89,3 +93,37 @@
 (write command)
 (newline)
 
+;; FIXME Why is it not pretty printing the func.func?
+; COM-CHECK: #op{func.func @my_func(%arg0: !heavy.context, %arg1: !heavy.value) {
+
+; CHECK: #op{"func.func"() <{
+; CHECK-NEXT: ^bb0(%arg0: !heavy.context, %arg1: !heavy.value)
+(define my-func
+  (create-op "func.func"
+    (loc: 0)
+    (operands:)
+    (attributes:
+      ("sym_name" (string-attr "my_func"))
+      ("function_type"
+       (type-attr (%function-type
+                    #(!heavy.context !heavy.value)
+                    #()))))
+    (result-types:)
+    (region: "body" ((ctx : !heavy.context) (arg1 : !heavy.value))
+      (define callee
+        (create-op "heavy.load_global"
+          (loc: 0)
+          (operands:)
+          (attributes:
+            ("name" (flat-symbolref-attr "_HEAVYL5SheavyL4SbaseV5Swrite")))
+          (result-types: !heavy.value)
+          ))
+      (create-op "heavy.apply"
+        (loc: 0)
+        (operands: ctx arg1)
+        (attributes:)
+        (result-types:))
+      )))
+(write my-func)
+(newline)
+