Merge pull request #47 from kornilova-l/use-package-name-with-natural-numbers

Add prefix native.Nat to Digits

Author: kornilova203

bindgen/Utils.h

@@ -24,10 +24,12 @@ inline std::string uint64ToScalaNat(uint64_t v, std::string accumulator = "") {
     auto rest = v / 10;
 
     if (accumulator.empty()) {
-        return uint64ToScalaNat(rest, "_" + std::to_string(last_digit));
+        return uint64ToScalaNat(rest,
+                                "native.Nat._" + std::to_string(last_digit));
     } else {
-        return uint64ToScalaNat(rest, "Digit[_" + std::to_string(last_digit) +
-                                          ", " + accumulator + "]");
+        return uint64ToScalaNat(rest, "native.Nat.Digit[native.Nat._" +
+                                          std::to_string(last_digit) + ", " +
+                                          accumulator + "]");
     }
 }
 

bindgen/ir/IR.cpp

@@ -43,8 +43,7 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const IR &ir) {
 
     if (!ir.libObjEmpty() || !ir.enums.empty()) {
         s << "import scala.scalanative._\n"
-          << "import scala.scalanative.native._\n"
-          << "import scala.scalanative.native.Nat._\n\n";
+          << "import scala.scalanative.native._\n\n";
     }
 
     std::string libObjName = handleReservedWords(ir.libName);

tests/samples/Enum.scala

@@ -1,6 +1,5 @@
 import scala.scalanative._
 import scala.scalanative.native._
-import scala.scalanative.native.Nat._
 
 @native.link("Enum")
 @native.extern

tests/samples/Function.scala

@@ -1,6 +1,5 @@
 import scala.scalanative._
 import scala.scalanative.native._
-import scala.scalanative.native.Nat._
 
 @native.link("Function")
 @native.extern

tests/samples/NativeTypes.scala

@@ -1,6 +1,5 @@
 import scala.scalanative._
 import scala.scalanative.native._
-import scala.scalanative.native.Nat._
 
 @native.link("NativeTypes")
 @native.extern

tests/samples/PrivateMembers.scala

@@ -1,6 +1,5 @@
 import scala.scalanative._
 import scala.scalanative.native._
-import scala.scalanative.native.Nat._
 
 @native.link("PrivateMembers")
 @native.extern
@@ -15,7 +14,7 @@ object PrivateMembers {
   type struct_structWithPrivateStruct = native.CStruct1[native.Ptr[struct_structWithPrivateType]]
   type struct_normalStruct = native.CStruct1[native.CInt]
   type struct_privateStructWithTypedef = native.CStruct1[native.Ptr[__private_type]]
-  type union___unionWithPrivateName = native.CArray[Byte, Digit[_3, _2]]
+  type union___unionWithPrivateName = native.CArray[Byte, native.Nat.Digit[native.Nat._3, native.Nat._2]]
   def getTypeThatUsesPrivateTypes(): pid_t = native.extern
   def getPrivateType(): native.Ptr[__private_type] = native.extern
   def usesPrivateUnion(anonymous0: union___unionWithPrivateName): Unit = native.extern

tests/samples/ReservedWords.h

@@ -28,3 +28,4 @@ typedef struct {
     lazy finally;
 } finally;
 match implicit(finally type[12]);
+void _1();

tests/samples/ReservedWords.scala

@@ -1,22 +1,22 @@
 import scala.scalanative._
 import scala.scalanative.native._
-import scala.scalanative.native.Nat._
 
 @native.link("ReservedWords")
 @native.extern
 object ReservedWords {
   type `match` = native.CInt
-  type `var` = native.CArray[`match`, _5]
+  type `var` = native.CArray[`match`, native.Nat._5]
   type `object` = struct_object
   type `type` = struct_object
   type `lazy` = union_lazy
   type `def` = `match`
   type `finally` = struct_finally
   type struct_object = native.CStruct2[`match`, native.CInt]
   type struct_finally = native.CStruct2[`def`, `lazy`]
-  type union_lazy = native.CArray[Byte, Digit[_1, Digit[_2, _8]]]
+  type union_lazy = native.CArray[Byte, native.Nat.Digit[native.Nat._1, native.Nat.Digit[native.Nat._2, native.Nat._8]]]
   def `with`(`sealed`: `match`, `implicit`: native.Ptr[`match`], `forSome`: `lazy`): `type` = native.extern
   def `implicit`(`type`: native.Ptr[`finally`]): `match` = native.extern
+  def _1(): Unit = native.extern
 }
 
 import ReservedWords._
@@ -46,7 +46,7 @@ object ReservedWordsHelpers {
     def instance_=(value: native.Ptr[`object`]): Unit = !p.cast[native.Ptr[native.Ptr[`object`]]] = value
     def `forSome`: native.Ptr[`match`] = p.cast[native.Ptr[`match`]]
     def `forSome_=`(value: `match`): Unit = !p.cast[native.Ptr[`match`]] = value
-    def `implicit`: native.Ptr[native.CArray[Byte, Digit[_1, Digit[_2, _8]]]] = p.cast[native.Ptr[native.CArray[Byte, Digit[_1, Digit[_2, _8]]]]]
-    def `implicit_=`(value: native.CArray[Byte, Digit[_1, Digit[_2, _8]]]): Unit = !p.cast[native.Ptr[native.CArray[Byte, Digit[_1, Digit[_2, _8]]]]] = value
+    def `implicit`: native.Ptr[native.CArray[Byte, native.Nat.Digit[native.Nat._1, native.Nat.Digit[native.Nat._2, native.Nat._8]]]] = p.cast[native.Ptr[native.CArray[Byte, native.Nat.Digit[native.Nat._1, native.Nat.Digit[native.Nat._2, native.Nat._8]]]]]
+    def `implicit_=`(value: native.CArray[Byte, native.Nat.Digit[native.Nat._1, native.Nat.Digit[native.Nat._2, native.Nat._8]]]): Unit = !p.cast[native.Ptr[native.CArray[Byte, native.Nat.Digit[native.Nat._1, native.Nat.Digit[native.Nat._2, native.Nat._8]]]]] = value
   }
 }

tests/samples/Struct.scala

@@ -1,6 +1,5 @@
 import scala.scalanative._
 import scala.scalanative.native._
-import scala.scalanative.native.Nat._
 
 @native.link("Struct")
 @native.extern

tests/samples/Typedef.scala

@@ -1,6 +1,5 @@
 import scala.scalanative._
 import scala.scalanative.native._
-import scala.scalanative.native.Nat._
 
 @native.link("Typedef")
 @native.extern