Small modifications due to weird changes in output in SWUM

Author: cnewman

HTTPRequest

@@ -26,6 +26,7 @@ def Process_identifier_with_swum(identifier_data, context_of_identifier):
     split_identifier_name = '_'.join(ronin.split(identifier_type_and_name[1]))
     if Get_identifier_context(context_of_identifier) != CODE_CONTEXT.FUNCTION:
         swum_string = "{identifier_type} {identifier_name}".format(identifier_name = split_identifier_name, identifier_type = identifier_type_and_name[0])
+        print(['java', '-jar', '../SWUM/SWUM_POS/swum.jar', swum_string, '2', 'true'])
         swum_process = subprocess.Popen(['java', '-jar', '../SWUM/SWUM_POS/swum.jar', swum_string, '2', 'true'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     else:
         split_identifier_name = split_identifier_name+'('+identifier_data.split('(')[1]

SWUM

@@ -20,13 +20,14 @@ def Split_raw_identifier(identifier_data):
     return identifier_type_and_name
 
 def Parse_swum(swum_output, split_identifier_name):
-    code_context = swum_output.split('#')
+    code_context = swum_output.split(':')
+    print(code_context)
     raw_grammar_pattern = grammar_pattern = identifier = []
     if code_context[0] == 'FIELD':
-        identifier = code_context[1].split('-')[1].split()
+        identifier = code_context[2].split('-')[1].split()
         raw_grammar_pattern = re.findall('([A-Z]+)', ' '.join(identifier))
     else:
-        identifier = code_context[1].split('@')[1].split('|')
+        identifier = code_context[3].split('|')
         raw_grammar_pattern = re.findall('([A-Z]+)', ' '.join(identifier))
 
     for pos in raw_grammar_pattern: