Add test for resserved words in array types

Author: jonas

TypeTranslator.cpp

@@ -81,7 +81,7 @@ std::string TypeTranslator::TranslatePointer(const clang::QualType& pte, const s
 
 
 
-    return std::string("native.Ptr[") + handleReservedWords(Translate(pte, avoid)) + std::string("]");
+    return std::string("native.Ptr[") + Translate(pte, avoid) + std::string("]");
 }
 
 std::string TypeTranslator::TranslateStructOrUnion(const clang::QualType& qtpe){
@@ -153,7 +153,7 @@ std::string TypeTranslator::Translate(const clang::QualType& qtpe, const std::st
         return TranslatePointer(tpe->getAs<clang::PointerType>()->getPointeeType(), avoid);
 
     } else if(qtpe->isStructureType() || qtpe->isUnionType()){
-        return TranslateStructOrUnion(qtpe);
+        return handleReservedWords(TranslateStructOrUnion(qtpe));
 
     } else if(qtpe->isEnumeralType()){
         return TranslateEnum(qtpe);
@@ -166,10 +166,10 @@ std::string TypeTranslator::Translate(const clang::QualType& qtpe, const std::st
 
         auto found = typeMap.find(qtpe.getUnqualifiedType().getAsString());
         if(found != typeMap.end()){
-            return found->second;
+            return handleReservedWords(found->second);
         } else {
             //TODO: Properly handle non-default types
-            return qtpe.getUnqualifiedType().getAsString();
+            return handleReservedWords(qtpe.getUnqualifiedType().getAsString());
         }
     }
 

tests/samples/ReservedWords.h

@@ -1,4 +1,5 @@
 typedef int match;
+typedef match var[5];
 
 struct object {
   match yield;
@@ -19,7 +20,7 @@ union lazy {
 
 typedef union lazy lazy;
 
-type with(match sealed, int implicit, lazy forSome);
+type with(match sealed, var implicit, lazy forSome);
 
 typedef match def;
 typedef struct { def val; lazy finally; } finally;

tests/samples/ReservedWords.scala

@@ -6,6 +6,7 @@ import scala.scalanative.native.Nat._
 @native.extern
 object ReservedWords {
   type `match` = native.CInt
+  type `var` = native.CArray[`match`, _5]
   type `object` = struct_object
   type `type` = struct_object
   type `lazy` = union_lazy
@@ -14,7 +15,7 @@ object ReservedWords {
   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]]]
-  def `with`(`sealed`: `match`, `implicit`: native.CInt, `forSome`: `lazy`): `type` = native.extern
+  def `with`(`sealed`: `match`, `implicit`: native.Ptr[`match`], `forSome`: `lazy`): `type` = native.extern
   def `implicit`(`type`: native.Ptr[`finally`]): `match` = native.extern
 }