Merge pull request #158 from kornilova-l/move-defines-to-main-object

Move literal defines to main object

Author: kornilova203

bindgen/ir/IR.cpp

@@ -87,7 +87,8 @@ void IR::addVarDefine(std::string name, std::shared_ptr<Variable> variable) {
 bool IR::libObjEmpty() const {
     return functions.empty() && !shouldOutputType(typeDefs) &&
            !shouldOutputType(structs) && !shouldOutputType(unions) &&
-           varDefines.empty() && variables.empty() && enums.empty();
+           varDefines.empty() && variables.empty() &&
+           !shouldOutputType(enums) && literalDefines.empty();
 }
 
 llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const IR &ir) {
@@ -97,24 +98,21 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const IR &ir) {
         s << "package " << ir.packageName << "\n\n";
     }
 
-    if (!ir.libObjEmpty() || ir.shouldOutputType(ir.enums) ||
-        !ir.literalDefines.empty()) {
-        s << "import scala.scalanative._\n"
-          << "import scala.scalanative.native._\n\n";
+    if (ir.libObjEmpty()) {
+        return s;
     }
 
-    std::string objectName = handleReservedWords(ir.objectName);
+    s << "import scala.scalanative._\n"
+      << "import scala.scalanative.native._\n\n";
 
-    bool isLibObjectEmpty = ir.libObjEmpty();
-
-    if (!isLibObjectEmpty) {
+    if (!ir.functions.empty() || !ir.varDefines.empty() ||
+        !ir.variables.empty()) {
         if (!ir.linkName.empty()) {
             s << "@native.link(\"" << ir.linkName << "\")\n";
         }
-
-        s << "@native.extern\n"
-          << "object " << objectName << " {\n";
+        s << "@native.extern\n";
     }
+    s << "object " << handleReservedWords(ir.objectName) << " {\n";
 
     std::vector<std::shared_ptr<const Type>> visitedTypes;
 
@@ -171,22 +169,20 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const IR &ir) {
         }
     }
 
-    if (ir.hasHelperMethods()) {
-        s << "\n  object implicits {\n" << ir.getHelperMethods() << "  }\n";
-    }
-
-    if (!isLibObjectEmpty) {
-        s << "}\n\n";
-    }
-
     if (!ir.literalDefines.empty()) {
-        s << "object " << ir.libName << "Defines {\n";
+        s << "\n  object defines {\n";
         for (const auto &literalDefine : ir.literalDefines) {
             s << literalDefine->getDefinition(ir.locationManager);
         }
-        s << "}\n\n";
+        s << "  }\n";
+    }
+
+    if (ir.hasHelperMethods()) {
+        s << "\n  object implicits {\n" << ir.getHelperMethods() << "  }\n";
     }
 
+    s << "}\n\n";
+
     return s;
 }
 

bindgen/ir/LiteralDefine.cpp

@@ -6,7 +6,7 @@ LiteralDefine::LiteralDefine(std::string name, std::string literal,
 
 std::string
 LiteralDefine::getDefinition(const LocationManager &locationManager) const {
-    return "  val " + name + ": " + type->str(locationManager) + " = " +
+    return "    val " + name + ": " + type->str(locationManager) + " = " +
            literal + "\n";
 }
 

tests/samples/Cycles.scala

@@ -3,8 +3,6 @@ package org.scalanative.bindgen.samples
 import scala.scalanative._
 import scala.scalanative.native._
 
-@native.link("bindgentests")
-@native.extern
 object Cycles {
   type struct_node = native.CStruct2[native.CInt, native.Ptr[Byte]]
   type struct_b = native.CStruct1[native.Ptr[native.Ptr[Byte]]]

tests/samples/LiteralDefine.scala

@@ -3,24 +3,27 @@ package org.scalanative.bindgen.samples
 import scala.scalanative._
 import scala.scalanative.native._
 
-object LiteralDefineDefines {
-  val STRING: native.CString = c"Hello, World!"
-  val LONG: native.CLong = 1000000000000L
-  val LONG_WITHOUT_ENDING: native.CLong = 1000000000000L
-  val LONG_LONG: native.CLongLong = 1000000000000L
-  val MAXIMUM_SIGNED_LONG: native.CLong = 9223372036854775807L
-  val MINIMUM_SIGNED_LONG: native.CLong = -9223372036854775808L
-  val FLOAT: native.CDouble = 5.6
-  val INT: native.CInt = 42
-  val MAXIMUM_INT: native.CInt = 2147483647
-  val NEW_INT: native.CInt = 42
-  val NEG_INT: native.CInt = -42
-  val SHOULD_BE_DEFINED: native.CString = c"Because INT is not equal to 0"
-  val OCTAL: native.CInt = 139
-  val HEXADECIMAL: native.CInt = 75
-  val EXPONENT: native.CDouble = 1e-10
-  val DOT_EXPONENT: native.CDouble = 0.01
-  val HEXADECIMAL_WITHOUT_RADIX: native.CDouble = 523264
-  val HEXADECIMAL_WITH_RADIX: native.CDouble = 7.5
-  val HEXADECIMAL_FRACTIONAL_WITH_RADIX: native.CDouble = 0.0355225
+object LiteralDefine {
+
+  object defines {
+    val STRING: native.CString = c"Hello, World!"
+    val LONG: native.CLong = 1000000000000L
+    val LONG_WITHOUT_ENDING: native.CLong = 1000000000000L
+    val LONG_LONG: native.CLongLong = 1000000000000L
+    val MAXIMUM_SIGNED_LONG: native.CLong = 9223372036854775807L
+    val MINIMUM_SIGNED_LONG: native.CLong = -9223372036854775808L
+    val FLOAT: native.CDouble = 5.6
+    val INT: native.CInt = 42
+    val MAXIMUM_INT: native.CInt = 2147483647
+    val NEW_INT: native.CInt = 42
+    val NEG_INT: native.CInt = -42
+    val SHOULD_BE_DEFINED: native.CString = c"Because INT is not equal to 0"
+    val OCTAL: native.CInt = 139
+    val HEXADECIMAL: native.CInt = 75
+    val EXPONENT: native.CDouble = 1e-10
+    val DOT_EXPONENT: native.CDouble = 0.01
+    val HEXADECIMAL_WITHOUT_RADIX: native.CDouble = 523264
+    val HEXADECIMAL_WITH_RADIX: native.CDouble = 7.5
+    val HEXADECIMAL_FRACTIONAL_WITH_RADIX: native.CDouble = 0.0355225
+  }
 }

tests/samples/NativeTypes.scala

@@ -3,8 +3,6 @@ package org.scalanative.bindgen.samples
 import scala.scalanative._
 import scala.scalanative.native._
 
-@native.link("bindgentests")
-@native.extern
 object NativeTypes {
   type size_t = native.CUnsignedInt
   type ptrdiff_t = native.CUnsignedInt

tests/samples/Typedef.scala

@@ -3,8 +3,6 @@ package org.scalanative.bindgen.samples
 import scala.scalanative._
 import scala.scalanative.native._
 
-@native.link("bindgentests")
-@native.extern
 object Typedef {
   type enum_days = native.CUnsignedInt
   object enum_days {

tests/src/test/scala/org/scalanative/bindgen/BindgenReportingSpec.scala

@@ -79,6 +79,7 @@ class BindgenReportingSpec extends FunSpec {
       assertBindgenError(
         """union undefinedUnion;
           |typedef union undefinedUnion aliasForUndefinedUnion;
+          |void foo();
           |""".stripMargin,
         Seq(
           "Warning: type alias aliasForUndefinedUnion is skipped because it is an unused alias for incomplete type.")