get_variables.rb in nilac-0.0.4.3.9.6

- old
+ new

@@ -28,18 +28,20 @@
 
     modified_file_contents = input_file_contents.clone
 
     input_file_contents = input_file_contents.collect {|element| replace_strings(element)}
 
-    javascript_regexp = /(if |while |for )/
+    javascript_regexp = /(if |while |for |\|\|=|&&=)/
 
     for x in 0...input_file_contents.length
 
       current_row = input_file_contents[x]
 
-      if current_row.include?("=") and current_row.index(javascript_regexp) == nil
+      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"
 
         current_row_split = current_row.split("=")
 
         for y in 0...current_row_split.length
@@ -55,17 +57,29 @@
 
         end
 
         current_row_split[0] = current_row_split[0].split(".",2)[0].strip if current_row_split[0].include?(".")
 
-        variables << current_row_split[0]
+        if current_row_split[0].include?(" ")
 
+          variable_name = current_row_split[0].split
 
-      end
+          variable_name = variable_name.join("_")
 
-      input_file_contents[x] = current_row
+          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
 
     file_contents_as_string = modified_file_contents.join
 
     file_id = open(temporary_nila_file, 'w')
@@ -81,11 +95,9 @@
     for_loop_variables = []
 
     for_loop_statements = test_contents.reject {|line| !line.include?("for")}
       
     for_loop_statements = for_loop_statements.reject {|line| line.include?("forEach")}
-
-    puts for_loop_statements
 
     for_loop_statements.each do |statement|
 
       varis = statement.split("for (")[1].split(";",2)[0].split(",")
 
\ No newline at end of file