nilac 0.0.4.3.6 → 0.0.4.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93e0394535005dd35537d7979c3aaa495b11e4d7
-  data.tar.gz: 45b2a7bb891f2c389f5ae5e99d7f3f09a70e770e
+  metadata.gz: 1134f4be8a507aaab07700dfb882b0ef88ecb985
+  data.tar.gz: 53494da4adc0e265b169282703dafa702e3d26db
 SHA512:
-  metadata.gz: b9df698a5afc8b23b6c6dc24663a9bae9acc8c9cbb54e04c16e7a9e51c633254e29c7d48306315ea489c7d22765b73d6d25edbdb4b13c4726f6dd487c81b1d4a
-  data.tar.gz: 8fa6965d4e1db48122fb30b7ab0b46884ad4b9609b5ef8bb9de8fa7d91bdf76c34557cfb2fa5d873255533284b37158a5b9a162f17c86febbe6968f9e76fcd7c
+  metadata.gz: 36b990668a578a13bffbd8ce30be8f5943cab2e9345b3b8ad356f0418bdd7844dc66d1256ad2cdc4f73d757cb0979eaf8259442c267fac9c1bb45982a3740d3c
+  data.tar.gz: 62c848bf78ef3ef811b7affcde6dbf6c848901682b31df7ae0841d3e736bc06656cf1cb0c39d08ad79bc49323065acd075289e9161d90a4eb30b0c6d4240a097

data/bin/nilac

@@ -421,7 +421,9 @@ def compile(input_file_path, *output_file_name)
 
       string_counter = 0
 
-      while input_string.include?("\"")
+      if input_string.count("\"") % 2 == 0
+
+        while input_string.include?("\"")
 
         string_extract = input_string[input_string.index("\"")..input_string.index("\"",input_string.index("\"")+1)]
 
@@ -429,15 +431,21 @@ def compile(input_file_path, *output_file_name)
 
         string_counter += 1
 
+        end
+
       end
 
-      while input_string.include?("'")
+      if input_string.count("'") % 2 == 0
 
-        string_extract = input_string[input_string.index("'")..input_string.index("'",input_string.index("'")+1)]
+        while input_string.include?("'")
 
-        input_string = input_string.sub(string_extract,"--repstring#{string_counter}")
+          string_extract = input_string[input_string.index("'")..input_string.index("'",input_string.index("'")+1)]
 
-        string_counter += 1
+          input_string = input_string.sub(string_extract,"--repstring#{string_counter}")
+
+          string_counter += 1
+
+        end
 
       end
 
@@ -822,6 +830,10 @@ def compile(input_file_path, *output_file_name)
 
     input_file_contents = input_file_contents.collect { |element| element.gsub("=~", "matchequal") }
 
+    input_file_contents = input_file_contents.collect { |element| element.gsub(">=", "greatequal") }
+
+    input_file_contents = input_file_contents.collect { |element| element.gsub("<=", "lessyequal") }
+
     possible_default_values = input_file_contents.dup.reject { |element| (!element.include?("def")) }
 
     possible_default_values = possible_default_values.reject { |element| !element.include?("=") }
@@ -876,6 +888,10 @@ def compile(input_file_path, *output_file_name)
 
     line_by_line_contents = line_by_line_contents.collect { |element| element.gsub("matchequal", "=~") }
 
+    line_by_line_contents = line_by_line_contents.collect { |element| element.gsub("greatequal", ">=") }
+
+    line_by_line_contents = line_by_line_contents.collect { |element| element.gsub("lessyequal", "<=") }
+
     return line_by_line_contents
 
   end
@@ -928,6 +944,10 @@ def compile(input_file_path, *output_file_name)
 
     input_file_contents = input_file_contents.collect { |element| element.gsub("=~", "matchequal") }
 
+    input_file_contents = input_file_contents.collect { |element| element.gsub(">=", "greatequal") }
+
+    input_file_contents = input_file_contents.collect { |element| element.gsub("<=", "lessyequal") }
+
     modified_file_contents = input_file_contents.clone
 
     input_file_contents = input_file_contents.collect {|element| replace_strings(element)}
@@ -961,6 +981,7 @@ def compile(input_file_path, *output_file_name)
 
         variables << current_row_split[0]
 
+
       end
 
       input_file_contents[x] = current_row
@@ -997,14 +1018,6 @@ def compile(input_file_path, *output_file_name)
 
     variables = variables.flatten
 
-    if variables.length > 0
-
-      variable_declaration_string = "var " + variables.uniq.sort.join(", ") + "\n\n"
-
-      line_by_line_contents = [variable_declaration_string, line_by_line_contents].flatten
-
-    end
-
     line_by_line_contents = line_by_line_contents.collect { |element| element.gsub("plusequal", "+=") }
 
     line_by_line_contents = line_by_line_contents.collect { |element| element.gsub("minusequal", "-=") }
