nilac 0.0.3.1 → 0.0.3.2

data/bin/nilac

@@ -22,42 +22,19 @@ def compile(input_file_path)
 
   end
 
+  def extract_parsable_file(input_file_contents)
 
-  def extract_parsable_array(input_file_contents)
+    reversed_file_contents = input_file_contents.reverse
 
-    #This method finds and removes the __END__ keyword and the following lines in a Nila file.
+    line_counter = 0
 
-    modified_file_contents = input_file_contents.dup
-
-    end_index = 0
-
-    input_file_contents.each_with_index do |line,index|
+    while !reversed_file_contents[line_counter].strip.include?("__END__")
 
-      if line.strip.eql?("__END__")
-
-        end_index = index
-
-      end
+      line_counter += 1
 
     end
 
-    if end_index == 0
-
-      output = modified_file_contents
-
-    else
-
-      output = modified_file_contents[0..end_index-1]
-
-      while output[-1].eql?("\n")
-
-        output.delete_at(-1)
-
-      end
-
-    end
-
-    return output
+    return_contents = input_file_contents[0...-1*line_counter-1]
 
   end
 
@@ -156,8 +133,12 @@ def compile(input_file_path)
 
     file_id.write(modified_file_contents)
 
+    file_id2.write("//Written in Nila and compiled to Javascript. Have fun!\n\n")
+
     file_id.close()
 
+    file_id2.close()
+
     line_by_line_contents = read_file_line_by_line(temporary_nila_file)
 
     comments = multiline_comments.dup
@@ -194,7 +175,7 @@ def compile(input_file_path)
 
         replacement_line = modified_file_contents[index]
 
-        replacement_line = replacement_line.split(";").join("\n\n")
+        replacement_line = replacement_line.split(";").join("\n\n") + "\n"
 
         modified_file_contents[index] = replacement_line
 
@@ -206,83 +187,6 @@ def compile(input_file_path)
 
   end
 
-  def compile_heredoc_strings(input_file_contents,temporary_nila_file)
-
-    #This method will compile all the Heredoc strings in Nila into pure
-    #Javascript strings. Ruby has two types of Heredocs. Currently, Nila doesn't support both of them.
-    #Here is an example of what Nila supports
-
-    #long_passage = <<-ipsumtext
-    #
-    #Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
-    #incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud
-    #exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute
-    #irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-    #pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia
-    #deserunt mollit anim id est laborum.
-    #
-    #ipsumtext
-
-    def find_all_matching_indices(input_string,pattern)
-
-      locations = []
-
-      index = input_string.index(pattern)
-
-      while index != nil
-
-        locations << index
-
-        index = input_string.index(pattern,index+1)
-
-
-      end
-
-      return locations
-
-
-    end
-
-    preserve_formatting = %w{ \n \t }
-
-    joined_file_contents = input_file_contents.join
-
-    modified_file_contents = joined_file_contents.dup
-
-    heredoc_start_locations = find_all_matching_indices(joined_file_contents,"<<-")
-
-    heredoc_start_locations.each do |location|
-
-      string_extract = joined_file_contents[location..-1]
-
-      end_of_first_line = string_extract.index("\n")
-
-      name_of_heredoc = string_extract[3...end_of_first_line].rstrip
-
-      heredoc_start,heredoc_end = find_all_matching_indices(string_extract,name_of_heredoc)
-
-      heredoc = string_extract[heredoc_start..heredoc_end+name_of_heredoc.length-1]
-
-      heredoc_content = heredoc.split(name_of_heredoc)
-
-      heredoc_content = heredoc_content[1].lstrip.rstrip.gsub("\n","\\n").gsub("\t","\\t")
-
-      modified_file_contents = modified_file_contents.sub(string_extract[heredoc_start-3..heredoc_end+name_of_heredoc.length-1],"\""+heredoc_content+"\"")
-
-    end
-
-    file_id = open(temporary_nila_file, 'w')
-
-    file_id.write(modified_file_contents)
-
-    file_id.close()
-
-    line_by_line_contents = read_file_line_by_line(temporary_nila_file)
-
-    return line_by_line_contents
-
-  end
-
   def compile_interpolated_strings(input_file_contents)
 
     modified_file_contents = input_file_contents.dup
