Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Move implicits to main object #154

Merged
merged 1 commit into from
Aug 10, 2018
Merged

Move implicits to main object #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 28 additions & 24 deletions bindgen/ir/IR.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,10 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const IR &ir) {
}
}

if (ir.hasHelperMethods()) {
s << "\n object implicits {\n" << ir.getHelperMethods() << " }\n";
}

if (!isLibObjectEmpty) {
s << "}\n\n";
}
Expand All @@ -183,30 +187,6 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const IR &ir) {
s << "}\n\n";
}

if (ir.hasHelperMethods()) {
s << "import " << objectName << "._\n\n";
}

if (ir.hasHelperMethods()) {
s << "object " << ir.libName << "Helpers {\n";

for (const auto &st : ir.structs) {
visitedTypes.clear();
if (ir.shouldOutput(st, visitedTypes) && st->hasHelperMethods()) {
s << "\n" << st->generateHelperClass(ir.locationManager);
}
}

for (const auto &u : ir.unions) {
visitedTypes.clear();
if (ir.shouldOutput(u, visitedTypes) && u->hasHelperMethods()) {
s << "\n" << u->generateHelperClass(ir.locationManager);
}
}

s << "}\n\n";
}

return s;
}

Expand Down Expand Up @@ -507,3 +487,27 @@ bool IR::shouldOutputTypeDef(
/* remove unused types from included files */
return locationManager.inMainFile(*typeDef->getLocation());
}

std::string IR::getHelperMethods() const {
std::stringstream s;
std::vector<std::shared_ptr<const Type>> visitedTypes;

std::string sep = "";

for (const auto &st : structs) {
visitedTypes.clear();
if (shouldOutput(st, visitedTypes) && st->hasHelperMethods()) {
s << sep << st->generateHelperClass(locationManager);
sep = "\n";
}
}

for (const auto &u : unions) {
visitedTypes.clear();
if (shouldOutput(u, visitedTypes) && u->hasHelperMethods()) {
s << sep << u->generateHelperClass(locationManager);
}
sep = "\n";
}
return s.str();
}
2 changes: 2 additions & 0 deletions bindgen/ir/IR.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ class IR {
bool
shouldOutputType(const std::vector<std::shared_ptr<T>> &declarations) const;

std::string getHelperMethods() const;

std::string libName; // name of the library
std::string linkName; // name of the library to link with
std::string objectName; // name of Scala object
Expand Down
14 changes: 7 additions & 7 deletions bindgen/ir/Struct.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@ Struct::generateHelperClass(const LocationManager &locationManager) const {
assert(hasHelperMethods());
std::stringstream s;
std::string type = replaceChar(getTypeName(), " ", "_");
s << " implicit class " << type << "_ops(val p: native.Ptr[" << type
s << " implicit class " << type << "_ops(val p: native.Ptr[" << type
<< "])"
<< " extends AnyVal {\n";
if (isRepresentedAsStruct()) {
s << generateHelperClassMethodsForStructRepresentation(locationManager);
} else {
s << generateHelperClassMethodsForArrayRepresentation(locationManager);
}
s << " }\n\n";
s << " }\n";

/* makes struct instantiation easier */
s << " def "
s << " def "
<< type + "()(implicit z: native.Zone): native.Ptr[" + type + "]"
<< " = native.alloc[" + type + "]\n";

Expand Down Expand Up @@ -147,7 +147,7 @@ std::string Struct::generateSetterForStructRepresentation(
value = "!" + value;
}
std::stringstream s;
s << " def " << setter << "(value: " + parameterType + "): Unit = !p._"
s << " def " << setter << "(value: " + parameterType + "): Unit = !p._"
<< std::to_string(fieldIndex + 1) << " = " << value << "\n";
return s.str();
}
Expand All @@ -169,7 +169,7 @@ std::string Struct::generateGetterForStructRepresentation(
methodBody = "!" + methodBody;
}
std::stringstream s;
s << " def " << getter << ": " << returnType << " = " << methodBody
s << " def " << getter << ": " << returnType << " = " << methodBody
<< "\n";
return s.str();
}
Expand Down Expand Up @@ -207,7 +207,7 @@ std::string Struct::generateSetterForArrayRepresentation(
value = "!" + value;
}
std::stringstream s;
s << " def " << setter
s << " def " << setter
<< "(value: " + parameterType + "): Unit = " << castedField << " = "
<< value << "\n";
return s.str();
Expand Down Expand Up @@ -243,7 +243,7 @@ std::string Struct::generateGetterForArrayRepresentation(
returnType = field->getType()->str(locationManager);
}
std::stringstream s;
s << " def " << getter << ": " << returnType << " = " << methodBody
s << " def " << getter << ": " << returnType << " = " << methodBody
<< "\n";
return s.str();
}
Expand Down
10 changes: 5 additions & 5 deletions bindgen/ir/Union.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ Union::generateHelperClass(const LocationManager &locationManager) const {
assert(hasHelperMethods());
std::stringstream s;
std::string type = replaceChar(getTypeName(), " ", "_");
s << " implicit class " << type << "_pos"
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, locationManager);
s << generateSetter(field, locationManager);
}
}
s << " }\n";
s << " }\n";
return s.str();
}

Expand Down Expand Up @@ -71,7 +71,7 @@ Union::generateGetter(const std::shared_ptr<Field> &field,
const LocationManager &locationManager) const {
std::string getter = handleReservedWords(field->getName());
std::string ftype = field->getType()->str(locationManager);
return " def " + getter + ": native.Ptr[" + ftype +
return " def " + getter + ": native.Ptr[" + ftype +
"] = p.cast[native.Ptr[" + ftype + "]]\n";
}