@@ -1021,6 +1034,10 @@ def compile(input_file_path, *output_file_name)
 
     line_by_line_contents = line_by_line_contents.collect { |element| element.gsub("matchequal", "=~") }
 
+    line_by_line_contents = line_by_line_contents.collect { |element| element.gsub("greatequal", ">=") }
+
+    line_by_line_contents = line_by_line_contents.collect { |element| element.gsub("lessyequal", "<=") }
+
     return variables.uniq, line_by_line_contents
 
   end
@@ -1172,7 +1189,7 @@ def compile(input_file_path, *output_file_name)
 
         replacement_string = nil
 
-        if index_end.strip == "end"
+        if index_end.strip == "last"
 
           replacement_string = split1 + ".slice(#{index_start},#{split}.length)\n"
 
@@ -1216,9 +1233,9 @@ def compile(input_file_path, *output_file_name)
 
         replacement_string = nil
 
-        if index_end.strip == "end"
+        if index_end.strip == "last"
 
-          replacement_string = split1 + ".slice(#{index_start})\n"
+          replacement_string = split1 + ".slice(#{index_start})" + split3.strip + "\n\n"
 
         elsif index_end.strip == "" and index_start.strip == ""
 
@@ -1737,6 +1754,26 @@ def compile(input_file_path, *output_file_name)
 
       def replace_strings(input_string)
 
+        element = input_string.gsub("==", "equalequal")
+
+        element = element.gsub("!=", "notequal")
+
+        element = element.gsub("+=", "plusequal")
+
+        element = element.gsub("-=", "minusequal")
+
+        element = element.gsub("*=", "multiequal")
+
+        element = element.gsub("/=", "divequal")
+
+        element = element.gsub("%=", "modequal")
+
+        element = element.gsub("=~", "matchequal")
+
+        element = element.gsub(">=", "greatequal")
+
+        input_string = element.gsub("<=", "lessyequal")
+
         string_counter = 0
 
         while input_string.include?("\"")
@@ -1765,7 +1802,7 @@ def compile(input_file_path, *output_file_name)
 
       input_function_block = input_function_block.collect {|element| replace_strings(element)}
 