@@ -391,7 +295,7 @@ def compile(input_file_path)
 
         key_word_locations << x
 
-      elsif current_row.include?("end\n")
+      elsif current_row.include?("end\n") || current_row.include?("end")
 
         end_locations << x
 
@@ -919,16 +823,18 @@ def compile(input_file_path)
     line_by_line_contents = read_file_line_by_line(temporary_nila_file)
 
     return line_by_line_contents,function_names
-    
+
   end
 
   def compile_custom_function_map(input_file_contents)
 
-    function_map = ["puts"]
+    function_map = ["puts","print"]
 
     function_map_replacements = {
 
-        "puts" => "console.log"
+        "puts" => "console.log",
+
+        "print" => "console.log"
 
     }
 
@@ -1035,7 +941,53 @@ def compile(input_file_path)
 
     #1. If, Elsif, Else Statement
 
+    def compile_inline_conditionals(input_file_contents,temporary_nila_file)
+
+      conditionals = [/( if )/,/( while )/]
+
+      plain_conditionals = [" if "," while "]
+
+      joined_file_contents = input_file_contents.join
+
+      output_statement = ""
+
+      conditionals.each_with_index do |regex,index|
+
+        matching_lines = input_file_contents.reject {|content| !content.index(regex)}
+
+        matching_lines.each do |line|
+
+          line_split = line.split(plain_conditionals[index])
+
+          if index == 0
+
+            output_statement = "if (#{line_split[1].lstrip.rstrip}) {\n\n#{line_split[0]}\n}\n"
+
+          elsif index == 1
+
+            output_statement = "while (#{line_split[1].lstrip.rstrip}) {\n\n#{line_split[0]}\n}\n"
+
+          end
+
+          joined_file_contents = joined_file_contents.sub(line,output_statement)
+
+        end
+
+      end
+
+      file_id = open(temporary_nila_file, 'w')
+
+      file_id.write(joined_file_contents)
+
+      file_id.close()
+
+      line_by_line_contents = read_file_line_by_line(temporary_nila_file)
+
+      return line_by_line_contents
+
+    end
 
+    line_by_line_contents = compile_inline_conditionals(input_file_contents,temporary_nila_file)
 
   end
 
@@ -1243,7 +1195,7 @@ def compile(input_file_path)
 
     end
 