Expand All @@ -82,9 +82,9 @@ Union::generateSetter(const std::shared_ptr<Field> &field,
std::string ftype = field->getType()->str(locationManager);
if (isAliasForType<ArrayType>(field->getType().get()) ||
isAliasForType<Struct>(field->getType().get())) {
return " def " + setter + "(value: native.Ptr[" + ftype +
return " def " + setter + "(value: native.Ptr[" + ftype +
"]): Unit = !p.cast[native.Ptr[" + ftype + "]] = !value\n";
}
return " def " + setter + "(value: " + ftype +
return " def " + setter + "(value: " + ftype +
"): Unit = !p.cast[native.Ptr[" + ftype + "]] = value\n";
}
69 changes: 31 additions & 38 deletions tests/samples/AnonymousTypes.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,44 +13,37 @@ object AnonymousTypes {
type struct_anonymous_2 = native.CStruct1[native.CInt]
def foo(s: native.Ptr[struct_anonymous_0]): Unit = native.extern
def bar(): native.Ptr[struct_anonymous_2] = native.extern
}

import AnonymousTypes._

object AnonymousTypesHelpers {

implicit class struct_anonymous_0_ops(val p: native.Ptr[struct_anonymous_0]) extends AnyVal {
def a: native.CChar = !p._1
def a_=(value: native.CChar): Unit = !p._1 = value
}

def struct_anonymous_0()(implicit z: native.Zone): native.Ptr[struct_anonymous_0] = native.alloc[struct_anonymous_0]

implicit class struct_anonymous_1_ops(val p: native.Ptr[struct_anonymous_1]) extends AnyVal {
def innerUnion: native.Ptr[union_anonymous_0] = !p._1
def innerUnion_=(value: native.Ptr[union_anonymous_0]): Unit = !p._1 = value
}

def struct_anonymous_1()(implicit z: native.Zone): native.Ptr[struct_anonymous_1] = native.alloc[struct_anonymous_1]

implicit class struct_StructWithAnonymousStruct_ops(val p: native.Ptr[struct_StructWithAnonymousStruct]) extends AnyVal {
def innerStruct: native.Ptr[struct_anonymous_1] = !p._1
def innerStruct_=(value: native.Ptr[struct_anonymous_1]): Unit = !p._1 = value
def innerEnum: native.CUnsignedInt = !p._2
def innerEnum_=(value: native.CUnsignedInt): Unit = !p._2 = value
}

def struct_StructWithAnonymousStruct()(implicit z: native.Zone): native.Ptr[struct_StructWithAnonymousStruct] = native.alloc[struct_StructWithAnonymousStruct]

implicit class struct_anonymous_2_ops(val p: native.Ptr[struct_anonymous_2]) extends AnyVal {
def result: native.CInt = !p._1
def result_=(value: native.CInt): Unit = !p._1 = value
}

def struct_anonymous_2()(implicit z: native.Zone): native.Ptr[struct_anonymous_2] = native.alloc[struct_anonymous_2]

implicit class union_anonymous_0_pos(val p: native.Ptr[union_anonymous_0]) extends AnyVal {
def a: native.Ptr[native.CLong] = p.cast[native.Ptr[native.CLong]]
def a_=(value: native.CLong): Unit = !p.cast[native.Ptr[native.CLong]] = value
object implicits {
implicit class struct_anonymous_0_ops(val p: native.Ptr[struct_anonymous_0]) extends AnyVal {
def a: native.CChar = !p._1
def a_=(value: native.CChar): Unit = !p._1 = value
}
def struct_anonymous_0()(implicit z: native.Zone): native.Ptr[struct_anonymous_0] = native.alloc[struct_anonymous_0]

implicit class struct_anonymous_1_ops(val p: native.Ptr[struct_anonymous_1]) extends AnyVal {
def innerUnion: native.Ptr[union_anonymous_0] = !p._1
def innerUnion_=(value: native.Ptr[union_anonymous_0]): Unit = !p._1 = value
}
def struct_anonymous_1()(implicit z: native.Zone): native.Ptr[struct_anonymous_1] = native.alloc[struct_anonymous_1]

implicit class struct_StructWithAnonymousStruct_ops(val p: native.Ptr[struct_StructWithAnonymousStruct]) extends AnyVal {
def innerStruct: native.Ptr[struct_anonymous_1] = !p._1
def innerStruct_=(value: native.Ptr[struct_anonymous_1]): Unit = !p._1 = value
def innerEnum: native.CUnsignedInt = !p._2
def innerEnum_=(value: native.CUnsignedInt): Unit = !p._2 = value
}
def struct_StructWithAnonymousStruct()(implicit z: native.Zone): native.Ptr[struct_StructWithAnonymousStruct] = native.alloc[struct_StructWithAnonymousStruct]

implicit class struct_anonymous_2_ops(val p: native.Ptr[struct_anonymous_2]) extends AnyVal {
def result: native.CInt = !p._1
def result_=(value: native.CInt): Unit = !p._1 = value
}
def struct_anonymous_2()(implicit z: native.Zone): native.Ptr[struct_anonymous_2] = native.alloc[struct_anonymous_2]

implicit class union_anonymous_0_pos(val p: native.Ptr[union_anonymous_0]) extends AnyVal {
def a: native.Ptr[native.CLong] = p.cast[native.Ptr[native.CLong]]
def a_=(value: native.CLong): Unit = !p.cast[native.Ptr[native.CLong]] = value
}
}
}
Loading