From 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 Mon Sep 17 00:00:00 2001
From: Thomas Groman <tgroman@nuegia.net>
Date: Thu, 19 Sep 2019 00:41:48 -0700
Subject: merged from 0.6.7 codebase

---
 libraries/classparser/src/annotations.cpp | 132 +++++++++++++++---------------
 1 file changed, 66 insertions(+), 66 deletions(-)

(limited to 'libraries/classparser/src/annotations.cpp')

diff --git a/libraries/classparser/src/annotations.cpp b/libraries/classparser/src/annotations.cpp
index d1a7c046..18a9e880 100644
--- a/libraries/classparser/src/annotations.cpp
+++ b/libraries/classparser/src/annotations.cpp
@@ -6,80 +6,80 @@ namespace java
 {
 std::string annotation::toString()
 {
-	std::ostringstream ss;
-	ss << "Annotation type : " << type_index << " - " << pool[type_index].str_data << std::endl;
-	ss << "Contains " << name_val_pairs.size() << " pairs:" << std::endl;
-	for (unsigned i = 0; i < name_val_pairs.size(); i++)
-	{
-		std::pair<uint16_t, element_value *> &val = name_val_pairs[i];
-		auto name_idx = val.first;
-		ss << pool[name_idx].str_data << "(" << name_idx << ")"
-		   << " = " << val.second->toString() << std::endl;
-	}
-	return ss.str();
+    std::ostringstream ss;
+    ss << "Annotation type : " << type_index << " - " << pool[type_index].str_data << std::endl;
+    ss << "Contains " << name_val_pairs.size() << " pairs:" << std::endl;
+    for (unsigned i = 0; i < name_val_pairs.size(); i++)
+    {
+        std::pair<uint16_t, element_value *> &val = name_val_pairs[i];
+        auto name_idx = val.first;
+        ss << pool[name_idx].str_data << "(" << name_idx << ")"
+           << " = " << val.second->toString() << std::endl;
+    }
+    return ss.str();
 }
 
 annotation *annotation::read(util::membuffer &input, constant_pool &pool)
 {
-	uint16_t type_index = 0;
-	input.read_be(type_index);
-	annotation *ann = new annotation(type_index, pool);
+    uint16_t type_index = 0;
+    input.read_be(type_index);
+    annotation *ann = new annotation(type_index, pool);
 
-	uint16_t num_pairs = 0;
-	input.read_be(num_pairs);
-	while (num_pairs)
-	{
-		uint16_t name_idx = 0;
-		// read name index
-		input.read_be(name_idx);
-		auto elem = element_value::readElementValue(input, pool);
-		// read value
-		ann->add_pair(name_idx, elem);
-		num_pairs--;
-	}
-	return ann;
+    uint16_t num_pairs = 0;
+    input.read_be(num_pairs);
+    while (num_pairs)
+    {
+        uint16_t name_idx = 0;
+        // read name index
+        input.read_be(name_idx);
+        auto elem = element_value::readElementValue(input, pool);
+        // read value
+        ann->add_pair(name_idx, elem);
+        num_pairs--;
+    }
+    return ann;
 }
 
 element_value *element_value::readElementValue(util::membuffer &input,
-											   java::constant_pool &pool)
+                                               java::constant_pool &pool)
 {
-	element_value_type type = INVALID;
-	input.read(type);
-	uint16_t index = 0;
-	uint16_t index2 = 0;
-	std::vector<element_value *> vals;
-	switch (type)
-	{
-	case PRIMITIVE_BYTE:
-	case PRIMITIVE_CHAR:
-	case PRIMITIVE_DOUBLE:
-	case PRIMITIVE_FLOAT:
-	case PRIMITIVE_INT:
-	case PRIMITIVE_LONG:
-	case PRIMITIVE_SHORT:
-	case PRIMITIVE_BOOLEAN:
-	case STRING:
-		input.read_be(index);
-		return new element_value_simple(type, index, pool);
-	case ENUM_CONSTANT:
-		input.read_be(index);
-		input.read_be(index2);
-		return new element_value_enum(type, index, index2, pool);
-	case CLASS: // Class
-		input.read_be(index);
-		return new element_value_class(type, index, pool);
-	case ANNOTATION: // Annotation
-		// FIXME: runtime visibility info needs to be passed from parent
-		return new element_value_annotation(ANNOTATION, annotation::read(input, pool), pool);
-	case ARRAY: // Array
-		input.read_be(index);
-		for (int i = 0; i < index; i++)
-		{
-			vals.push_back(element_value::readElementValue(input, pool));
-		}
-		return new element_value_array(ARRAY, vals, pool);
-	default:
-		throw new java::classfile_exception();
-	}
+    element_value_type type = INVALID;
+    input.read(type);
+    uint16_t index = 0;
+    uint16_t index2 = 0;
+    std::vector<element_value *> vals;
+    switch (type)
+    {
+    case PRIMITIVE_BYTE:
+    case PRIMITIVE_CHAR:
+    case PRIMITIVE_DOUBLE:
+    case PRIMITIVE_FLOAT:
+    case PRIMITIVE_INT:
+    case PRIMITIVE_LONG:
+    case PRIMITIVE_SHORT:
+    case PRIMITIVE_BOOLEAN:
+    case STRING:
+        input.read_be(index);
+        return new element_value_simple(type, index, pool);
+    case ENUM_CONSTANT:
+        input.read_be(index);
+        input.read_be(index2);
+        return new element_value_enum(type, index, index2, pool);
+    case CLASS: // Class
+        input.read_be(index);
+        return new element_value_class(type, index, pool);
+    case ANNOTATION: // Annotation
+        // FIXME: runtime visibility info needs to be passed from parent
+        return new element_value_annotation(ANNOTATION, annotation::read(input, pool), pool);
+    case ARRAY: // Array
+        input.read_be(index);
+        for (int i = 0; i < index; i++)
+        {
+            vals.push_back(element_value::readElementValue(input, pool));
+        }
+        return new element_value_array(ARRAY, vals, pool);
+    default:
+        throw new java::classfile_exception();
+    }
 }
 }
\ No newline at end of file
-- 
cgit v1.2.3