nilac 0.0.4.3.9.7.1 → 0.0.4.3.9.8

data/lib/nilac/friendly_errors.rb

@@ -92,4 +92,132 @@ module FriendlyErrors
 
   end
 
+  def check_comments(file_contents)
+
+    def word_counter(input_string,word)
+
+      string_split = input_string.split(word)
+
+      return string_split.length-1
+
+    end
+
+    proceed = true
+
+    joined_file_contents = file_contents.join
+
+    joined_file_contents = replace_strings(joined_file_contents).gsub("_","")
+
+    unless joined_file_contents.scan(/=\s+begin\n/).empty?
+
+      puts "SyntaxWarning: Improper Whitespace\n\n"
+
+      puts "I detected that you have used one or more spaces between '=' and 'begin' in your file. This is not allowed.\n\n"
+
+      puts "But this is a very small mistake. So I am assuming you meant `=begin` and I will continue to compile.\n\n"
+
+      puts "Please correct it before next time or else you will see this warning again!\n\n"
+
+      puts "If you have any questions, please refer to the documentation at \n\nhttps://adhithyan15.github.io/nila/documentation.html#comments\n"
+
+      joined_file_contents = joined_file_contents.gsub(/=\s+begin/,"=begin")
+
+    end
+
+    unless joined_file_contents.scan(/=\s+end\n/).empty?
+
+      puts "SyntaxWarning: Improper Whitespace\n\n"
+
+      puts "I detected that you have used one or more spaces between '=' and 'end' in your file. This is not allowed.\n\n"
+
+      puts "But this is a very small mistake. So I am assuming you meant `=end` and I will continue to compile.\n\n"
+
+      puts "Please correct it before next time or else you will see this warning again!\n\n"
+
+      puts "If you have any questions, please refer to the documentation at \n\nhttps://adhithyan15.github.io/nila/documentation.html#comments\n"
+
+      joined_file_contents = joined_file_contents.gsub(/=\s+end/,"=end")
+
+    end
+
+    block_comments = []
+
+    while joined_file_contents.include?("=begin\n") or joined_file_contents.include?("=end\n")
+
+      begin
+
+        comment_start = joined_file_contents.index("=begin\n")
+
+        comment_end = joined_file_contents.index("=end\n")
+
+        block_comments << joined_file_contents[comment_start..comment_end]
+
+        joined_file_contents[comment_start..comment_end] = ""
+
+      rescue ArgumentError
+
+        if comment_start == nil
+
+          extracted_contents = joined_file_contents[0..comment_end].reverse
+
+          line_number_match = extracted_contents.match(/>>>\d*<<</)
+
+          line_number_match = line_number_match.to_a
+
+          line_number_extract = line_number_match[0].split(">>>")[1].split("<<<")[0]
+
+          puts "SyntaxError: Unexpected =end\n\n"
+
+          puts "It seems like there is a problem with your multiline comment. I am checking where that happened! Give me a few seconds..... \n\n"
+
+          puts "In line number #{line_number_extract}, I detected an `=end` statement. But no matching `=begin` statement was found! Please fix it immediately!\n\n"
+
+          puts "I cannot proceed with out it!\n\n"
+
+          puts "If you have any questions, please refer to the documentation at \n\nhttps://adhithyan15.github.io/nila/documentation.html#comments\n"
+
+          exit
+
+        end
+
+        if comment_end == nil
+
+          extracted_contents = joined_file_contents[0..comment_start].reverse
+
+          line_number_match = extracted_contents.match(/>>>\d*<<</)
+
+          line_number_match = line_number_match.to_a
+
+          line_number_extract = line_number_match[0].split(">>>")[1].split("<<<")[0]
+
+          puts "SyntaxError: Unexpected =begin\n\n"
+
+          puts "It seems like there is a problem with your multiline comment. I am checking where that happened! Give me a few seconds..... \n\n"
+
+          puts "In line number #{line_number_extract}, I detected a `=begin` statement. But no matching `=end` statement was found! Please fix it immediately!\n\n"
+
+          puts "I cannot proceed with out it!\n\n"
+
+          puts "If you have any questions, please refer to the documentation at \n\nhttps://adhithyan15.github.io/nila/documentation.html#comments\n"
+
+          exit
+
+        end
+
+      end
+
+    end
+
+    return proceed
+
+  end
+
+  def check_heredoc_syntax(input_file_contents)
+
+    proceed = true
+
+
+
+  end
+
 end

data/lib/nilac/get_variables.rb

@@ -1,6 +1,7 @@
 require_relative 'replace_strings'
 require_relative 'read_file_line_by_line'
 require_relative 'paranthesis_compactor'
