nilac 0.0.4.1.5 → 0.0.4.1.6

data/bin/nilac

@@ -586,8 +586,6 @@ def compile(input_file_path,*output_file_name)
 
       current_row = input_file_contents[x]
 
-      #The condition below verifies if the rows contain any equation operators.
-
       if current_row.include?("=") and !current_row.include?("def")
 
         current_row = current_row.rstrip + "\n"
@@ -601,6 +599,12 @@ def compile(input_file_path,*output_file_name)
 
         end
 
+        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
+
         variables << current_row_split[0]
 
 
@@ -691,7 +695,7 @@ def compile(input_file_path,*output_file_name)
 
   end
 
-  def compile_arrays(input_file_contents)
+  def compile_arrays(input_file_contents,temporary_nila_file)
 
     #Currently the following kinds of array constructs are compilable
 
@@ -885,10 +889,66 @@ def compile(input_file_path,*output_file_name)
 
     end
 
+    def compile_multiline(input_file_contents,temporary_nila_file)
+
+      possible_arrays = input_file_contents.reject {|element| !element.include?("[")}
+
+      possible_multiline_arrays = possible_arrays.reject {|element| element.include?("]")}
+
+      multiline_arrays = []
+
+      possible_multiline_arrays.each do |starting_line|
+
+        index = input_file_contents.index(starting_line)
+
+        line = starting_line
+
+        until line.include?("]")
+
+          index += 1
+
+          line = input_file_contents[index]
+
+        end
+
+        multiline_arrays << input_file_contents[input_file_contents.index(starting_line)..index]
+
+      end
+
+      joined_file_contents = input_file_contents.join
+
+      multiline_arrays.each do |array|
+
+        modified_array = array.join
+
+        array_extract = modified_array[modified_array.index("[")..modified_array.index("]")]
+
+        array_contents = array_extract.split("[")[1].split("]")[0].lstrip.rstrip.split(",").collect {|element| element.lstrip.rstrip}
+
+        array_contents = "[" + array_contents.join(",") + "]"
+
+        joined_file_contents = joined_file_contents.sub(array_extract,array_contents)
+
+      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
+
     input_file_contents = compile_w_arrays(input_file_contents)
 
     input_file_contents = compile_array_indexing(input_file_contents)
 
+    input_file_contents = compile_multiline(input_file_contents,temporary_nila_file)
+
     return input_file_contents
 
 
@@ -896,7 +956,7 @@ def compile(input_file_path,*output_file_name)
 
   def compile_strings(input_file_contents)
 
-    # This method will compile %q, %Q and %{} syntax. Heredocs support will be added in the future
+    # This method will compile %q, %Q and % syntax. Heredocs support will be added in the future
 
     def compile_small_q_syntax(input_file_contents)
 
@@ -978,9 +1038,53 @@ def compile(input_file_path,*output_file_name)
 
     end
 
+    def compile_percentage_syntax(input_file_contents)
+
+      possible_syntax_usage = input_file_contents.reject {|element| !element.include?("%")}
+
+      possible_syntax_usage = possible_syntax_usage.reject {|element| element.index(/(\%(\W|\s)\w{1,})/).nil?}
+
+      possible_syntax_usage.each do |line|
+
+        modified_line = line.dup
+
+        line_split = line.split("+").collect {|element| element.lstrip.rstrip}
+
+        line_split.each do |str|
+
+          delimiter = str[str.index("%")+1]
+
+          string_extract = str[str.index("%")..-1]
+
+          delimiter = "}" if delimiter.eql?("{")
+
+          if string_extract[-1].eql?(delimiter)
+
+            input_file_contents[input_file_contents.index(modified_line)] = input_file_contents[input_file_contents.index(modified_line)].sub(string_extract,"\"#{string_extract[2...-1]}\"")
+
+            modified_line = modified_line.sub(string_extract,"\"#{string_extract[2...-1]}\"")
+
+          elsif delimiter.eql?(" ")
+
+            input_file_contents[input_file_contents.index(modified_line)] = input_file_contents[input_file_contents.index(modified_line)].sub(string_extract,"\"#{string_extract[2..-1]}\"")
+
+            modified_line = modified_line.sub(string_extract,"\"#{string_extract[2..-1]}\"")
+
+          end
+
+        end
+
+      end
+
+      return input_file_contents
+
+    end
+
     file_contents = compile_small_q_syntax(input_file_contents)
 
