Use val for const variables and def otherwise

Author: kornilova203

bindgen/ir/IR.cpp

@@ -40,12 +40,12 @@ void IR::addLiteralDefine(std::string name, std::string literal,
 
 void IR::addPossibleVarDefine(const std::string &macroName,
                               const std::string &varName) {
-    possibleVarDefines.emplace_back(macroName, varName, "");
+    possibleVarDefines.emplace_back(macroName, varName, "", false);
 }
 
 void IR::addVarDefine(const std::string &macroName, const std::string &varName,
-                      const std::string &type) {
-    varDefines.emplace_back(macroName, varName, type);
+                      const std::string &type, bool isConst) {
+    varDefines.emplace_back(macroName, varName, type, isConst);
 }
 
 bool IR::libObjEmpty() const {

bindgen/ir/IR.h

@@ -37,7 +37,7 @@ class IR {
                               const std::string &varName);
 
     void addVarDefine(const std::string &macroName, const std::string &varName,
-                      const std::string &type);
+                      const std::string &type, bool isConst);
 
     /**
      * @return true if there are no functions, types,

bindgen/ir/VarDefine.cpp

@@ -1,17 +1,23 @@
 #include "VarDefine.h"
 
-VarDefine::VarDefine(std::string name, std::string varName, std::string type)
+VarDefine::VarDefine(std::string name, std::string varName, std::string type,
+                     bool isConst)
     : Define(std::move(name)), varName(std::move(varName)),
-      type(std::move(type)) {}
+      type(std::move(type)), isConst(isConst) {}
 
 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()
+    s << "  @name(\"" << varDefine.getVarName() << "\")\n";
+    if (varDefine.isConst) {
+        s << "  val ";
+    } else {
+        s << "  def ";
+    }
+    s << varDefine.getName() << ": " << varDefine.getType()
       << " = native.extern\n";
     return s;
 }

bindgen/ir/VarDefine.h

@@ -6,7 +6,8 @@
 
 class VarDefine : public Define {
   public:
-    VarDefine(std::string name, std::string varName, std::string type);
+    VarDefine(std::string name, std::string varName, std::string type,
+              bool isConst);
 
     std::string getVarName() const;
 
@@ -18,6 +19,7 @@ class VarDefine : public Define {
   private:
     std::string varName;
     std::string type;
+    bool isConst;
 };
 
 #endif // SCALA_NATIVE_BINDGEN_VARDEFINE_H

bindgen/visitor/TreeVisitor.cpp

@@ -169,7 +169,8 @@ bool TreeVisitor::VisitVarDecl(clang::VarDecl *varDecl) {
         if (!macroName.empty()) {
             std::string type = handleReservedWords(
                 typeTranslator.Translate(varDecl->getType()));
-            ir.addVarDefine(macroName, varName, type);
+            ir.addVarDefine(macroName, varName, type,
+                            varDecl->getType().isConstQualified());
         }
     }
     return true;

tests/samples/VarDefine.h

@@ -1,6 +1,12 @@
 extern int a;
 #define A a
 
+extern const int constInt;
+#define CONST_INT constInt
+
+extern const int *constIntPointer;
+#define CONST_INT_POINTER constIntPointer
+
 #define B b // ignored because there is no such variable
 
 extern int c;

tests/samples/VarDefine.scala

@@ -7,5 +7,9 @@ import scala.scalanative.native._
 @native.extern
 object VarDefine {
   @name("a")
-  val A: native.CInt = native.extern
+  def A: native.CInt = native.extern
+  @name("constInt")
+  val CONST_INT: native.CInt = native.extern
+  @name("constIntPointer")
+  def CONST_INT_POINTER: native.Ptr[native.CInt] = native.extern
 }