lib/nilac/get_variables.rb in nilac-0.0.4.3.9.6 vs lib/nilac/get_variables.rb in nilac-0.0.4.3.9.7

- old
+ new

@@ -1,8 +1,8 @@ require_relative 'replace_strings' - require_relative 'read_file_line_by_line' +require_relative 'paranthesis_compactor' def get_variables(input_file_contents, temporary_nila_file, *loop_variables) variables = [] @@ -38,44 +38,55 @@ original_row = current_row.clone if current_row.include?("=") and current_row.index(javascript_regexp) == nil and !current_row.include?("#iggggnnnore") - current_row = current_row.rstrip + "\n" + if current_row.index(/,function\(/) - current_row_split = current_row.split("=") + current_row = current_row.strip + "$@#)\n\n" - for y in 0...current_row_split.length + end - current_row_split[y] = current_row_split[y].strip + if compact_paranthesis(current_row).include?("=") + current_row = current_row.gsub("$@#)\n\n","\n") - end + current_row = current_row.rstrip + "\n" - if current_row_split[0].include?("[") or current_row_split[0].include?("(") + current_row_split = current_row.split("=") - current_row_split[0] = current_row_split[0][0...current_row_split[0].index("[")] + for y in 0...current_row_split.length - end + current_row_split[y] = current_row_split[y].strip - current_row_split[0] = current_row_split[0].split(".",2)[0].strip if current_row_split[0].include?(".") - if current_row_split[0].include?(" ") + end - variable_name = current_row_split[0].split + if current_row_split[0].include?("[") or current_row_split[0].include?("(") - variable_name = variable_name.join("_") + current_row_split[0] = current_row_split[0][0...current_row_split[0].index("[")] - modified_file_contents[modified_file_contents.index(original_row)] = modified_file_contents[modified_file_contents.index(original_row)].gsub(current_row_split[0],variable_name) + end - else + current_row_split[0] = current_row_split[0].split(".",2)[0].strip if current_row_split[0].include?(".") - variable_name = current_row_split[0] + if current_row_split[0].include?(" ") - end + variable_name = current_row_split[0].split - variables << variable_name + variable_name = variable_name.join("_") + modified_file_contents[modified_file_contents.index(original_row)] = modified_file_contents[modified_file_contents.index(original_row)].gsub(current_row_split[0],variable_name) + + else + + variable_name = current_row_split[0] + + end + + variables << variable_name + + end end end \ No newline at end of file