-    file_contents = compile_big_q_syntax(input_file_contents)
+    file_contents = compile_big_q_syntax(file_contents)
+
+    file_contents = compile_percentage_syntax(file_contents)
 
     return file_contents
 
@@ -1003,7 +1107,7 @@ def compile(input_file_path,*output_file_name)
     #
     #  return input_number*input_number;
     #
-    # }
+    #}
 
     def is_parameterless?(input_function_block)
 
@@ -2932,7 +3036,7 @@ def compile(input_file_path,*output_file_name)
 
     file_contents = compile_conditional_structures(file_contents,temp_file)
 
-    file_contents = compile_arrays(file_contents)
+    file_contents = compile_arrays(file_contents,temp_file)
 
     file_contents = compile_strings(file_contents)
 
@@ -3030,7 +3134,7 @@ def find_file_path(input_path,file_extension)
 
 end
 
-nilac_version = "0.0.4.1.3"
+nilac_version = "0.0.4.1.6"
 
 opts = Slop.parse do
   on :c, :compile=, 'Compile Nila File', as:Array, delimiter:":"
@@ -3074,8 +3178,12 @@ opts = Slop.parse do
 
     file_path = Dir.pwd + "/src/nilac.rb"
 
+    puts file_path
+
     create_mac_executable(file_path)
 
+    FileUtils.mv("#{file_path[0...-3]}","#{Dir.pwd}/bin/nilac")
+
     puts "Build Successful!"
 
   end

data/lib/nilac/version.rb

@@ -1,3 +1,3 @@
 module Nilac
-  VERSION = "0.0.4.1.5"
+  VERSION = "0.0.4.1.6"
 end

data/shark/features/multiline_array.feature

@@ -0,0 +1,11 @@
+Feature: This feature brings multiline arrays to Nila
+  Scenario: Input file with multiline array and regular arrays. 
+    Given the input file "multiline_array.nila"
+    When the ~compiler is run
+    The output file must be "multiline_array.js"
+    The output file must equal "correct_multiline_array.js"
+
+Configurations:
+
+~compiler => src/nilac.rb
+:v $cliusage => ruby :v --compile $file

data/shark/features/whitespace_delimitation.feature

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

data/shark/test_files/array_string_indexing.nila

@@ -18,4 +18,4 @@ second_name = name[9..end]
 
 name_copy = name.dup
 
-name_copy = name[..] 
+name_copy = name[..]

data/shark/test_files/correct_whitespace_delimiter.js

@@ -0,0 +1,15 @@
+//Written using Nila. Visit http://adhithyan15.github.io/nila
+(function() {
+  function square(input_number) {
+    return input_number*input_number;
+  }
+
+  function return_number(input_number) {
+    return input_number;
+  }
+
+  console.log(message);
+
+  console.log(square(return_number(5)));
+
+}).call(this);

data/shark/test_files/multiline_array.nila

@@ -0,0 +1,13 @@
+numbers = [1,2,3,4,5,6,7,8,9,10]
+
+myarray = [
+
+"string 1",
+  "string 2",
+  "string 3"
+
+]
+
+name = "Adhithya"
+
+name[5] = "t"

data/shark/test_files/string_operators.nila

@@ -10,4 +10,10 @@ str = %Q{this is a wonderful string}
 
 str = %Q!this is a wonderful string!
 
-str = %Q this is a wonderful string  + %Q this is another wonderful string 
+str = %Q this is a wonderful string  + %Q this is another wonderful string 
+
+str = %|this is a wonderful string|
+
+str = %!this is a wonderful string!
+
+str = % this is a wonderful string  + % this is another wonderful string

