Check that helper object is not empty

Author: kornilova203

ir/Enum.cpp

@@ -11,11 +11,11 @@ std::string Enumerator::getName() {
 Enum::Enum(std::string name, std::vector<Enumerator> enumerators)
         : name(std::move(name)), enumerators(std::move(enumerators)) {}
 
-bool Enum::isAnonymous() {
+bool Enum::isAnonymous() const {
     return name.empty();
 }
 
-TypeDef Enum::generateTypeDef() {
+TypeDef Enum::generateTypeDef() const {
     assert (!name.empty()); // called after isAnonymous()
     return TypeDef("enum_" + name, "native.CInt");
 }

ir/Enum.h

@@ -23,9 +23,9 @@ class Enum {
 public:
     Enum(std::string name, std::vector<Enumerator> enumerators);
 
-    bool isAnonymous();
+    bool isAnonymous() const;
 
-    TypeDef generateTypeDef();
+    TypeDef generateTypeDef() const;
 
     friend std::ostream &operator<<(std::ostream &s, const Enum &e);
 

ir/IR.cpp

@@ -77,7 +77,7 @@ std::string IR::generate() {
         s << "}\n\n";
     }
 
-    if (!unions.empty() || !structs.empty()) {
+    if (hasHelperMethods()) {
         s << "object " << libName << "Helpers {\n";
 
         for (const auto &st : structs) {
@@ -97,15 +97,15 @@ std::string IR::generate() {
 }
 
 void IR::generateTypeDefs() {
-    for (auto e : enums) {
+    for (const auto &e : enums) {
         if (!e.isAnonymous()) { // enum might be anon
             typeDefs.push_back(e.generateTypeDef());
         }
     }
-    for (auto s : structs) {
+    for (const auto &s : structs) {
         typeDefs.push_back(s.generateTypeDef());
     }
-    for (auto u : unions) {
+    for (const auto &u : unions) {
         typeDefs.push_back(u.generateTypeDef());
     }
 }
@@ -116,3 +116,17 @@ void IR::generateDecl() {
         generated = true;
     }
 }
+
+bool IR::hasHelperMethods() const {
+    if (!unions.empty()) {
+        /* all unions have helper methods */
+        return true;
+    }
+
+    for (const auto &s : structs) {
+        if (s.hasHelperMethods()) {
+            return true;
+        }
+    }
+    return false;
+}

ir/IR.h

@@ -43,6 +43,11 @@ class IR {
 
     void generateDecl();
 
+    /**
+     * @return true if helper methods will be generated for this library
+     */
+    bool hasHelperMethods() const;
+
     std::string libName;
     std::vector<Function> functions;
     std::vector<TypeDef> typeDefs;

ir/Struct.cpp

@@ -12,7 +12,7 @@ StructOrUnion::StructOrUnion(std::string name, std::vector<Field> fields)
 Struct::Struct(std::string name, std::vector<Field> fields, uint64_t typeSize)
         : StructOrUnion(std::move(name), std::move(fields)), typeSize(typeSize) {}
 
-TypeDef Struct::generateTypeDef() {
+TypeDef Struct::generateTypeDef() const {
     if (fields.size() < SCALA_NATIVE_MAX_STRUCT_FIELDS) {
         return TypeDef("struct_" + name,
                        "native.CStruct" + std::to_string(fields.size()) + "[" + getFieldsTypes() + "]");
@@ -23,7 +23,7 @@ TypeDef Struct::generateTypeDef() {
     }
 }
 
-std::string Struct::getFieldsTypes() {
+std::string Struct::getFieldsTypes() const {
     std::stringstream s;
     auto fieldsCount = static_cast<int>(fields.size());
     for (int i = 0; i < fieldsCount; i++) {
@@ -36,8 +36,8 @@ std::string Struct::getFieldsTypes() {
 }
 
 std::string Struct::generateHelperClass() const {
-    if (fields.empty() || fields.size() >= SCALA_NATIVE_MAX_STRUCT_FIELDS) {
-        /* struct is represented as an array */
+    if (!hasHelperMethods()) {
+        /* struct is empty or represented as an array */
         return "";
     }
     std::stringstream s;
@@ -62,11 +62,15 @@ std::string Struct::generateHelperClass() const {
     return s.str();
 }
 
+bool Struct::hasHelperMethods() const {
+    return !fields.empty() && fields.size() < SCALA_NATIVE_MAX_STRUCT_FIELDS;
+}
+
 Union::Union(std::string name,
              std::vector<Field> members, uint64_t maxSize)
         : StructOrUnion(std::move(name), std::move(members)), maxSize(maxSize) {}
 
-TypeDef Union::generateTypeDef() {
+TypeDef Union::generateTypeDef() const {
     return TypeDef("union_" + name, "native.CArray[Byte, " + uint64ToScalaNat(maxSize) + "]");
 }
 

ir/Struct.h

@@ -17,7 +17,7 @@ class StructOrUnion {
 public:
     StructOrUnion(std::string name, std::vector<Field> fields);
 
-    virtual TypeDef generateTypeDef() = 0;
+    virtual TypeDef generateTypeDef() const = 0;
 
     virtual std::string generateHelperClass() const = 0;
 
@@ -30,12 +30,17 @@ class Struct : StructOrUnion {
 public:
     Struct(std::string name, std::vector<Field> fields, uint64_t typeSize);
 
-    TypeDef generateTypeDef() override;
+    TypeDef generateTypeDef() const override;
 
     std::string generateHelperClass() const override;
 
+    /**
+     * @return true if helper methods will be generated for this struct
+     */
+    bool hasHelperMethods() const;
+
 private:
-    std::string getFieldsTypes();
+    std::string getFieldsTypes() const;
 
     /* type size is needed if number of fields is bigger than 22 */
     uint64_t typeSize;
@@ -45,7 +50,7 @@ class Union : StructOrUnion {
 public:
     Union(std::string name, std::vector<Field> members, uint64_t maxSize);
 
-    TypeDef generateTypeDef() override;
+    TypeDef generateTypeDef() const override;
 
     std::string generateHelperClass() const override;