nilac 0.0.4.2.6 → 0.0.4.2.8

data/bin/nilac

@@ -387,19 +387,19 @@ def compile(input_file_path, *output_file_name)
 
           if string_split[1].eql?("\"\n")
 
-            replacement_string = "\" + " + interpol[2...-1]
+            replacement_string = "\" + " + "(#{interpol[2...-1]})"
 
             modified_file_contents[index] = modified_file_contents[index].sub(interpol+"\"", replacement_string)
 
           elsif string_split[1].eql?("\")\n")
 
-            replacement_string = "\" + " + interpol[2...-1]
+            replacement_string = "\" + " + "(#{interpol[2...-1]})"
 
-            modified_file_contents[index] = modified_file_contents[index].sub(interpol+"\"", replacement_string)
+            modified_file_contents[index] = modified_file_contents[index].sub(interpol + "\"", replacement_string)
 
           else
 
-            replacement_string = "\" + " + interpol[2...-1] + " + \""
+            replacement_string = "\"" + " + " + "(#{interpol[2...-1]})" + " + \""
 
             modified_file_contents[index] = modified_file_contents[index].sub(interpol, replacement_string)
 
@@ -686,7 +686,7 @@ def compile(input_file_path, *output_file_name)
 
         replacement_parameters << param.lstrip.rstrip
 
-        replacement_string = replacement_string + "\n" + "if (#{param.lstrip.rstrip} == null) {\n  #{paramvalue.lstrip.rstrip}\n}\n" +"\n"
+        replacement_string = replacement_string + "\n" + "if (#{param.lstrip.rstrip} equequ null) {\n  #{paramvalue.lstrip.rstrip}\n}\n" +"\n"
 
       end
 
@@ -734,7 +734,7 @@ def compile(input_file_path, *output_file_name)
 
   end
 
-  def get_variables(input_file_contents, temporary_nila_file)
+  def get_variables(input_file_contents, temporary_nila_file, *loop_variables)
 
     variables = []
 
@@ -754,11 +754,13 @@ def compile(input_file_path, *output_file_name)
 
     input_file_contents = input_file_contents.collect { |element| element.gsub("=~", "matchequal") }
 
+    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.include?("def")
+      if current_row.include?("=") and current_row.index(javascript_regexp) == nil
 
         current_row = current_row.rstrip + "\n"
 
@@ -796,6 +798,10 @@ def compile(input_file_path, *output_file_name)
 
     line_by_line_contents = read_file_line_by_line(temporary_nila_file)
 
+    variables += loop_variables
+
+    variables = variables.flatten
+
     if variables.length > 0
 
       variable_declaration_string = "var " + variables.uniq.sort.join(", ") + "\n\n"
@@ -1146,10 +1152,14 @@ def compile(input_file_path, *output_file_name)
 
     def compile_multiline_hashes(input_file_contents,temporary_nila_file)
 
