Move Struct and Union classes to separate files

kornilova203 · kornilova203 · commit e9b676b1646e · 2018-08-03T16:13:48.000+08:00
diff --git a/bindgen/CMakeLists.txt b/bindgen/CMakeLists.txt
@@ -39,8 +39,12 @@ add_executable(bindgen
   Utils.h
   ir/IR.h
   ir/IR.cpp
+  ir/StructOrUnion.cpp
+  ir/StructOrUnion.h
   ir/Struct.cpp
   ir/Struct.h
+  ir/Union.cpp
+  ir/Union.h
   ir/Function.cpp
   ir/Function.h
   ir/TypeDef.cpp
diff --git a/bindgen/ir/Function.cpp b/bindgen/ir/Function.cpp
@@ -1,6 +1,7 @@
 #include "Function.h"
 #include "../Utils.h"
 #include "Struct.h"
+#include "Union.h"
 
 Parameter::Parameter(std::string name, std::shared_ptr<const Type> type)
     : TypeAndName(std::move(name), type) {}
diff --git a/bindgen/ir/IR.h b/bindgen/ir/IR.h
@@ -8,6 +8,7 @@
 #include "PossibleVarDefine.h"
 #include "Struct.h"
 #include "TypeDef.h"
+#include "Union.h"
 #include "VarDefine.h"
 
 /**
diff --git a/bindgen/ir/Struct.cpp b/bindgen/ir/Struct.cpp
@@ -1,57 +1,18 @@
 #include "Struct.h"
 #include "../Utils.h"
+#include "Union.h"
 #include "types/ArrayType.h"
 #include "types/FunctionPointerType.h"
 #include "types/PointerType.h"
 #include "types/PrimitiveType.h"
 #include <sstream>
 
-Field::Field(std::string name, std::shared_ptr<const Type> type)
-    : TypeAndName(std::move(name), std::move(type)) {}
-
-Field::Field(std::string name, std::shared_ptr<const Type> type,
-             uint64_t offsetInBits)
-    : TypeAndName(std::move(name), std::move(type)),
-      offsetInBits(offsetInBits) {}
-
-uint64_t Field::getOffsetInBits() const { return offsetInBits; }
-
-StructOrUnion::StructOrUnion(std::string name,
-                             std::vector<std::shared_ptr<Field>> fields,
-                             std::shared_ptr<Location> location)
-    : LocatableType(std::move(location)), name(std::move(name)),
-      fields(std::move(fields)) {}
-
-std::string StructOrUnion::getName() const { return name; }
-
-bool StructOrUnion::hasHelperMethods() const { return !fields.empty(); }
-
 Struct::Struct(std::string name, std::vector<std::shared_ptr<Field>> fields,
                uint64_t typeSize, std::shared_ptr<Location> location,
                bool isPacked, bool isBitField)
     : StructOrUnion(std::move(name), std::move(fields), std::move(location)),
       typeSize(typeSize), isPacked(isPacked), hasBitField(isBitField) {}
 
-bool StructOrUnion::usesType(
-    const std::shared_ptr<const Type> &type, bool stopOnTypeDefs,
-    std::vector<std::shared_ptr<const Type>> &visitedTypes) const {
-
-    if (contains(this, visitedTypes)) {
-        return false;
-    }
-    visitedTypes.push_back(shared_from_this());
-
-    for (const auto &field : fields) {
-        if (*field->getType() == *type ||
-            field->getType()->usesType(type, stopOnTypeDefs, visitedTypes)) {
-            visitedTypes.pop_back();
-            return true;
-        }
-    }
-    visitedTypes.pop_back();
-    return false;
-}
-
 std::shared_ptr<TypeDef> Struct::generateTypeDef() {
     if (isRepresentedAsStruct()) {
         return std::make_shared<TypeDef>(getTypeAlias(), shared_from_this(),
@@ -382,80 +343,3 @@ bool Struct::hasBiggestName(const CycleNode &node,
     }
     return false;
 }
-
-Union::Union(std::string name, std::vector<std::shared_ptr<Field>> fields,
-             uint64_t maxSize, std::shared_ptr<Location> location)
-    : StructOrUnion(std::move(name), std::move(fields), std::move(location)),
-      ArrayType(std::make_shared<PrimitiveType>("Byte"), maxSize) {}
-
-std::shared_ptr<TypeDef> Union::generateTypeDef() {
-    return std::make_shared<TypeDef>(getTypeAlias(), shared_from_this(),
-                                     nullptr);
-}
-
-std::string Union::generateHelperClass() const {
-    assert(hasHelperMethods());
-    std::stringstream s;
-    std::string type = getTypeAlias();
-    s << "  implicit class " << type << "_pos"
-      << "(val p: native.Ptr[" << type << "]) extends AnyVal {\n";
-    for (const auto &field : fields) {
-        if (!field->getName().empty()) {
-            s << generateGetter(field);
-            s << generateSetter(field);
-        }
-    }
-    s << "  }\n";
-    return s.str();
-}
-
-std::string Union::getTypeAlias() const { return "union_" + name; }
-
-bool Union::operator==(const Type &other) const {
-    if (this == &other) {
-        return true;
-    }
-    auto *u = dynamic_cast<const Union *>(&other);
-    if (u) {
-        /* unions have unique names */
-        return name == u->name;
-    }
-    return false;
-}
-
-bool Union::usesType(
-    const std::shared_ptr<const Type> &type, bool stopOnTypeDefs,
-    std::vector<std::shared_ptr<const Type>> &visitedTypes) const {
-
-    if (contains(this, visitedTypes)) {
-        return false;
-    }
-    visitedTypes.push_back(shared_from_this());
-
-    if (ArrayType::usesType(type, stopOnTypeDefs, visitedTypes)) {
-        visitedTypes.pop_back();
-        return true;
-    }
-    visitedTypes.pop_back();
-
-    return StructOrUnion::usesType(type, stopOnTypeDefs, visitedTypes);
-}
-
-std::string Union::generateGetter(const std::shared_ptr<Field> &field) const {
-    std::string getter = handleReservedWords(field->getName());
-    std::string ftype = field->getType()->str();
-    return "    def " + getter + ": native.Ptr[" + ftype +
-           "] = p.cast[native.Ptr[" + ftype + "]]\n";
-}
-
-std::string Union::generateSetter(const std::shared_ptr<Field> &field) const {
-    std::string setter = handleReservedWords(field->getName(), "_=");
-    std::string ftype = field->getType()->str();
-    if (isAliasForType<ArrayType>(field->getType().get()) ||
-        isAliasForType<Struct>(field->getType().get())) {
-        return "    def " + setter + "(value: native.Ptr[" + ftype +
-               "]): Unit = !p.cast[native.Ptr[" + ftype + "]] = !value\n";
-    }
-    return "    def " + setter + "(value: " + ftype +
-           "): Unit = !p.cast[native.Ptr[" + ftype + "]] = value\n";
-}
diff --git a/bindgen/ir/Struct.h b/bindgen/ir/Struct.h
@@ -1,56 +1,10 @@
 #ifndef SCALA_NATIVE_BINDGEN_STRUCT_H
 #define SCALA_NATIVE_BINDGEN_STRUCT_H
 
