Clean up encoding of natural numbers used in array sizes

Constant array sizes can only be positive so remove signed conversion of
integer to Scala Native natural number encoding in favour of the
unsigned one.

Author: jonas

TypeTranslator.cpp

@@ -116,8 +116,9 @@ std::string TypeTranslator::TranslateEnum(const clang::QualType& qtpe){
 }
 
 std::string TypeTranslator::TranslateConstantArray(const clang::ConstantArrayType* ar, const std::string* avoid){
-    const llvm::APInt& size =  ar->getSize();
-    return "native.CArray[" + Translate(ar->getElementType(), avoid) + ", " + intToScalaNat((int)size.roundToDouble()) + "]";
+    const uint64_t size = ar->getSize().getZExtValue();
+    const std::string nat = uint64ToScalaNat(size);
+    return "native.CArray[" + Translate(ar->getElementType(), avoid) + ", " + nat + "]";
 }
 
 std::string TypeTranslator::Translate(const clang::QualType& qtpe, const std::string* avoid){

Utils.h

@@ -15,35 +15,17 @@ inline std::string basename(const std::string& pathname) {
             pathname.end()};
 }
 
-inline std::string intToScalaNat(int v, std::string accumulator = ""){
-
-    if(v > 0){
-        int last_digit = v % 10;
-        int rest = v / 10;
-
-        if(accumulator == ""){
-            return intToScalaNat(rest, "_" + std::to_string(last_digit));
-        } else{
-            return intToScalaNat(rest, "Digit[_" + std::to_string(last_digit) + ", " + accumulator + "]");
-        }
-    } else{
+inline std::string uint64ToScalaNat(uint64_t v, std::string accumulator = "") {
+    if (v == 0)
         return accumulator;
-    }
-}
 
-inline std::string uint64ToScalaNat(uint64_t v, std::string accumulator = ""){
+    int last_digit = v % 10;
+    int rest = v / 10;
 
-    if(v > 0){
-        int last_digit = v % 10;
-        int rest = v / 10;
-
-        if(accumulator == ""){
-            return uint64ToScalaNat(rest, "_" + std::to_string(last_digit));
-        } else{
-            return uint64ToScalaNat(rest, "Digit[_" + std::to_string(last_digit) + ", " + accumulator + "]");
-        }
-    } else{
-        return accumulator;
+    if (accumulator.empty()) {
+        return uint64ToScalaNat(rest, "_" + std::to_string(last_digit));
+    } else {
+        return uint64ToScalaNat(rest, "Digit[_" + std::to_string(last_digit) + ", " + accumulator + "]");
     }
 }
 

visitor/TreeVisitor.cpp

@@ -109,8 +109,6 @@ void TreeVisitor::handleUnion(clang::RecordDecl *record, std::string name) {
         fields.push_back(Field(fname, ftype));
     }
 
-    auto usize = intToScalaNat(static_cast<int>(maxSize));
-
     ir->addUnion(name, fields, maxSize);
 }