Always use val

Author: kornilova203

bindgen/ir/IR.cpp

@@ -290,9 +290,8 @@ std::string IR::getDefineForVar(const std::string &varName) const {
     return "";
 }
 
-Variable *IR::addVariable(const std::string &name, const std::string &type,
-                          bool isConst) {
-    Variable *variable = new Variable(name, type, isConst);
+Variable *IR::addVariable(const std::string &name, const std::string &type) {
+    Variable *variable = new Variable(name, type);
     variables.push_back(variable);
     return variable;
 }

bindgen/ir/IR.h

@@ -41,8 +41,7 @@ class IR {
 
     void addVarDefine(std::string name, Variable *variable);
 
-    Variable *addVariable(const std::string &name, const std::string &type,
-                          bool isConst);
+    Variable *addVariable(const std::string &name, const std::string &type);
 
     /**
      * @return true if there are no functions, types,

bindgen/ir/VarDefine.cpp

@@ -5,13 +5,8 @@ VarDefine::VarDefine(std::string name, Variable *variable)
 
 llvm::raw_ostream &operator<<(llvm::raw_ostream &s,
                               const VarDefine &varDefine) {
-    s << "  @name(\"" << varDefine.variable->getName() << "\")\n";
-    if (varDefine.variable->getIsConst()) {
-        s << "  val ";
-    } else {
-        s << "  def ";
-    }
-    s << varDefine.getName() << ": " << varDefine.variable->getType()
-      << " = native.extern\n";
+    s << "  @name(\"" << varDefine.variable->getName() << "\")\n"
+      << "  val " << varDefine.getName() << ": "
+      << varDefine.variable->getType() << " = native.extern\n";
     return s;
 }

bindgen/ir/Variable.cpp

@@ -1,7 +1,4 @@
 #include "Variable.h"
 
-Variable::Variable(const std::string &name, const std::string &type,
-                   bool isConst)
-    : TypeAndName(name, type), isConst(isConst) {}
-
-bool Variable::getIsConst() { return isConst; }
+Variable::Variable(const std::string &name, const std::string &type)
+    : TypeAndName(name, type) {}

bindgen/ir/Variable.h

@@ -5,12 +5,7 @@
 
 class Variable : public TypeAndName {
   public:
-    Variable(const std::string &name, const std::string &type, bool isConst);
-
-    bool getIsConst();
-
-  private:
-    bool isConst;
+    Variable(const std::string &name, const std::string &type);
 };
 
 #endif // SCALA_NATIVE_BINDGEN_VARIABLE_H

bindgen/visitor/TreeVisitor.cpp

@@ -165,8 +165,7 @@ bool TreeVisitor::VisitVarDecl(clang::VarDecl *varDecl) {
         std::string variableName = varDecl->getName().str();
         std::string type =
             handleReservedWords(typeTranslator.Translate(varDecl->getType()));
-        Variable *variable = ir.addVariable(
-            variableName, type, varDecl->getType().isConstQualified());
+        Variable *variable = ir.addVariable(variableName, type);
         /* check if there is a macro for the variable.
          * Macros were saved by DefineFinder */
         std::string macroName = ir.getDefineForVar(variableName);

tests/samples/VarDefine.c

@@ -1,3 +1,5 @@
 #include "VarDefine.h"
 
 int a = 23;
+const int constInt = 10;
+const int *constIntPointer = 0;

tests/samples/VarDefine.scala

@@ -7,9 +7,9 @@ import scala.scalanative.native._
 @native.extern
 object VarDefine {
   @name("a")
-  def A: native.CInt = native.extern
+  val 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
+  val CONST_INT_POINTER: native.Ptr[native.CInt] = native.extern
 }

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

@@ -6,6 +6,7 @@ object VarDefineTests extends TestSuite {
   val tests = Tests {
     'getA - {
       assert(VarDefine.A == 23)
+      assert(VarDefine.CONST_INT == 10)
     }
   }
 }