-#include "LocatableType.h"
-#include "TypeAndName.h"
-#include "TypeDef.h"
-#include "types/ArrayType.h"
-#include "types/PointerType.h"
-#include <string>
-#include <vector>
+#include "StructOrUnion.h"
 
 #define SCALA_NATIVE_MAX_STRUCT_FIELDS 22
 
-class Field : public TypeAndName {
-  public:
-    Field(std::string name, std::shared_ptr<const Type> type);
-
-    Field(std::string name, std::shared_ptr<const Type> type,
-          uint64_t offsetInBits);
-
-    uint64_t getOffsetInBits() const;
-
-  protected:
-    /**
-     * Offset in bytes from address of struct/union.
-     */
-    uint64_t offsetInBits = 0;
-};
-
-class StructOrUnion : public LocatableType {
-  public:
-    StructOrUnion(std::string name, std::vector<std::shared_ptr<Field>> fields,
-                  std::shared_ptr<Location> location);
-
-    virtual std::shared_ptr<TypeDef> generateTypeDef() = 0;
-
-    virtual std::string generateHelperClass() const = 0;
-
-    std::string getName() const;
-
-    virtual std::string getTypeAlias() const = 0;
-
-    virtual bool hasHelperMethods() const;
-
-    bool usesType(
-        const std::shared_ptr<const Type> &type, bool stopOnTypeDefs,
-        std::vector<std::shared_ptr<const Type>> &visitedTypes) const override;
-
-  protected:
-    std::string name;
-    std::vector<std::shared_ptr<Field>> fields;
-};
-
 class Struct : public StructOrUnion {
   public:
     Struct(std::string name, std::vector<std::shared_ptr<Field>> fields,
@@ -164,27 +118,4 @@ class Struct : public StructOrUnion {
                         std::vector<std::string> namesInCycle) const;
 };
 
-class Union : public StructOrUnion, public ArrayType {
-  public:
-    Union(std::string name, std::vector<std::shared_ptr<Field>> fields,
-          uint64_t maxSize, std::shared_ptr<Location> location);
-
-    std::shared_ptr<TypeDef> generateTypeDef() override;
-
-    std::string generateHelperClass() const override;
-
-    bool operator==(const Type &other) const override;
-
-    std::string getTypeAlias() const override;
-
-    bool usesType(
-        const std::shared_ptr<const Type> &type, bool stopOnTypeDefs,
-        std::vector<std::shared_ptr<const Type>> &visitedTypes) const override;
-
-  private:
-    std::string generateGetter(const std::shared_ptr<Field> &field) const;
-
-    std::string generateSetter(const std::shared_ptr<Field> &field) const;
-};
-
 #endif // SCALA_NATIVE_BINDGEN_STRUCT_H
diff --git a/bindgen/ir/StructOrUnion.cpp b/bindgen/ir/StructOrUnion.cpp
@@ -0,0 +1,42 @@
+#include "StructOrUnion.h"
+#include "../Utils.h"
+
+Field::Field(std::string name, std::shared_ptr<const Type> type)
+    : TypeAndName(std::move(name), std::move(type)) {}
+
+Field::Field(std::string name, std::shared_ptr<const Type> type,
+             uint64_t offsetInBits)
+    : TypeAndName(std::move(name), std::move(type)),
+      offsetInBits(offsetInBits) {}
+
+uint64_t Field::getOffsetInBits() const { return offsetInBits; }
+
+StructOrUnion::StructOrUnion(std::string name,
+                             std::vector<std::shared_ptr<Field>> fields,
+                             std::shared_ptr<Location> location)
+    : LocatableType(std::move(location)), name(std::move(name)),
+      fields(std::move(fields)) {}
+
+bool StructOrUnion::usesType(
+    const std::shared_ptr<const Type> &type, bool stopOnTypeDefs,
+    std::vector<std::shared_ptr<const Type>> &visitedTypes) const {
+
+    if (contains(this, visitedTypes)) {
+        return false;
+    }
+    visitedTypes.push_back(shared_from_this());
+
+    for (const auto &field : fields) {
+        if (*field->getType() == *type ||
+            field->getType()->usesType(type, stopOnTypeDefs, visitedTypes)) {
+            visitedTypes.pop_back();
+            return true;
+        }
+    }
+    visitedTypes.pop_back();
+    return false;
+}
+
+std::string StructOrUnion::getName() const { return name; }
+
+bool StructOrUnion::hasHelperMethods() const { return !fields.empty(); }
diff --git a/bindgen/ir/StructOrUnion.h b/bindgen/ir/StructOrUnion.h
@@ -0,0 +1,50 @@
+#ifndef SCALA_NATIVE_BINDGEN_STRUCTORUNION_H
+#define SCALA_NATIVE_BINDGEN_STRUCTORUNION_H
+
+#include "LocatableType.h"
+#include "TypeAndName.h"
+#include "TypeDef.h"
+#include <string>
+#include <vector>
+
+class Field : public TypeAndName {
+  public:
+    Field(std::string name, std::shared_ptr<const Type> type);
+
+    Field(std::string name, std::shared_ptr<const Type> type,
+          uint64_t offsetInBits);
+
+    uint64_t getOffsetInBits() const;
+
+  protected:
+    /**
+     * Offset in bytes from address of struct/union.
+     */
+    uint64_t offsetInBits = 0;
+};
+
+class StructOrUnion : public LocatableType {
+  public:
+    StructOrUnion(std::string name, std::vector<std::shared_ptr<Field>> fields,
+                  std::shared_ptr<Location> location);
+
+    virtual std::shared_ptr<TypeDef> generateTypeDef() = 0;
+
+    virtual std::string generateHelperClass() const = 0;
+
+    std::string getName() const;
+
+    virtual std::string getTypeAlias() const = 0;
+
+    virtual bool hasHelperMethods() const;
+
+    bool usesType(
+        const std::shared_ptr<const Type> &type, bool stopOnTypeDefs,
+        std::vector<std::shared_ptr<const Type>> &visitedTypes) const override;
+
+  protected:
+    std::string name;
+    std::vector<std::shared_ptr<Field>> fields;
+};
+
+#endif // SCALA_NATIVE_BINDGEN_STRUCTORUNION_H
diff --git a/bindgen/ir/TypeDef.cpp b/bindgen/ir/TypeDef.cpp
@@ -2,6 +2,7 @@
 #include "../Utils.h"
 #include "Enum.h"
 #include "Struct.h"
+#include "Union.h"
 #include <stdexcept>
 
 TypeDef::TypeDef(std::string name, std::shared_ptr<const Type> type,
diff --git a/bindgen/ir/Union.cpp b/bindgen/ir/Union.cpp
diff --git a/bindgen/ir/Union.h b/bindgen/ir/Union.h
diff --git a/bindgen/ir/types/ArrayType.cpp b/bindgen/ir/types/ArrayType.cpp