+      javascript_regexp = /(if |while |for |function |function\()/
+
       possible_hashes = input_file_contents.reject { |element| !element.include?("{") }
 
       possible_multiline_hashes = possible_hashes.reject { |element| element.include?("}") }
 
+      possible_multiline_hashes = possible_multiline_hashes.reject {|element| element.index(javascript_regexp) != nil}
+
       multiline_hashes = []
 
       possible_multiline_hashes.each do |starting_line|
@@ -1158,7 +1168,7 @@ def compile(input_file_path, *output_file_name)
 
         line = starting_line
 
-        until line.include?("}")
+        until line.include?("}\n")
 
           index += 1
 
@@ -1200,12 +1210,48 @@ def compile(input_file_path, *output_file_name)
 
     def compile_inline_hashes(input_file_contents)
 
-      modified_file_contents = input_file_contents.clone.collect {|element| element.gsub(/(#|%)\w?\{/,"innerrii0opol115")}
+      def replace_strings(input_string)
+
+        string_counter = 0
+
+        while input_string.include?("\"")
+
+          string_extract = input_string[input_string.index("\"")..input_string.index("\"",input_string.index("\"")+1)]
+
+          input_string = input_string.sub(string_extract,"--repstring#{string_counter}")
+
+          string_counter += 1
+
+        end
+
+        while input_string.include?("'")
+
+          string_extract = input_string[input_string.index("'")..input_string.index("'",input_string.index("'")+1)]
+
+          input_string = input_string.sub(string_extract,"--repstring#{string_counter}")
+
+          string_counter += 1
 
-      possible_inline_hashes = modified_file_contents.reject {|element| !element.include?("{")}
+        end
+
+        return input_string
+
+      end
+
+      javascript_regexp = /(if |while |for |function |function\(|%[qQ]*\{)/
+
+      modified_file_contents = input_file_contents.clone.collect {|element| replace_strings(element)}
+
+      possible_inline_hashes = modified_file_contents.reject {|element| element.count("{") != 1}
+
+      possible_inline_hashes = possible_inline_hashes.reject {|element| element.count("}") != 1}
+
+      possible_inline_hashes = possible_inline_hashes.reject {|element| element.index(javascript_regexp) != nil}
 
       possible_inline_hashes.each do |hash|
 
+        hash = input_file_contents[modified_file_contents.index(hash)]
+
         hash_extract = hash[hash.index("{")..hash.index("}")]
 
         contents = hash_extract[1...-1].split(",")
@@ -1390,6 +1436,30 @@ def compile(input_file_path, *output_file_name)
 
   end
 
+  def compile_integers(input_file_contents)
+
+    modified_file_contents = input_file_contents.clone
+
+    input_file_contents.each_with_index do |line,index|
+
+      matches = line.scan(/(([0-9]+_)+([0-9]+|$))/)
+
+      unless matches.empty?
+
+        matches.each do |match_arr|
+
+            modified_file_contents[index] = modified_file_contents[index].sub(match_arr[0],match_arr[0].gsub("_",""))
+
+        end
+
+      end
+
+    end
+
+    return modified_file_contents
+
+  end
+
   def compile_named_functions(input_file_contents, named_code_blocks, nested_functions, temporary_nila_file)
 
     #This method compiles all the named Nila functions. Below is an example of what is meant
@@ -1403,11 +1473,11 @@ def compile(input_file_path, *output_file_name)
 
     #The above function will compile to
 
-    #function square(input_number) {
+    #square = function(input_number) {
     #
     #  return input_number*input_number;
     #
-    #}
+    #};
 
     def is_parameterless?(input_function_block)
 
@@ -1658,6 +1728,16 @@ def compile(input_file_path, *output_file_name)
 
     end
 
+    def coffee_type_function(input_array)
+
+      function_name = input_array[0].split("function ")[1].split("(")[0].lstrip
+
+      input_array[0] = "#{function_name} = function(" + input_array[0].split("function ")[1].split("(")[1].lstrip
+
+      return input_array
+
+    end
+
     def compile_function(input_array, temporary_nila_file)
 
       modified_input_array = input_array.dup
@@ -1718,7 +1798,7 @@ def compile(input_file_path, *output_file_name)
 
       end
 
-      modified_input_array[-1] = input_array[-1].sub "end", "}\n"
+      modified_input_array[-1] = input_array[-1].sub "end", "};\n"
 
       modified_input_array = compile_parallel_assignment(modified_input_array, temporary_nila_file)
 
@@ -1738,6 +1818,8 @@ def compile(input_file_path, *output_file_name)
 
       modified_input_array = compile_multiple_return(modified_input_array)
 
+      modified_input_array = coffee_type_function(modified_input_array)
+
       return modified_input_array
 
     end
@@ -1875,7 +1957,13 @@ def compile(input_file_path, *output_file_name)
 
         extracted_string = input_string[location..-1]
 
-        pattern << extracted_string[0..extracted_string.index(pattern_end)]
+        string_extract = extracted_string[0..extracted_string.index(pattern_end)]
+
+        if !string_extract.include?(" = function(")
+
+          pattern << string_extract
+
+        end
 
       end
 
@@ -2981,6 +3069,110 @@ def compile(input_file_path, *output_file_name)
 
   end
 
+  def compile_loops(input_file_contents,temporary_nila_file)
+
+    def compile_times_loop(input_file_contents,temporary_nila_file)
+
+      def compile_one_line_blocks(input_block)
+
+        block_parameters, block_contents = input_block[1...-1].split("|",2)[1].split("|",2)
+
+        compiled_block = "(function(#{block_parameters.lstrip.rstrip}) {\n\n  #{block_contents} \n\n}(_i))_!;\n"
+
+        return compiled_block
+
+      end
+
+      modified_file_contents = input_file_contents.clone
+
+      possible_times_loop = input_file_contents.reject{ |element| !element.include?(".times")}
+
+      oneliner_times_loop = possible_times_loop.reject {|element| !element.include?("{") and !element.include?("}")}
+
+      #multiline_times_loop = possible_times_loop-oneliner_times_loop
+
+      #multiline_times_loop = multiline_times_loop.reject {|element| !element.include?(" do ")}
+
+      loop_variables = []
+
+      unless oneliner_times_loop.empty?
+
+        oneliner_times_loop.each do |loop|
+
+          original_loop = loop.clone
+
+          string_counter = 1
+
+          extracted_string = []
+
+          while loop.include?("\"")
+
+            string_extract = loop[loop.index("\"")..loop.index("\"",loop.index("\"")+1)]
+
+            extracted_string << string_extract
+
+            loop = loop.sub(string_extract,"--repstring#{string_counter}")
+
+            string_counter += 1
+
+          end
+
+          block_extract = loop[loop.index("{")..loop.index("}")]
+
+          compiled_block = ""
+
+          if block_extract.count("|") == 2
+
+            compiled_block = compile_one_line_blocks(block_extract)
+
+            extracted_string.each_with_index do |string,index|
+
+              compiled_block = compiled_block.sub("--repstring#{index+1}",string)
+
+            end
+
+          else
+
+            compiled_block = block_extract[1...-1].lstrip.rstrip
+
+            extracted_string.each_with_index do |string,index|
+
+              compiled_block = compiled_block.sub("--repstring#{index+1}",string)
+
+            end
+
+          end
+
+          times_counter = loop.split(".times")[0].lstrip
+
+          replacement_string = "for (_i = 0, _j = #{times_counter}; _i < _j; _i += 1) {\n\n#{compiled_block}\n\n}"
+
+          modified_file_contents[input_file_contents.index(original_loop)] = replacement_string
+
+        end
+
+        loop_variables = ["_i","_j"]
+
+      end
+
+      file_id = open(temporary_nila_file, 'w')
+
+      file_id.write(modified_file_contents.join)
+
+      file_id.close()
+
+      line_by_line_contents = read_file_line_by_line(temporary_nila_file)
+
+      return line_by_line_contents,loop_variables
+
+    end
+
+    file_contents,loop_variables = compile_times_loop(input_file_contents,temporary_nila_file)
+
+    return file_contents,loop_variables
+
+  end
+
   def add_semicolons(input_file_contents)
 
     def comment(input_string)
@@ -3282,7 +3474,7 @@ def compile(input_file_path, *output_file_name)
 
       if !code_block_starting_locations.empty?
 
-        controlregexp = /(if |while |function |function\(|((=|:)\s+\{))/
+        controlregexp = /(if |for |while |\(function\(|= function\(|((=|:)\s+\{))/
 
         code_block_starting_locations = [0, code_block_starting_locations, -1].flatten
 
@@ -3296,6 +3488,12 @@ def compile(input_file_path, *output_file_name)
 
           possible_blocks << input_file_contents[code_block_starting_locations[x]..code_block_starting_locations[x+1]]
 
+          if possible_blocks.length > 1
+
+            possible_blocks[-1] = possible_blocks[-1][1..-1]
+
+          end
+
         end
 
         end_counter = 0
@@ -3306,11 +3504,19 @@ def compile(input_file_path, *output_file_name)
 
         possible_blocks.each_with_index do |block|
 
-          current_block += block
+          if !block[0].eql?(current_block[-1])
+
+            current_block += block
+
+          else
+
+            current_block += block[1..-1]
+
+          end
 
           current_block.each_with_index do |line, index|
 
-            if line.lstrip.eql? "}\n" or line.lstrip.eql?("};\n")
+            if line.lstrip.eql? "}\n" or line.lstrip.eql?("};\n") or line.lstrip.include?("_!;\n")
 
               end_counter += 1
 
@@ -3354,7 +3560,7 @@ def compile(input_file_path, *output_file_name)
 
               current_block.each_with_index do |line, index|
 
-                if line.lstrip.eql? "}\n"
+                if line.lstrip.eql? "}\n" or line.lstrip.eql?("};\n") or line.lstrip.include?("_!;\n")
 
                   end_counter += 1
 
@@ -3412,7 +3618,7 @@ def compile(input_file_path, *output_file_name)
 
     end
 
-    javascript_regexp = /(if |while |function |function\(|((=|:)\s+\{))/
+    javascript_regexp = /(if |for |while |\(function\(|= function\(|((=|:)\s+\{))/
 
     javascript_file_contents = javascript_file_contents.collect { |element| element.sub("Euuf", "if") }
 
@@ -3626,12 +3832,16 @@ def compile(input_file_path, *output_file_name)
 
     input_file_contents = input_file_contents.collect { |element| element.sub("!=", "!==") }
 
+    input_file_contents = input_file_contents.collect { |element| element.sub("equequ", "==") }
+
     input_file_contents = input_file_contents.collect { |element| element.sub("elsuf", "else if") }
 
     input_file_contents = input_file_contents.collect { |element| compile_power_operator(element) }
 
     input_file_contents = input_file_contents.collect {|element| compile_match_operator(element)}
 
+    input_file_contents = input_file_contents.collect {|element| element.gsub("_!;",";")}
+
     return input_file_contents
 
   end
@@ -3669,6 +3879,8 @@ def compile(input_file_path, *output_file_name)
 
     file_contents = compile_heredocs(file_contents, temp_file)
 
+    file_contents,loop_vars = compile_loops(file_contents,temp_file)
+
     file_contents = compile_interpolated_strings(file_contents)
 
     file_contents = compile_hashes(file_contents,temp_file)
@@ -3679,6 +3891,8 @@ def compile(input_file_path, *output_file_name)
 
     file_contents = compile_strings(file_contents)
 
+    file_contents = compile_integers(file_contents)
+
     file_contents = compile_default_values(file_contents, temp_file)
 
     file_contents, named_functions, nested_functions = replace_named_functions(file_contents, temp_file)
@@ -3687,14 +3901,16 @@ def compile(input_file_path, *output_file_name)
 
     file_contents = compile_parallel_assignment(file_contents, temp_file)
 
-    list_of_variables, file_contents = get_variables(file_contents, temp_file)
-
     file_contents, function_names = compile_named_functions(file_contents, named_functions, nested_functions, temp_file)
 
+    list_of_variables, file_contents = get_variables(file_contents, temp_file,loop_vars)
+
     file_contents, ruby_functions = compile_custom_function_map(file_contents)
 
     function_names << ruby_functions
 
+    list_of_variables += loop_vars
+
     file_contents = compile_whitespace_delimited_functions(file_contents, function_names, temp_file)
 
     file_contents = remove_question_marks(file_contents, list_of_variables, temp_file)
@@ -3773,7 +3989,7 @@ def find_file_path(input_path, file_extension)
 
 end
 
-nilac_version = "0.0.4.2.6"
+nilac_version = "0.0.4.2.8"
 
 opts = Slop.parse do
   on :c, :compile=, 'Compile Nila File', as:Array, delimiter:":"

data/lib/nilac/version.rb

@@ -1,3 +1,3 @@
 module Nilac
-  VERSION = "0.0.4.2.6"
+  VERSION = "0.0.4.2.8"
 end

data/shark/features/if_then_else.feature

@@ -0,0 +1,11 @@
+Feature: This feature brings single line if-then-else statement to Nila
+  Scenario: Input file with single line if-then-else statement. 
+    Given the input file "if_then_else.nila"
+    When the ~compiler is run
+    The output file must be "if_then_else.js"
+    The output file must equal "correct_if_then_else.js"
+
+Configurations:
+
+~compiler => src/nilac.rb
+:v $cliusage => ruby :v --compile $file

data/shark/features/numbers.feature

@@ -0,0 +1,11 @@
+Feature: This feature brings Ruby's number features to Nila
+  Scenario: Input file with Ruby's number features. 
+    Given the input file "numbers.nila"
+    When the ~compiler is run
+    The output file must be "numbers.js"
+    The output file must equal "correct_numbers.js"
+
+Configurations:
+
+~compiler => src/nilac.rb
+:v $cliusage => ruby :v --compile $file

data/shark/features/times.feature

@@ -0,0 +1,11 @@
+Feature: This feature brings Ruby's .times method to Nila
+  Scenario: Input file with Ruby's .times method 
+    Given the input file "times.nila"
+    When the ~compiler is run
+    The output file must be "times.js"
+    The output file must equal "correct_times.js"
+
+Configurations:
+
+~compiler => src/nilac.rb
+:v $cliusage => ruby :v --compile $file

data/shark/test_files/correct_default_parameters.js

@@ -1,16 +1,18 @@
 //Written using Nila. Visit http://adhithyan15.github.io/nila
 (function() {
+  var container, fill, liquid;
+
   // This is a demo of default parameters
 
-  function fill(container,liquid) {
-    if (container === null) {
+  fill = function(container,liquid) {
+    if (container == null) {
       container = "cup";
     }
-    if (liquid === null) {
+    if (liquid == null) {
       liquid = "coffee";
     }
-    return console.log("Filling " + container + " with " + liquid);
-  }
+    return console.log("Filling " + (container) + " with " + (liquid));
+  };
 
   fill();
 

data/shark/test_files/correct_hashes.js

@@ -1,9 +1,11 @@
 //Written using Nila. Visit http://adhithyan15.github.io/nila
 (function() {
-  var inst_section, student_ages;
+  var inst_section, student_ages, variable;
 
   // This file demonstrates several Hash features in Nila
 
+  variable = 5;
+
   inst_section = {
     cello: 'string',
     clarinet: 'woodwind',

data/shark/test_files/correct_if_then_else.js

@@ -0,0 +1,7 @@
+//Written using Nila. Visit http://adhithyan15.github.io/nila
+(function() {
+  var date;
+
+  date = friday ? sue : jill;
+
+}).call(this);

data/shark/test_files/correct_initialization.js

@@ -1,14 +1,14 @@
 //Written using Nila. Visit http://adhithyan15.github.io/nila
 (function() {
-  var _ref1, first_name, last_name;
+  var _ref1, first_name, last_name, name_split, parse_name;
 
   // This file demonstrates multiple variable initialization
 
-  function parse_name(input_name) {
+  parse_name = function(input_name) {
     var name_split;
     name_split = input_name.split(" ");
     return [name_split[0],name_split[1]];
-  }
+  };
 
   _ref1 = parse_name("Adhithya Rajasekaran");
 

data/shark/test_files/correct_loop.js

@@ -6,7 +6,7 @@
 
   while (true) {
     i+=1;
-    process.stdout.write("" + i + " ");
+    process.stdout.write("" + (i) + " ");
     if (i===10) {
       break;
     }

data/shark/test_files/correct_multiple_return.js

@@ -1,20 +1,20 @@
 //Written using Nila. Visit http://adhithyan15.github.io/nila
 (function() {
-  var parsed_name;
+  var _ref1, first_name, last_name, parse_name, parsed_name, test_method;
 
   // This method demonstrates multiple return values
 
-  function parse_name(input_name) {
+  parse_name = function(input_name) {
     var _ref1, first_name, last_name;
     _ref1 = input_name.split(" ");
     first_name = _ref1[0];
     last_name = _ref1[1];
     return [first_name,last_name];
-  }
+  };
 
-  function test_method() {
+  test_method = function() {
     return console.log("Hello, Adhithya");
-  }
+  };
 
   parsed_name = parse_name("Adhithya Rajasekaran");
 

data/shark/test_files/correct_numbers.js

@@ -0,0 +1,9 @@
+//Written using Nila. Visit http://adhithyan15.github.io/nila
+(function() {
+  var million;
+
+  million = 1000000 + 7000000;
+
+  console.log(million);
+
+}).call(this);

data/shark/test_files/correct_operators.js

@@ -11,7 +11,7 @@
   line = "My favorite language is Ruby!";
 
   if (line = line.match(/Ruby|Python/)) {
-    console.log("Scripting language mentioned: " + line);
+    console.log("Scripting language mentioned: " + (line));
   }
 
 }).call(this);

data/shark/test_files/correct_regular_if.js

@@ -1,7 +1,7 @@
 //Written using Nila. Visit http://adhithyan15.github.io/nila
 (function() {
   if (visitor_present) {
-    //This file is for demonstration purpose. It doesn't really achieve anything
+  //This file is for demonstration purpose. It doesn't really achieve anything
     if (active || happy) {
       console.log("Hello Wonderful Visitor!");
     } else if (idle && not_engaged) {

data/shark/test_files/correct_return.js

@@ -1,8 +1,10 @@
 //Written using Nila. Visit http://adhithyan15.github.io/nila
 (function() {
-  function subtract(num1,num2) {
+  var subtract;
+
+  subtract = function(num1,num2) {
     return num1-num2;
-  }
+  };
 
   console.log(subtract(7,8));
 

data/shark/test_files/correct_single_return.js

@@ -1,8 +1,10 @@
 //Written using Nila. Visit http://adhithyan15.github.io/nila
 (function() {
-  function subtract(num1,num2) {
+  var subtract;
+
+  subtract = function(num1,num2) {
     return num1-num2;
-  }
+  };
 
   console.log(subtract(7,8));
 

data/shark/test_files/correct_string_interpolation.js

@@ -4,11 +4,11 @@
 
   //This file tests the limits of the string interpolation feature present in Nila
 
-  msg = "Hello " + "world. A lovely place." + "" + "Another " + "Lovely quote";
+  msg = "Hello " + ("world. A lovely place.") + "" + "Another " + ("Lovely quote");
 
   console.log(msg);
 
-  console.log("Hello " + "world");
+  console.log("Hello " + ("world"));
 
   console.log('Hello #{world}');
 

data/shark/test_files/correct_times.js

@@ -0,0 +1,23 @@
+//Written using Nila. Visit http://adhithyan15.github.io/nila
+(function() {
+  var _i, _j, a;
+
+  a = 5;
+
+  for (_i = 0, _j = 10; _i < _j; _i += 1) {
+
+    (function(n) {
+
+      console.log("The number is " + (a+n) + "");
+
+    }(_i));
+
+  }
+
+  for (_i = 0, _j = 10; _i < _j; _i += 1) {
+
+    console.log("Hello");
+
+  }
+
+}).call(this);

data/shark/test_files/correct_unless_until.js

@@ -19,7 +19,7 @@
   i=1;
 
   while (!(i > 10)) {
-    process.stdout.write("" + i + " ");
+    process.stdout.write("" + (i) + " ");
     i+=1;
     if (i === 9) {
       break;

data/shark/test_files/correct_whitespace_delimiter.js

@@ -1,12 +1,14 @@
 //Written using Nila. Visit http://adhithyan15.github.io/nila
 (function() {
-  function square(input_number) {
+  var return_number, square;
+
+  square = function(input_number) {
     return input_number*input_number;
-  }
+  };
 
-  function return_number(input_number) {
+  return_number = function(input_number) {
     return input_number;
-  }
+  };
 
   console.log(message);
 

data/shark/test_files/hashes.nila

@@ -1,5 +1,7 @@
 # This file demonstrates several Hash features in Nila
 
+variable = 5
+
 inst_section = {
   'cello' => 'string',
   'clarinet' => 'woodwind',

data/shark/test_files/if_then_else.nila

@@ -0,0 +1 @@
+date = if friday then sue else jill end

data/shark/test_files/numbers.nila

@@ -0,0 +1,3 @@
+million = 1_000_000 + 7_000_000
+
+puts million

data/shark/test_files/perfect.js

@@ -1,17 +1,17 @@
 //Written using Nila. Visit http://adhithyan15.github.io/nila
 (function() {
-  var goal_reached, hello, message, msg;
+  var goal_reached, hello, message, msg, square;
 
   hello = "world";
 
   msg = "nila";
 
-  message = "Welcome to " + msg;
+  message = "Welcome to " + (msg);
 
   goal_reached = 72;
 
-  function square(inputnumber) {
+  square = function(inputnumber) {
     return inputnumber*inputnumber;
-  }
+  };
 
 }).call(this);

data/shark/test_files/times.nila

@@ -0,0 +1,5 @@
+a = 5
+
+10.times { |n| puts "The number is #{a+n}" }
+
+10.times {puts "Hello"}

data/src/nilac.rb

@@ -385,19 +385,19 @@ def compile(input_file_path, *output_file_name)
 
           if string_split[1].eql?("\"\n")
 
-            replacement_string = "\" + " + interpol[2...-1]
+            replacement_string = "\" + " + "(#{interpol[2...-1]})"
 
             modified_file_contents[index] = modified_file_contents[index].sub(interpol+"\"", replacement_string)
 
           elsif string_split[1].eql?("\")\n")
 
-            replacement_string = "\" + " + interpol[2...-1]
+            replacement_string = "\" + " + "(#{interpol[2...-1]})"
 
-            modified_file_contents[index] = modified_file_contents[index].sub(interpol+"\"", replacement_string)
+            modified_file_contents[index] = modified_file_contents[index].sub(interpol + "\"", replacement_string)
 
           else
 
-            replacement_string = "\" + " + interpol[2...-1] + " + \""
+            replacement_string = "\"" + " + " + "(#{interpol[2...-1]})" + " + \""
 
             modified_file_contents[index] = modified_file_contents[index].sub(interpol, replacement_string)
 
@@ -684,7 +684,7 @@ def compile(input_file_path, *output_file_name)
 
         replacement_parameters << param.lstrip.rstrip
 
-        replacement_string = replacement_string + "\n" + "if (#{param.lstrip.rstrip} == null) {\n  #{paramvalue.lstrip.rstrip}\n}\n" +"\n"
+        replacement_string = replacement_string + "\n" + "if (#{param.lstrip.rstrip} equequ null) {\n  #{paramvalue.lstrip.rstrip}\n}\n" +"\n"
 
       end
 
@@ -732,7 +732,7 @@ def compile(input_file_path, *output_file_name)
 
   end
 
-  def get_variables(input_file_contents, temporary_nila_file)
+  def get_variables(input_file_contents, temporary_nila_file, *loop_variables)
 
     variables = []
 
@@ -752,11 +752,13 @@ def compile(input_file_path, *output_file_name)
 
     input_file_contents = input_file_contents.collect { |element| element.gsub("=~", "matchequal") }
 
+    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.include?("def")
+      if current_row.include?("=") and current_row.index(javascript_regexp) == nil
 
         current_row = current_row.rstrip + "\n"
 
@@ -794,6 +796,10 @@ def compile(input_file_path, *output_file_name)
 
     line_by_line_contents = read_file_line_by_line(temporary_nila_file)
 
+    variables += loop_variables
+
+    variables = variables.flatten
+
     if variables.length > 0
 
       variable_declaration_string = "var " + variables.uniq.sort.join(", ") + "\n\n"
@@ -1144,10 +1150,14 @@ def compile(input_file_path, *output_file_name)
 
     def compile_multiline_hashes(input_file_contents,temporary_nila_file)
 
+      javascript_regexp = /(if |while |for |function |function\()/
+
       possible_hashes = input_file_contents.reject { |element| !element.include?("{") }
 
       possible_multiline_hashes = possible_hashes.reject { |element| element.include?("}") }
 
+      possible_multiline_hashes = possible_multiline_hashes.reject {|element| element.index(javascript_regexp) != nil}
+
       multiline_hashes = []
 
       possible_multiline_hashes.each do |starting_line|
@@ -1156,7 +1166,7 @@ def compile(input_file_path, *output_file_name)
 
         line = starting_line
 
-        until line.include?("}")
+        until line.include?("}\n")
 
           index += 1
 
@@ -1198,12 +1208,48 @@ def compile(input_file_path, *output_file_name)
 
     def compile_inline_hashes(input_file_contents)
 
-      modified_file_contents = input_file_contents.clone.collect {|element| element.gsub(/(#|%)\w?\{/,"innerrii0opol115")}
+      def replace_strings(input_string)
+
+        string_counter = 0
+
+        while input_string.include?("\"")
+
+          string_extract = input_string[input_string.index("\"")..input_string.index("\"",input_string.index("\"")+1)]
+
+          input_string = input_string.sub(string_extract,"--repstring#{string_counter}")
+
+          string_counter += 1
+
+        end
+
+        while input_string.include?("'")
+
+          string_extract = input_string[input_string.index("'")..input_string.index("'",input_string.index("'")+1)]
+
+          input_string = input_string.sub(string_extract,"--repstring#{string_counter}")
+
+          string_counter += 1
 
-      possible_inline_hashes = modified_file_contents.reject {|element| !element.include?("{")}
+        end
+
+        return input_string
+
+      end
+
+      javascript_regexp = /(if |while |for |function |function\(|%[qQ]*\{)/
+
+      modified_file_contents = input_file_contents.clone.collect {|element| replace_strings(element)}
+
+      possible_inline_hashes = modified_file_contents.reject {|element| element.count("{") != 1}
+
+      possible_inline_hashes = possible_inline_hashes.reject {|element| element.count("}") != 1}
+
+      possible_inline_hashes = possible_inline_hashes.reject {|element| element.index(javascript_regexp) != nil}
 
       possible_inline_hashes.each do |hash|
 
+        hash = input_file_contents[modified_file_contents.index(hash)]
+
         hash_extract = hash[hash.index("{")..hash.index("}")]
 
         contents = hash_extract[1...-1].split(",")
@@ -1388,6 +1434,30 @@ def compile(input_file_path, *output_file_name)
 
   end
 
+  def compile_integers(input_file_contents)
+
+    modified_file_contents = input_file_contents.clone
+
+    input_file_contents.each_with_index do |line,index|
+
+      matches = line.scan(/(([0-9]+_)+([0-9]+|$))/)
+
+      unless matches.empty?
+
+        matches.each do |match_arr|
+
+            modified_file_contents[index] = modified_file_contents[index].sub(match_arr[0],match_arr[0].gsub("_",""))
+
+        end
+
+      end
+
+    end
+
+    return modified_file_contents
+
+  end
+
   def compile_named_functions(input_file_contents, named_code_blocks, nested_functions, temporary_nila_file)
 
     #This method compiles all the named Nila functions. Below is an example of what is meant
@@ -1401,11 +1471,11 @@ def compile(input_file_path, *output_file_name)
 
     #The above function will compile to
 
-    #function square(input_number) {
+    #square = function(input_number) {
     #
     #  return input_number*input_number;
     #
-    #}
+    #};
 
     def is_parameterless?(input_function_block)
 
@@ -1656,6 +1726,16 @@ def compile(input_file_path, *output_file_name)
 
     end
 
+    def coffee_type_function(input_array)
+
+      function_name = input_array[0].split("function ")[1].split("(")[0].lstrip
+
+      input_array[0] = "#{function_name} = function(" + input_array[0].split("function ")[1].split("(")[1].lstrip
+
+      return input_array
+
+    end
+
     def compile_function(input_array, temporary_nila_file)
 
       modified_input_array = input_array.dup
@@ -1716,7 +1796,7 @@ def compile(input_file_path, *output_file_name)
 
       end
 
-      modified_input_array[-1] = input_array[-1].sub "end", "}\n"
+      modified_input_array[-1] = input_array[-1].sub "end", "};\n"
 
       modified_input_array = compile_parallel_assignment(modified_input_array, temporary_nila_file)
 
@@ -1736,6 +1816,8 @@ def compile(input_file_path, *output_file_name)
 
       modified_input_array = compile_multiple_return(modified_input_array)
 
+      modified_input_array = coffee_type_function(modified_input_array)
+
       return modified_input_array
 
     end
@@ -1873,7 +1955,13 @@ def compile(input_file_path, *output_file_name)
 
         extracted_string = input_string[location..-1]
 
-        pattern << extracted_string[0..extracted_string.index(pattern_end)]
+        string_extract = extracted_string[0..extracted_string.index(pattern_end)]
+
+        if !string_extract.include?(" = function(")
+
+          pattern << string_extract
+
+        end
 
       end
 
@@ -2979,6 +3067,110 @@ def compile(input_file_path, *output_file_name)
 
   end
 
+  def compile_loops(input_file_contents,temporary_nila_file)
+
+    def compile_times_loop(input_file_contents,temporary_nila_file)
+
+      def compile_one_line_blocks(input_block)
+
+        block_parameters, block_contents = input_block[1...-1].split("|",2)[1].split("|",2)
+
+        compiled_block = "(function(#{block_parameters.lstrip.rstrip}) {\n\n  #{block_contents} \n\n}(_i))_!;\n"
+
+        return compiled_block
+
+      end
+
+      modified_file_contents = input_file_contents.clone
+
+      possible_times_loop = input_file_contents.reject{ |element| !element.include?(".times")}
+
+      oneliner_times_loop = possible_times_loop.reject {|element| !element.include?("{") and !element.include?("}")}
+
+      #multiline_times_loop = possible_times_loop-oneliner_times_loop
+
+      #multiline_times_loop = multiline_times_loop.reject {|element| !element.include?(" do ")}
+
+      loop_variables = []
+
+      unless oneliner_times_loop.empty?
+
+        oneliner_times_loop.each do |loop|
+
+          original_loop = loop.clone
+
+          string_counter = 1
+
+          extracted_string = []
+
+          while loop.include?("\"")
+
+            string_extract = loop[loop.index("\"")..loop.index("\"",loop.index("\"")+1)]
+
+            extracted_string << string_extract
+
+            loop = loop.sub(string_extract,"--repstring#{string_counter}")
+
+            string_counter += 1
+
+          end
+
+          block_extract = loop[loop.index("{")..loop.index("}")]
+
+          compiled_block = ""
+
+          if block_extract.count("|") == 2
+
+            compiled_block = compile_one_line_blocks(block_extract)
+
+            extracted_string.each_with_index do |string,index|
+
+              compiled_block = compiled_block.sub("--repstring#{index+1}",string)
+
+            end
+
+          else
+
+            compiled_block = block_extract[1...-1].lstrip.rstrip
+
+            extracted_string.each_with_index do |string,index|
+
+              compiled_block = compiled_block.sub("--repstring#{index+1}",string)
+
+            end
+
+          end
+
+          times_counter = loop.split(".times")[0].lstrip
+
+          replacement_string = "for (_i = 0, _j = #{times_counter}; _i < _j; _i += 1) {\n\n#{compiled_block}\n\n}"
+
+          modified_file_contents[input_file_contents.index(original_loop)] = replacement_string
+
+        end
+
+        loop_variables = ["_i","_j"]
+
+      end
+
+      file_id = open(temporary_nila_file, 'w')
+
+      file_id.write(modified_file_contents.join)
+
+      file_id.close()
+
+      line_by_line_contents = read_file_line_by_line(temporary_nila_file)
+
+      return line_by_line_contents,loop_variables
+
+    end
+
+    file_contents,loop_variables = compile_times_loop(input_file_contents,temporary_nila_file)
+
+    return file_contents,loop_variables
+
+  end
+
   def add_semicolons(input_file_contents)
 
     def comment(input_string)
@@ -3280,7 +3472,7 @@ def compile(input_file_path, *output_file_name)
 
       if !code_block_starting_locations.empty?
 
-        controlregexp = /(if |while |function |function\(|((=|:)\s+\{))/
+        controlregexp = /(if |for |while |\(function\(|= function\(|((=|:)\s+\{))/
 
         code_block_starting_locations = [0, code_block_starting_locations, -1].flatten
 
@@ -3294,6 +3486,12 @@ def compile(input_file_path, *output_file_name)
 
           possible_blocks << input_file_contents[code_block_starting_locations[x]..code_block_starting_locations[x+1]]
 
+          if possible_blocks.length > 1
+
+            possible_blocks[-1] = possible_blocks[-1][1..-1]
+
+          end
+
         end
 
         end_counter = 0
@@ -3304,11 +3502,19 @@ def compile(input_file_path, *output_file_name)
 
         possible_blocks.each_with_index do |block|
 
-          current_block += block
+          if !block[0].eql?(current_block[-1])
+
+            current_block += block
+
+          else
+
+            current_block += block[1..-1]
+
+          end
 
           current_block.each_with_index do |line, index|
 
-            if line.lstrip.eql? "}\n" or line.lstrip.eql?("};\n")
+            if line.lstrip.eql? "}\n" or line.lstrip.eql?("};\n") or line.lstrip.include?("_!;\n")
 
               end_counter += 1
 
@@ -3352,7 +3558,7 @@ def compile(input_file_path, *output_file_name)
 
               current_block.each_with_index do |line, index|
 
-                if line.lstrip.eql? "}\n"
+                if line.lstrip.eql? "}\n" or line.lstrip.eql?("};\n") or line.lstrip.include?("_!;\n")
 
                   end_counter += 1
 
@@ -3410,7 +3616,7 @@ def compile(input_file_path, *output_file_name)
 
     end
 
-    javascript_regexp = /(if |while |function |function\(|((=|:)\s+\{))/
+    javascript_regexp = /(if |for |while |\(function\(|= function\(|((=|:)\s+\{))/
 
     javascript_file_contents = javascript_file_contents.collect { |element| element.sub("Euuf", "if") }
 
@@ -3624,12 +3830,16 @@ def compile(input_file_path, *output_file_name)
 
     input_file_contents = input_file_contents.collect { |element| element.sub("!=", "!==") }
 
+    input_file_contents = input_file_contents.collect { |element| element.sub("equequ", "==") }
+
     input_file_contents = input_file_contents.collect { |element| element.sub("elsuf", "else if") }
 
     input_file_contents = input_file_contents.collect { |element| compile_power_operator(element) }
 
     input_file_contents = input_file_contents.collect {|element| compile_match_operator(element)}
 
+    input_file_contents = input_file_contents.collect {|element| element.gsub("_!;",";")}
+
     return input_file_contents
 
   end
@@ -3667,6 +3877,8 @@ def compile(input_file_path, *output_file_name)
 
     file_contents = compile_heredocs(file_contents, temp_file)
 
+    file_contents,loop_vars = compile_loops(file_contents,temp_file)
+
     file_contents = compile_interpolated_strings(file_contents)
 
     file_contents = compile_hashes(file_contents,temp_file)
@@ -3677,6 +3889,8 @@ def compile(input_file_path, *output_file_name)
 
     file_contents = compile_strings(file_contents)
 
+    file_contents = compile_integers(file_contents)
+
     file_contents = compile_default_values(file_contents, temp_file)
 
     file_contents, named_functions, nested_functions = replace_named_functions(file_contents, temp_file)
@@ -3685,14 +3899,16 @@ def compile(input_file_path, *output_file_name)
 
     file_contents = compile_parallel_assignment(file_contents, temp_file)
 
-    list_of_variables, file_contents = get_variables(file_contents, temp_file)
-
     file_contents, function_names = compile_named_functions(file_contents, named_functions, nested_functions, temp_file)
 
+    list_of_variables, file_contents = get_variables(file_contents, temp_file,loop_vars)
+
     file_contents, ruby_functions = compile_custom_function_map(file_contents)
 
     function_names << ruby_functions
 
+    list_of_variables += loop_vars
+
     file_contents = compile_whitespace_delimited_functions(file_contents, function_names, temp_file)
 
     file_contents = remove_question_marks(file_contents, list_of_variables, temp_file)
@@ -3771,7 +3987,7 @@ def find_file_path(input_path, file_extension)
 
 end
 
-nilac_version = "0.0.4.2.6"
+nilac_version = "0.0.4.2.8"
 
 opts = Slop.parse do
   on :c, :compile=, 'Compile Nila File', as:Array, delimiter:":"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nilac
 version: !ruby/object:Gem::Version
-  version: 0.0.4.2.6
+  version: 0.0.4.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-10 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shark
@@ -67,15 +67,18 @@ files:
 - shark/features/fix_newlines.feature
 - shark/features/hashes.feature
 - shark/features/heredoc.feature
+- shark/features/if_then_else.feature
 - shark/features/loop.feature
 - shark/features/method_multiple_return.feature
 - shark/features/multiline_array.feature
 - shark/features/multiple_variable_initialization.feature
+- shark/features/numbers.feature
 - shark/features/regular_if.feature
 - shark/features/regular_while.feature
 - shark/features/ruby_operators.feature
 - shark/features/string_interpolation.feature
 - shark/features/strings.feature
+- shark/features/times.feature
 - shark/features/unless_until.feature
 - shark/features/whitespace_delimitation.feature
 - shark/test_files/array_string_indexing.nila
@@ -83,11 +86,13 @@ files:
 - shark/test_files/correct_default_parameters.js
 - shark/test_files/correct_hashes.js
 - shark/test_files/correct_heredoc.js
+- shark/test_files/correct_if_then_else.js
 - shark/test_files/correct_indexing.js
 - shark/test_files/correct_initialization.js
 - shark/test_files/correct_loop.js
 - shark/test_files/correct_multiline_array.js
 - shark/test_files/correct_multiple_return.js
+- shark/test_files/correct_numbers.js
 - shark/test_files/correct_operators.js
 - shark/test_files/correct_regular_if.js
 - shark/test_files/correct_regular_while.js
@@ -95,17 +100,20 @@ files:
 - shark/test_files/correct_single_return.js
 - shark/test_files/correct_string_interpolation.js
 - shark/test_files/correct_string_operators.js
+- shark/test_files/correct_times.js
 - shark/test_files/correct_unless_until.js
 - shark/test_files/correct_whitespace_delimiter.js
 - shark/test_files/default_parameters.nila
 - shark/test_files/erratic.nila
 - shark/test_files/hashes.nila
 - shark/test_files/heredoc.nila
+- shark/test_files/if_then_else.nila
 - shark/test_files/loop.nila
 - shark/test_files/multiline_array.nila
 - shark/test_files/multiple_initialization.nila
 - shark/test_files/multiple_return.nila
 - shark/test_files/no_return.nila
+- shark/test_files/numbers.nila
 - shark/test_files/operators.nila
 - shark/test_files/perfect.js
 - shark/test_files/regular_if.nila
@@ -114,6 +122,7 @@ files:
 - shark/test_files/single_return.nila
 - shark/test_files/string_interpolation.nila
 - shark/test_files/string_operators.nila
+- shark/test_files/times.nila
 - shark/test_files/unless_until.nila
 - shark/test_files/whitespace_delimiter.nila
 - src/nilac.rb