-    javascript_regexp = /(function |function\()/
+    javascript_regexp = /(if |while |function |function\()/
 
     locations = []
 
@@ -1257,8 +1209,6 @@ def compile(input_file_path)
 
     combined_location = [code_block_starting_locations,code_block_ending_locations.dup].flatten.sort
 
-    last_matching_location = 0
-
     self_invoking_function_extract = joined_file_contents[code_block_starting_locations[0]..code_block_ending_locations[-1]]
 
     self_invoking_function_array = convert_string_to_array(self_invoking_function_extract,temporary_nila_file)
@@ -1275,29 +1225,43 @@ def compile(input_file_path)
 
     modified_self_invoking_array[-1] = "\n\n" + modified_self_invoking_array[-1]
 
+    nested_elements = []
+
+    nested_indices = []
+
+    modified_starting_locations = code_block_starting_locations.dup
+
     while code_block_ending_locations.length > 0
 
       matching_location = combined_location[combined_location.index(code_block_ending_locations[0])-1]
 
+      combined_location.delete(matching_location)
+
       location_among_start_locations = code_block_starting_locations.index(matching_location)
 
-      locations << [[matching_location,combined_location[combined_location.index(code_block_ending_locations[0])]]]
+      if location_among_start_locations == 0
 
-      code_block_ending_locations.delete_at(0)
+        locations << [[matching_location,combined_location[combined_location.index(code_block_ending_locations[0])]]]
 
-      if code_block_ending_locations.length > 0
+      else
 
-        for x in location_among_start_locations-1..last_matching_location
+        nested_elements << [matching_location,combined_location[combined_location.index(code_block_ending_locations[0])]]
 
-          locations[-1] << [code_block_starting_locations[x],code_block_ending_locations[0]]
+        nested_indices << modified_starting_locations.index(matching_location)
 
-          code_block_ending_locations.delete_at(0)
+      end
 
-        end
+      combined_location.delete(code_block_ending_locations[0])
 
-      end
+      code_block_ending_locations.delete_at(0)
 
-      last_matching_location = location_among_start_locations + 1
+      code_block_starting_locations.delete(matching_location)
+
+    end
+
+    nested_indices.each_with_index do |loc,index|
+
+      locations[loc-1] << nested_elements[index]
 
     end
 
@@ -1379,7 +1343,7 @@ def compile(input_file_path)
 
   def create_self_invoking_function(input_file_contents)
 
-    # A feature imported from Coffeescript 1.6.1. This makes all the function private by default
+    # A feature imported from Coffeescript. This makes all the function private by default
     # and prevents global variables from leaking.
 
     modified_file_contents = ["(function() {\n\n",input_file_contents,"\n\n}).call(this);\n"].flatten
@@ -1406,14 +1370,12 @@ def compile(input_file_path)
 
   file_contents = read_file_line_by_line(input_file_path)
 
-  file_contents = extract_parsable_array(file_contents)
+  file_contents = extract_parsable_file(file_contents)
 
   file_contents,multiline_comments,temp_file,output_js_file = replace_multiline_comments(file_contents,input_file_path)
 
   file_contents = split_semicolon_seperated_expressions(file_contents)
 
-  file_contents = compile_heredoc_strings(file_contents,temp_file)
-
   file_contents = compile_interpolated_strings(file_contents)
 
   file_contents,singleline_comments = replace_singleline_comments(file_contents)
@@ -1426,6 +1388,8 @@ def compile(input_file_path)
 
   file_contents = compile_arrays(file_contents)
 
+  file_contents = compile_conditional_structures(file_contents,temp_file)
+
   file_contents, function_names = compile_named_functions(file_contents,named_functions,nested_functions,temp_file)
 
   file_contents, ruby_functions = compile_custom_function_map(file_contents)
@@ -1481,7 +1445,7 @@ def create_mac_executable(input_file)
 
   end
 
-  mac_file_contents = ["#!/usr/bin/env ruby"] + read_file_line_by_line(input_file)
+  mac_file_contents = ["#!/usr/bin/env ruby\n\n"] + read_file_line_by_line(input_file)
 
   mac_file_path = input_file.sub(".rb","")
 
@@ -1535,7 +1499,7 @@ OptionParser.new do |opts|
 
   end
 
-  opts.on("-b", "--build", "Builds Itself") do
+  opts.on("-b", "--build FILE", "Builds Itself") do |file|
 
     file_path = Dir.pwd + "/nilac.rb"
 
@@ -1545,7 +1509,7 @@ OptionParser.new do |opts|
 
   end
 
-  opts.on("-m", "--buildmac", "Builds Mac Executables") do
+  opts.on("-m", "--buildmac FILE", "Builds Mac Executables") do |macfile|
 
     file_path = Dir.pwd + "/nilac.rb"
 
@@ -1555,5 +1519,4 @@ OptionParser.new do |opts|
 
   end
 
-
 end.parse!

data/lib/nilac/version.rb

@@ -1,3 +1,3 @@
 module Nilac
-  VERSION = "0.0.3.1"
+  VERSION = "0.0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nilac
 version: !ruby/object:Gem::Version
-  version: 0.0.3.1
+  version: 0.0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies: []
 description: Nilac is the official compiler of Nila language
 email: