[Heavy] Fix base class alias

Author: ricejasonf

heavy/lib/Nbdl/NbdlWriter.cpp

@@ -571,9 +571,9 @@ class ContextWriter : public NbdlWriter<ContextWriter> {
     OS << "class " << ClassName << " : nbdl::context_alias<";
     OS << ImplName;
     OS << ", /*is_moveable=*/false> {\n"
-          "using Base = ";
+          "using Base = nbdl::context_alias<";
     OS << ImplName;
-    OS << ";\n using Base::Base;\n";
+    OS << ">;\n using Base::Base;\n";
     OS << "};\n";
     Flush();
   }
@@ -619,9 +619,9 @@ class DefineStoreWriter : public NbdlWriter<DefineStoreWriter> {
     OS << "class " << Name << " : public nbdl::strong_alias<";
     VisitType(V);
     OS << "> {\n"
-          "using Base = ";
+          "using Base = nbdl::strong_alias<";
     VisitType(V);
-    OS << ";\n using Base::Base;\n";
+    OS << ">;\n using Base::Base;\n";
     OS << "};\n";
   }
 

heavy/test/Nbdl/context.scm

@@ -110,13 +110,13 @@
 (unless (verify current-nbdl-module)
   (error "mlir verification failed"))
 
-(translate-cpp my_context)
-
 ; CHECK: class my_store {
 ; CHECK: ::moo::foo_t foo;
 ; CHECK-NEXT: ::moo::bar_t bar;
 ; CHECK-NEXT: ::moo::baz_t baz;
 ; CHECK: my_store(auto&& arg_0)
 ; CHECK-NEXT: : foo(42), bar(), baz(arg_0), baz2(static_cast<decltype(arg_0)>(arg_0)) 
 (translate-cpp my_store)
+(translate-cpp my_context)
+
 (newline)