+require_relative 'extract_paranthesis_contents'
   
   def get_variables(input_file_contents, temporary_nila_file, *loop_variables)
 
@@ -52,34 +53,67 @@ require_relative 'paranthesis_compactor'
 
           current_row = current_row.rstrip + "\n"
 
-          current_row_split = current_row.split("=")
+          if current_row.count("=") > 1
 
-          for y in 0...current_row_split.length
+            if compact_paranthesis(current_row).count("=") > 1
 
-            current_row_split[y] = current_row_split[y].strip
+              current_row_split = current_row.split("=")
 
+              current_row_split[0...-1].each do |split|
 
-          end
+                variables << split.strip
 
-          if current_row_split[0].include?("[") or current_row_split[0].include?("(")
+              end
 
-            current_row_split[0] = current_row_split[0][0...current_row_split[0].index("[")]
+            else
 
-          end
+              paranthesis_contents = extract_paranthesis_contents(current_row)
+
+              paranthesis_contents = paranthesis_contents.reject {|element| !replace_strings(element).include?("=")}
+
+              paranthesis_contents.each do |element|
+
+                string_extract = element.strip[1...-1]
 
-          current_row_split[0] = current_row_split[0].split(".",2)[0].strip if current_row_split[0].include?(".")
+                variables << string_extract.split("=").collect {|element| element.strip}[0]
 
-          if current_row_split[0].include?(" ")
+              end
 
-            variable_name = current_row_split[0].split
+              if compact_paranthesis(current_row).include?("=")
 
-            variable_name = variable_name.join("_")
+                variables << current_row.split("=",2).collect {|element| element.strip}[0]
 
-            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
+
+            end
 
           else
 
-            variable_name = current_row_split[0]
+            current_row_split = current_row.split("=")
+
+            current_row_split = current_row_split.collect {|element| element.strip}
+
+            if current_row_split[0].include?("[") or current_row_split[0].include?("(")
+
+              current_row_split[0] = current_row_split[0][0...current_row_split[0].index("[")]
+
+            end
+
+            current_row_split[0] = current_row_split[0].split(".",2)[0].strip if current_row_split[0].include?(".")
+
+            if current_row_split[0].include?(" ")
+
+              variable_name = current_row_split[0].split
+
+              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
 
           end
 
@@ -145,6 +179,6 @@ require_relative 'paranthesis_compactor'
 
     line_by_line_contents = line_by_line_contents.collect { |element| element.gsub("lessyequal", "<=") }
 
-    return variables.uniq, line_by_line_contents
+    return variables.uniq.compact, line_by_line_contents
 
   end

data/lib/nilac/lexical_scoped_function_variables.rb

@@ -51,8 +51,6 @@ def lexical_scoped_variables(input_function_block)
 
   end
 
-  input_function_block = input_function_block.collect {|element| replace_strings(element)}
-
   controlregexp = /(if |Euuf |for |while |def |function |function\()/
 
   variables = []
@@ -65,7 +63,7 @@ def lexical_scoped_variables(input_function_block)
 
   input_function_block.each do |line|
 
-    if line.include? "=" and line.index(controlregexp).nil?
+    if replace_strings(line).include? "=" and replace_strings(line).index(controlregexp).nil?
 
       current_line_split = line.strip.split("=")
 

data/lib/nilac/optimizer.rb

@@ -0,0 +1,13 @@
+module Optimizer
+
+  # This module will be used to optimize Nila code to remove unnecessary paranthesis and calculations
+
+  # This module will be fully operational by 0.0.5.0.0
+
+  def optimize_nila_code(input_file_contents)
+
+
+
+  end
+
+end

data/lib/nilac/paranthesis_compactor.rb

@@ -1,3 +1,5 @@
+require_relative 'square_brackets_compactor'
+
 def compact_paranthesis(input_string)
 
   string_extract = input_string.reverse
@@ -32,6 +34,6 @@ def compact_paranthesis(input_string)
 
   end
 
-  return string_extract.reverse
+  return compact_square_brackets(string_extract.reverse)
 
 end

data/lib/nilac/parse_arguments.rb

@@ -9,15 +9,11 @@ def parse_arguments(input_argv)
     %w{h help} => "help",
       
     %w{v version} => "version",
-      
-    %w{b build} => "build",
-      
+
     %w{u update} => "update",
       
-    %w{re release} => "release",
-      
   }
-    
+
   output_hash = {}
 
   argument_map.each do |key,val|