data/shark/test_files/whitespace_delimiter.nila

@@ -0,0 +1,16 @@
+
+def square(input_number)
+
+  input_number*input_number
+
+end
+
+def return_number(input_number)
+
+  input_number
+
+end
+
+puts message
+
+puts square return_number 5

data/src/nilac.rb

@@ -6,6 +6,7 @@
 require 'slop'
 require 'fileutils'
 
+
 def compile(input_file_path,*output_file_name)
 
   def read_file_line_by_line(input_path)
@@ -584,8 +585,6 @@ def compile(input_file_path,*output_file_name)
 
       current_row = input_file_contents[x]
 
-      #The condition below verifies if the rows contain any equation operators.
-
       if current_row.include?("=") and !current_row.include?("def")
 
         current_row = current_row.rstrip + "\n"
@@ -599,6 +598,12 @@ def compile(input_file_path,*output_file_name)
 
         end
 
+        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
+
         variables << current_row_split[0]
 
 
@@ -689,7 +694,7 @@ def compile(input_file_path,*output_file_name)
 
   end
 
-  def compile_arrays(input_file_contents)
+  def compile_arrays(input_file_contents,temporary_nila_file)
 
     #Currently the following kinds of array constructs are compilable
 
@@ -883,10 +888,66 @@ def compile(input_file_path,*output_file_name)
 
     end
 
+    def compile_multiline(input_file_contents,temporary_nila_file)
+
+      possible_arrays = input_file_contents.reject {|element| !element.include?("[")}
+
+      possible_multiline_arrays = possible_arrays.reject {|element| element.include?("]")}
+
+      multiline_arrays = []
+
+      possible_multiline_arrays.each do |starting_line|
+
+        index = input_file_contents.index(starting_line)
+
+        line = starting_line
+
+        until line.include?("]")
+
+          index += 1
+
+          line = input_file_contents[index]
+
+        end
+
+        multiline_arrays << input_file_contents[input_file_contents.index(starting_line)..index]
+
+      end
+
+      joined_file_contents = input_file_contents.join
+
+      multiline_arrays.each do |array|
+
+        modified_array = array.join
+
+        array_extract = modified_array[modified_array.index("[")..modified_array.index("]")]
+
+        array_contents = array_extract.split("[")[1].split("]")[0].lstrip.rstrip.split(",").collect {|element| element.lstrip.rstrip}
+
+        array_contents = "[" + array_contents.join(",") + "]"
+
+        joined_file_contents = joined_file_contents.sub(array_extract,array_contents)
+
+      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
+
     input_file_contents = compile_w_arrays(input_file_contents)
 
     input_file_contents = compile_array_indexing(input_file_contents)
 
+    input_file_contents = compile_multiline(input_file_contents,temporary_nila_file)
+
     return input_file_contents
 
 
@@ -894,7 +955,7 @@ def compile(input_file_path,*output_file_name)
 
   def compile_strings(input_file_contents)
 
-    # This method will compile %q, %Q and %{} syntax. Heredocs support will be added in the future
+    # This method will compile %q, %Q and % syntax. Heredocs support will be added in the future
 
     def compile_small_q_syntax(input_file_contents)
 
@@ -976,9 +1037,53 @@ def compile(input_file_path,*output_file_name)
 
     end
 