-      controlregexp = /(if |Euuf |while |def |function |function\()/
+      controlregexp = /(if |Euuf |for |while |def |function |function\()/
 
       variables = []
 
@@ -2220,7 +2257,13 @@ def compile(input_file_path, *output_file_name)
 
         ".lstrip" => ".replace(/^\\s+/g,\"\")",
 
-        ".rstrip" => ".replace(/\\s+$/g,\"\")"
+        ".rstrip" => ".replace(/\\s+$/g,\"\")",
+
+        ".to_s" => ".toString()",
+
+        ".reverse" => ".reverse()",
+
+        ".empty?" => ".length == 0",
 
     }
 
@@ -2254,6 +2297,85 @@ def compile(input_file_path, *output_file_name)
 
   end
 
+  def compile_special_keywords(input_file_contents)
+
+    # This method compiles some Ruby specific keywords to Javascript to make it easy to port
+    # Ruby code into Javascript
+
+    def replace_strings(input_string)
+
+      string_counter = 0
+
+      if input_string.count("\"") % 2 == 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
+
+      end
+
+      if input_string.count("'") % 2 == 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
+
+      end
+
+      return input_string
+
+    end
+
+    keyword_replacement_map = {
+
+        "nil" => "null",
+
+        "Array.new" => "Array()"
+
+    }
+
+    special_keywords = keyword_replacement_map.keys
+
+    keyword_map_regex = special_keywords.collect {|name| name.gsub(".","\\.")}
+
+    keyword_map_regex = Regexp.new(keyword_map_regex.join("|"))
+
+    modified_file_contents = input_file_contents.clone
+
+    input_file_contents.each_with_index do |line, index|
+
+      if replace_strings(line).match(keyword_map_regex)
+
+        method_match = line.match(keyword_map_regex).to_a[0]
+
+        if line.split(keyword_map_regex)[0].include?("=")
+
+          line = line.sub(method_match,keyword_replacement_map[method_match])
+
+        end
+
+      end
+
+      modified_file_contents[index] = line
+
+    end
+
+    return modified_file_contents
+
+  end
+
   def compile_whitespace_delimited_functions(input_file_contents, function_names, temporary_nila_file)
 
     def extract(input_string, pattern_start, pattern_end)
@@ -3759,6 +3881,10 @@ def compile(input_file_path, *output_file_name)
 
         input_file_contents = input_file_contents.collect { |element| element.gsub("=~", "matchequal") }
 
+        input_file_contents = input_file_contents.collect { |element| element.gsub(">=", "greatequal") }
+
+        input_file_contents = input_file_contents.collect { |element| element.gsub("<=", "lessyequal") }
+
         javascript_regexp = /(if |while |for )/
 
         for x in 0...input_file_contents.length
@@ -3901,6 +4027,8 @@ def compile(input_file_path, *output_file_name)
 
           times_counter = loop.split(".times")[0].lstrip
 
+          times_counter = times_counter[1...-1] if times_counter.include?("(") and times_counter.include?(")")
+
           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
@@ -3953,7 +4081,7 @@ def compile(input_file_path, *output_file_name)
 
         line = starting_line
 
-        until line.strip.eql?("end")
+        until line.strip.eql?("end") or line.strip.eql?("end)")
 
           index_counter += 1
 
@@ -4031,7 +4159,19 @@ def compile(input_file_path, *output_file_name)
 
         caller_func = loop.split(" blockky ")[0]
 
-        replacement_string = "#{caller_func.rstrip}(#{compiled_block.lstrip})"
+        unless caller_func.rstrip[-1] == ","
+
+          replacement_string = "#{caller_func.rstrip}(#{compiled_block.lstrip})"
+
+        else
+
+          caller_func_split = caller_func.split("(") if caller_func.include?("(")
+
+          caller_func_split = caller_func.split(" ",2) if caller_func.include?(" ")
+
+          replacement_string = "#{caller_func_split[0]}(#{caller_func_split[1].strip + compiled_block.lstrip})"
+
+        end
 
         modified_file_contents[input_file_contents.index(original_loop)] = replacement_string
 
@@ -4189,7 +4329,7 @@ def compile(input_file_path, *output_file_name)
 
   end
 
-  def pretty_print_javascript(javascript_file_contents, temporary_nila_file)
+  def pretty_print_javascript(javascript_file_contents, temporary_nila_file,declarable_variables)
 
     def reset_tabs(input_file_contents)
 
@@ -4353,7 +4493,7 @@ def compile(input_file_path, *output_file_name)
 
       if !code_block_starting_locations.empty?
 
-        controlregexp = /(if |for |while |\(function\(|= function\(|((=|:)\s+\{))/
+        controlregexp = /(if |for |while |,function\(|\(function\(|= function\(|((=|:)\s+\{))/
 
         code_block_starting_locations = [0, code_block_starting_locations, -1].flatten
 
@@ -4483,7 +4623,7 @@ def compile(input_file_path, *output_file_name)
 
     def replace_ignored_words(input_string)
 
-      ignorable_keywords = [/if/, /while/, /function/]
+      ignorable_keywords = [/if/, /while/, /function/,/function/]
 
       dummy_replacement_words = ["eeuuff", "whaalesskkey", "conffoolotion"]
 
@@ -4499,6 +4639,14 @@ def compile(input_file_path, *output_file_name)
 
     javascript_regexp = /(if |for |while |\(function\(|= function\(|((=|:)\s+\{))/
 
+    if declarable_variables.length > 0
+
+      declaration_string = "var " + declarable_variables.flatten.uniq.sort.join(", ") + ";\n\n"
+
+      javascript_file_contents = [declaration_string,javascript_file_contents].flatten
+
+    end
+
     javascript_file_contents = javascript_file_contents.collect { |element| element.sub("Euuf", "if") }
 
     javascript_file_contents = javascript_file_contents.collect { |element| element.sub("whaaleskey", "while") }
@@ -4782,14 +4930,18 @@ def compile(input_file_path, *output_file_name)
 
     file_contents = compile_strings(file_contents)
 
+    list_of_variables, file_contents = get_variables(file_contents, temp_file,loop_vars)
+
     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+function_names)
+    func_names = function_names.dup
 
     file_contents, ruby_functions = compile_custom_function_map(file_contents)
 
     file_contents = compile_ruby_methods(file_contents)
 
+    file_contents = compile_special_keywords(file_contents)
+
     function_names << ruby_functions
 
     list_of_variables += loop_vars
@@ -4802,7 +4954,7 @@ def compile(input_file_path, *output_file_name)
 
     file_contents = compile_comments(file_contents, comments, temp_file)
 
-    file_contents = pretty_print_javascript(file_contents, temp_file)
+    file_contents = pretty_print_javascript(file_contents, temp_file,list_of_variables+func_names)
 
     file_contents = compile_operators(file_contents)
 

data/lib/nilac/version.rb

@@ -1,3 +1,3 @@
 module Nilac
-  VERSION = "0.0.4.3.6"
+  VERSION = "0.0.4.3.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nilac
 version: !ruby/object:Gem::Version
-  version: 0.0.4.3.6
+  version: 0.0.4.3.7
 platform: ruby
 authors:
 - Adhithya Rajasekaran