@@ -33,7 +29,25 @@ def parse_arguments(input_argv)
        output_hash[val.to_sym] = nil
         
     end
-      
+
+  end
+
+  if output_hash.values.compact.empty? and !input_argv.empty?
+
+    if input_argv[0].include?(".nila")
+
+      output_hash[:run] = [input_argv[0]]
+
+    elsif File.directory?(input_argv[0])
+
+      puts "\nSorry! Nilac cannot compile and run folders full of source files at this time.\n\n"
+
+      puts "Check out the documentation at https://adhithyan15.github.io/nila#cli-options\nif you have any questions\n\n"
+
+      exit
+
+    end
+
   end
 
   return output_hash

data/lib/nilac/pretty_print_javascript.rb

@@ -1,8 +1,9 @@
 require_relative 'find_all_matching_indices'
 require_relative 'read_file_line_by_line'
 require_relative 'replace_strings'
+require_relative 'strToArray'
   
-  def pretty_print_javascript(javascript_file_contents, temporary_nila_file,declarable_variables)
+  def pretty_print_javascript(javascript_file_contents, temporary_nila_file,declarable_variables,options)
 
     def reset_tabs(input_file_contents)
 
@@ -48,7 +49,7 @@ require_relative 'replace_strings'
 
         modified_block = input_block.reject {|element| element.strip.eql?("")}
 
-        modified_block = modified_block.collect {|element| element.rstrip + "\n"}
+        modified_block = modified_block.collect {|element| (element.rstrip + "\n") unless element[0..1].eql?("//")}
 
         return modified_block
 
@@ -104,7 +105,21 @@ require_relative 'replace_strings'
 
         remaining_contents = remaining_contents.reject {|element| element.strip.eql?("")}
 
-        remaining_contents = [remaining_contents[0]] + remaining_contents[1...-1].collect {|element| element + "\n"} + [remaining_contents[-1]]
+        remaining_contents[1...-1] = remaining_contents[1...-1].collect do |element|
+
+          if !replace_strings(element).split("//")[0].eql?("")
+
+            (element + "\n")
+
+          else
+
+            element
+
+          end
+
+        end
+
+        remaining_contents = [remaining_contents[0]] + remaining_contents[1...-1] + [remaining_contents[-1]]
 
         main_block_numbers.each do |number|
 
@@ -122,7 +137,21 @@ require_relative 'replace_strings'
 
         remaining_contents = block_compactor(file_contents)
 
-        remaining_contents = [remaining_contents[0]] + remaining_contents[1...-1].collect {|element| element + "\n"} + [remaining_contents[-1]]
+        remaining_contents[1...-1] = remaining_contents[1...-1].collect do |element|
+
+          if !replace_strings(element).split("//")[0].eql?("")
+
+            (element + "\n")
+
+          else
+
+            element
+
+          end
+
+        end
+
+        remaining_contents = [remaining_contents[0]] + remaining_contents[1...-1] + [remaining_contents[-1]]
 
       end
 
@@ -198,7 +227,7 @@ require_relative 'replace_strings'
 
               array_extract.each_with_index do |line|
 
-                break if line.index(controlregexp) != nil
+                break if replace_strings(line).index(controlregexp) != nil
 
                 index_counter += 1
 
@@ -252,11 +281,15 @@ require_relative 'replace_strings'
 
       fixableregexp = /(else |elsuf )/
 
-      need_fixes = input_file_contents.reject { |line| line.index(fixableregexp).nil? }
+      if input_file_contents.join.index(fixableregexp)
+
+        need_fixes = input_file_contents.reject { |line| line.index(fixableregexp).nil? }
 
-      need_fixes.each do |fix|
+        need_fixes.each do |fix|
 
-        input_file_contents[input_file_contents.index(fix)] = input_file_contents[input_file_contents.index(fix)].sub("  ", "")
+          input_file_contents[input_file_contents.index(fix)] = input_file_contents[input_file_contents.index(fix)].sub("  ", "")
+
+        end
 
       end
 
@@ -280,7 +313,87 @@ require_relative 'replace_strings'
 
     end
 