+    def compile_percentage_syntax(input_file_contents)
+
+      possible_syntax_usage = input_file_contents.reject {|element| !element.include?("%")}
+
+      possible_syntax_usage = possible_syntax_usage.reject {|element| element.index(/(\%(\W|\s)\w{1,})/).nil?}
+
+      possible_syntax_usage.each do |line|
+
+        modified_line = line.dup
+
+        line_split = line.split("+").collect {|element| element.lstrip.rstrip}
+
+        line_split.each do |str|
+
+          delimiter = str[str.index("%")+1]
+
+          string_extract = str[str.index("%")..-1]
+
+          delimiter = "}" if delimiter.eql?("{")
+
+          if string_extract[-1].eql?(delimiter)
+
+            input_file_contents[input_file_contents.index(modified_line)] = input_file_contents[input_file_contents.index(modified_line)].sub(string_extract,"\"#{string_extract[2...-1]}\"")
+
+            modified_line = modified_line.sub(string_extract,"\"#{string_extract[2...-1]}\"")
+
+          elsif delimiter.eql?(" ")
+
+            input_file_contents[input_file_contents.index(modified_line)] = input_file_contents[input_file_contents.index(modified_line)].sub(string_extract,"\"#{string_extract[2..-1]}\"")
+
+            modified_line = modified_line.sub(string_extract,"\"#{string_extract[2..-1]}\"")
+
+          end
+
+        end
+
+      end
+
+      return input_file_contents
+
+    end
+
     file_contents = compile_small_q_syntax(input_file_contents)
 
-    file_contents = compile_big_q_syntax(input_file_contents)
+    file_contents = compile_big_q_syntax(file_contents)
+
+    file_contents = compile_percentage_syntax(file_contents)
 
     return file_contents
 
@@ -1001,7 +1106,7 @@ def compile(input_file_path,*output_file_name)
     #
     #  return input_number*input_number;
     #
-    # }
+    #}
 
     def is_parameterless?(input_function_block)
 
@@ -2930,7 +3035,7 @@ def compile(input_file_path,*output_file_name)
 
     file_contents = compile_conditional_structures(file_contents,temp_file)
 
-    file_contents = compile_arrays(file_contents)
+    file_contents = compile_arrays(file_contents,temp_file)
 
     file_contents = compile_strings(file_contents)
 
@@ -3028,7 +3133,7 @@ def find_file_path(input_path,file_extension)
 
 end
 
-nilac_version = "0.0.4.1.3"
+nilac_version = "0.0.4.1.6"
 
 opts = Slop.parse do
   on :c, :compile=, 'Compile Nila File', as:Array, delimiter:":"
@@ -3074,6 +3179,8 @@ opts = Slop.parse do
 
     create_mac_executable(file_path)
 
+    FileUtils.mv("#{file_path[0...-3]}","#{Dir.pwd}/bin/nilac")
+
     puts "Build Successful!"
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nilac
 version: !ruby/object:Gem::Version
-  version: 0.0.4.1.5
+  version: 0.0.4.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shark
@@ -66,17 +66,20 @@ files:
 - shark/features/default_method_parameters.feature
 - shark/features/fix_newlines.feature
 - shark/features/method_multiple_return.feature
+- shark/features/multiline_array.feature
 - shark/features/multiple_variable_initialization.feature
 - shark/features/regular_if.feature
 - shark/features/regular_while.feature
 - shark/features/ruby_operators.feature
 - shark/features/strings.feature
 - shark/features/unless_until.feature
+- shark/features/whitespace_delimitation.feature
 - shark/test_files/array_string_indexing.nila
 - shark/test_files/correct.js
 - shark/test_files/correct_default_parameters.js
 - shark/test_files/correct_indexing.js
 - shark/test_files/correct_initialization.js
+- shark/test_files/correct_multiline_array.nila
 - shark/test_files/correct_multiple_return.js
 - shark/test_files/correct_operators.js
 - shark/test_files/correct_regular_if.js
@@ -85,8 +88,10 @@ files:
 - shark/test_files/correct_single_return.js
 - shark/test_files/correct_string_operators.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/multiline_array.nila
 - shark/test_files/multiple_initialization.nila
 - shark/test_files/multiple_return.nila
 - shark/test_files/no_return.nila
@@ -98,6 +103,7 @@ files:
 - shark/test_files/single_return.nila
 - shark/test_files/string_operators.nila
 - shark/test_files/unless_until.nila
+- shark/test_files/whitespace_delimiter.nila
 - src/nilac.rb
 homepage: http://adhithyan15.github.com/nila
 licenses: []