Change def to val

bindgen/ir/IR.cpp

@@ -80,9 +80,7 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const IR &ir) {
         }
 
         for (const auto &varDefine : ir.varDefines) {
-            s << "  @name(\"" << varDefine.getVarName() << "\")\n"
-              << "  def " << varDefine.getName() << ": " << varDefine.getType()
-              << " = native.extern\n";
+            s << varDefine;
         }
 
         for (const auto &func : ir.functions) {

bindgen/ir/VarDefine.cpp

@@ -7,3 +7,11 @@ VarDefine::VarDefine(std::string name, std::string varName, std::string type)
 std::string VarDefine::getVarName() const { return varName; }
 
 std::string VarDefine::getType() const { return type; }
+
+llvm::raw_ostream &operator<<(llvm::raw_ostream &s,
+                              const VarDefine &varDefine) {
+    s << "  @name(\"" << varDefine.getVarName() << "\")\n"
+      << "  val " << varDefine.getName() << ": " << varDefine.getType()
+      << " = native.extern\n";
+    return s;
+}

bindgen/ir/VarDefine.h

@@ -2,6 +2,7 @@
 #define SCALA_NATIVE_BINDGEN_VARDEFINE_H
 
 #include "Define.h"
+#include <llvm/Support/raw_ostream.h>
 
 class VarDefine : public Define {
   public:
@@ -11,6 +12,9 @@ class VarDefine : public Define {
 
     std::string getType() const;
 
+    friend llvm::raw_ostream &operator<<(llvm::raw_ostream &s,
+                                         const VarDefine &varDefine);
+
   private:
     std::string varName;
     std::string type;

tests/samples/VarDefine.c

@@ -1,5 +1,3 @@
 #include "VarDefine.h"
 
 int a = 23;
-
-int getA() { return a; }

tests/samples/VarDefine.h

@@ -9,5 +9,3 @@ extern int c;
 
 extern float f;
 #define __PRIVATE f // should be filtered
-
-int getA();

tests/samples/VarDefine.scala

@@ -7,6 +7,5 @@ import scala.scalanative.native._
 @native.extern
 object VarDefine {
   @name("a")
-  def A: native.CInt = native.extern
-  def getA(): native.CInt = native.extern
+  val A: native.CInt = native.extern
 }

tests/samples/src/test/scala/org/scalanative/bindgen/samples/VarDefineTests.scala

@@ -5,7 +5,7 @@ import utest._
 object VarDefineTests extends TestSuite {
   val tests = Tests {
     'getA - {
-      assert(VarDefine.getA() == 23)
+      assert(VarDefine.A == 23)
     }
   }
 }