From 772fbea37684ff081a8bbcd3c5202f4770ff7a72 Mon Sep 17 00:00:00 2001
From: Christian Newman <cnewman.real@gmail.com>
Date: Sat, 9 Apr 2022 02:07:12 -0400
Subject: [PATCH 1/2] Change the order of output data

---
 src/get_all_identifiers.hpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/get_all_identifiers.hpp b/src/get_all_identifiers.hpp
index 2ae6046..a2532b8 100644
--- a/src/get_all_identifiers.hpp
+++ b/src/get_all_identifiers.hpp
@@ -34,7 +34,7 @@ struct IdentifierData{
 
     friend std::ostream& operator<<(std::ostream& outputStream, const IdentifierData& identifier){
         outputStream<<identifier.type<<" "<<identifier.name<<" "<<identifier.context<<" "
-                    <<identifier.lineNumber<<" "<<identifier.fileName<<" "<<identifier.programmingLanguageName;
+                    <<identifier.fileName<<" "<<identifier.programmingLanguageName<<":"<<identifier.lineNumber;
         return outputStream;
     }
 };
@@ -81,9 +81,6 @@ class WordsFromArchivePolicy : public srcSAXEventDispatch::EventListener, public
             }else if(typeid(FunctionSignaturePolicy) == typeid(*policy)){
                 functionData = *policy->Data<SignatureData>();
                 if(!(functionData.name.empty() || functionData.returnType.empty())){
-                    if(functionData.hasAliasedReturn){
-                        functionData.returnType+="*";
-                    }
 
                     CollectIdentifierTypeNameAndContext(functionData.returnType, functionData.name, "FUNCTION", ctx.currentLineNumber, 
                                                         ctx.currentFilePath, ctx.currentFileLanguage);
@@ -97,9 +94,9 @@ class WordsFromArchivePolicy : public srcSAXEventDispatch::EventListener, public
         void CollectIdentifierTypeNameAndContext(std::string identifierType, std::string identifierName, std::string codeContext,
                                                  unsigned int lineNumber, std::string fileName, std::string programmingLanguageName){
             if(!sampleSize){
-                std::cout<<identifierType<<" "<<identifierName<<" "<<codeContext<<" "<<lineNumber<<" "<<fileName<<" "<<programmingLanguageName<<std::endl;
+                std::cout<<IdentifierData(identifierType, identifierName, codeContext, fileName, programmingLanguageName, std::to_string(lineNumber));
             }else{
-                allSystemIdentifiers.push_back(IdentifierData(identifierType, identifierName, codeContext, std::to_string(lineNumber), fileName, programmingLanguageName));        
+                allSystemIdentifiers.push_back(IdentifierData(identifierType, identifierName, codeContext, fileName, programmingLanguageName, std::to_string(lineNumber)));
             }
         }
 

From 1db36b281aeeb167cb95242c5fb3b048726ce8a1 Mon Sep 17 00:00:00 2001
From: Christian Newman <cnewman.real@gmail.com>
Date: Sat, 9 Apr 2022 11:26:07 -0400
Subject: [PATCH 2/2] Quick fix. I forgot to switch the position of the file
 name and programming language in the tool's output.

---
 src/get_all_identifiers.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/get_all_identifiers.hpp b/src/get_all_identifiers.hpp
index a2532b8..cc8897d 100644
--- a/src/get_all_identifiers.hpp
+++ b/src/get_all_identifiers.hpp
@@ -34,7 +34,7 @@ struct IdentifierData{
 
     friend std::ostream& operator<<(std::ostream& outputStream, const IdentifierData& identifier){
         outputStream<<identifier.type<<" "<<identifier.name<<" "<<identifier.context<<" "
-                    <<identifier.fileName<<" "<<identifier.programmingLanguageName<<":"<<identifier.lineNumber;
+                    <<identifier.programmingLanguageName<<" "<<identifier.fileName<<":"<<identifier.lineNumber;
         return outputStream;
     }
 };