-    javascript_regexp = /(if |for |while |case |default:|switch\(|\(function\(|= function\(|((=|:)\s+\{))/
+    def comment_fix(input_file_contents)
+
+      def compress_block_comments(input_file_contents)
+
+        joined_file_contents = input_file_contents.join
+
+        block_comments = []
+
+        while joined_file_contents.include?("/*")
+
+          start_index = joined_file_contents.index("  /*")
+
+          end_index = joined_file_contents.index("  */\n\n")
+
+          if end_index > start_index
+
+            block_comments << joined_file_contents[start_index..end_index + 5]
+
+            joined_file_contents[start_index..end_index + 5] = ""
+
+          end
+
+        end
+
+        block_comments.each do |comment|
+
+          converted_array = strToArray(comment)
+
+          converted_array = converted_array.reject {|element| element.strip.eql?("")}.collect {|element| element + "\n"}
+
+          replacement_array = converted_array.collect {|element| element.rstrip + "\n"}
+
+          replacement_array[-1] = replacement_array[-1] + "\n"
+
+          replacement_array[1...-1] = replacement_array[1...-1].collect {|element| "  " + element}
+
+          input_file_contents[input_file_contents.index(converted_array[0])..input_file_contents.index(converted_array[-1])] = replacement_array
+
+        end
+
+        return input_file_contents
+
+      end
+
+      input_file_contents = input_file_contents.collect do |element|
+
+        line_counter = input_file_contents.index(element)
+
+        if element[0..3].eql?("  //")
+
+          if input_file_contents[line_counter+1].include?("//")
+
+            element.rstrip + "\n"
+
+          else
+
+            element
+
+          end
+
+        else
+
+          element
+
+        end
+
+      end
+
+      input_file_contents = compress_block_comments(input_file_contents)
+
+      return input_file_contents
+
+    end
+
+    def fix_spacing_issues(input_file_contents)
+
+      # This method fixes all the spacing issues that causes jsHint errors.
+
+    end
+
+    javascript_regexp = /(if |for |while |case |default:|switch\(|\(function\(|= function\(|,\s*function\(|((=|:)\s+\{))/
 
     if declarable_variables.length > 0
 
@@ -302,7 +415,7 @@ require_relative 'replace_strings'
 
     javascript_file_contents.each_with_index do |line, index|
 
-      if line.index(javascript_regexp) != nil
+      if replace_strings(line).index(javascript_regexp) != nil and !line.lstrip.split("//")[0].eql?("")
 
         starting_locations << index
 
@@ -396,7 +509,21 @@ require_relative 'replace_strings'
 
       end
 
-      remaining_file_contents = ["(function() {\n", remaining_file_contents, "\n}).call(this);"].flatten
+      if options[:strict_mode]
+
+        remaining_file_contents = ["  \"use strict\";\n",remaining_file_contents].flatten
+
+      end
+
+      if options[:bare]
+
+        remaining_file_contents = remaining_file_contents
+
+      else
+
+        remaining_file_contents = ["(function () {\n", remaining_file_contents, "\n}).call(this);"].flatten
+
+      end
 
       main_blocks.each_with_index do |block_id, index|
 
@@ -412,7 +539,7 @@ require_relative 'replace_strings'
 
       remaining_file_contents = remaining_file_contents.collect { |element| "  " + element }
 
-      remaining_file_contents = ["(function() {\n", remaining_file_contents, "\n}).call(this);"].flatten
+      remaining_file_contents = ["(function () {\n", remaining_file_contents, "\n}).call(this);"].flatten
 
       joined_file_contents = remaining_file_contents.join
 
@@ -430,22 +557,29 @@ require_relative 'replace_strings'
 
     line_by_line_contents = fix_newlines(line_by_line_contents,main_block_numbers)
 
-    removable_indices = line_by_line_contents.each_index.select {|index| line_by_line_contents[index].strip == "%$%$;" }
+    if line_by_line_contents.join.include?("%$%$")
 
-    while line_by_line_contents.join.include?("%$%$;")
+      removable_indices = line_by_line_contents.each_index.select {|index| line_by_line_contents[index].strip == "%$%$;" }
 
-      line_by_line_contents.delete_at(removable_indices[0])
+      while line_by_line_contents.join.include?("%$%$;")
 
-      line_by_line_contents.delete_at(removable_indices[0])
+        line_by_line_contents.delete_at(removable_indices[0])
 
-      removable_indices = line_by_line_contents.each_index.select {|index| line_by_line_contents[index].strip == "%$%$;" }
+        line_by_line_contents.delete_at(removable_indices[0])
+
+        removable_indices = line_by_line_contents.each_index.select {|index| line_by_line_contents[index].strip == "%$%$;" }
+
+      end
 
     end
 
-    line_by_line_contents = fix_syntax_indentation(line_by_line_contents)
+
+    line_by_line_contents = fix_syntax_indentation(line_by_line_contents).compact
 
     line_by_line_contents = line_by_line_contents.collect { |element| replace_ignored_words(element) }
 
+    line_by_line_contents =  comment_fix(line_by_line_contents)
+
     return line_by_line_contents
 
   end