nilac 0.0.4.1.8 → 0.0.4.1.9

data/bin/nilac

@@ -202,6 +202,67 @@ def compile(input_file_path,*output_file_name)
 
   end
 
+  def compile_heredocs(input_file_contents,temporary_nila_file)
+
+    joined_file_contents = input_file_contents.join
+
+    possible_heredocs = input_file_contents.reject{|element| !element.include?("<<-")}
+
+    possible_heredocs = possible_heredocs.collect {|element| element.match(/<<-(.*|\w*)/).to_a[0]}
+
+    possible_heredocs.each do |heredoc|
+
+      delimiter = heredoc[3..-1]
+
+      quote = 2
+
+      if delimiter.include?("'")
+
+        quote = 1
+
+      end
+
+      delimiter = delimiter.gsub("\"","") if quote == 2
+
+      delimiter = delimiter.gsub("'","") if quote == 1
+
+      string_split = joined_file_contents.split(heredoc,2)
+
+      string_extract = string_split[1]
+
+      heredoc_extract = string_extract[0...string_extract.index(delimiter)]
+
+      replacement_string = ""
+
+      if quote == 1
+
+        replacement_string = "'#{heredoc_extract.delete("\"")}'".lstrip.inspect
+
+        replacement_string = replacement_string[1..-2]
+
+      elsif quote == 2
+
+        replacement_string = heredoc_extract.lstrip.inspect
+
+      end
+
+      joined_file_contents = joined_file_contents.sub(heredoc + heredoc_extract + delimiter,replacement_string)
+
+    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
+
   def compile_interpolated_strings(input_file_contents)
 
     def find_all_matching_indices(input_string,pattern)
@@ -226,6 +287,26 @@ def compile(input_file_path,*output_file_name)
 
     modified_file_contents = input_file_contents.dup
 
+    single_quoted_strings = input_file_contents.reject {|element| !element.include?("'")}
+
+    single_quoted_strings.each do |str|
+
+      modified_string = str.dup
+
+      while modified_string.include?("'")
+
+        first_index = modified_string.index("'")
+
+        string_extract = modified_string[first_index..modified_string.index("'",first_index+1)]
+
+        modified_string = modified_string.sub(string_extract,"--single_quoted")
+
+      end
+
+      input_file_contents[input_file_contents.index(str)] = modified_string
+
+    end
+
     input_file_contents.each_with_index do |line,index|
 
       if line.include?("\#{")
@@ -786,10 +867,6 @@ def compile(input_file_path,*output_file_name)
 
   def compile_arrays(input_file_contents,temporary_nila_file)
 
-    #Currently the following kinds of array constructs are compilable
-
-    # 1. %w{} syntax
-
     def compile_w_arrays(input_file_contents)
 
       def extract(input_string,pattern_start,pattern_end)
@@ -1032,12 +1109,30 @@ def compile(input_file_path,*output_file_name)
 
     end
 
+    def compile_operators(input_file_contents)
+
+      possible_operator_usage = input_file_contents.reject {|element| !element.include?("<<")}
+
+      possible_operator_usage.each do |usage|
+
+        left,right = usage.split("<<")
+
+        input_file_contents[input_file_contents.index(usage)] = left.rstrip + ".push(#{right.lstrip})"
+
+      end
+
+      return input_file_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)
 
+    input_file_contents = compile_operators(input_file_contents)
+
     return input_file_contents
 
 
@@ -3133,6 +3228,8 @@ def compile(input_file_path,*output_file_name)
 
     file_contents = split_semicolon_seperated_expressions(file_contents)
 
+    file_contents = compile_heredocs(file_contents,temp_file)
+
     file_contents = compile_interpolated_strings(file_contents)
 
     file_contents = compile_conditional_structures(file_contents,temp_file)
@@ -3235,7 +3332,7 @@ def find_file_path(input_path,file_extension)
 
 end
 
-nilac_version = "0.0.4.1.8"
+nilac_version = "0.0.4.1.9"
 
 opts = Slop.parse do
   on :c, :compile=, 'Compile Nila File', as:Array, delimiter:":"
@@ -3249,6 +3346,8 @@ opts = Slop.parse do
 
     puts "    nilac -v/--version\n"
 
+    puts "    nilac -u/--update => Update Checker\n"
+
     puts "    nilac [command] [file_options]\n\n"
 
     puts "  Available Commands:\n\n"
@@ -3265,7 +3364,7 @@ opts = Slop.parse do
 
     puts "  Further Information:\n\n"
 
-    puts "    Visit http://adhithyan15.github.io/nila to know more about the project."
+    puts "    Visit http://adhithyan15.github.io/nila to know more about the project.\n\n"
 
   end
   on :v, :version, 'Output Nilac Version No' do

data/lib/nilac/version.rb

@@ -1,3 +1,3 @@
 module Nilac
-  VERSION = "0.0.4.1.8"
+  VERSION = "0.0.4.1.9"
 end

data/shark/features/heredoc.feature

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

data/shark/test_files/correct_heredoc.js

@@ -0,0 +1,11 @@
+//Written using Nila. Visit http://adhithyan15.github.io/nila
+(function() {
+  var numbers;
+
+  console.log("Grocery list\n----\n1. Salad mix.\n2. Strawberries.*\n3. Cereal.\n4. Milk.*\n \n* Organic\n");
+
+  numbers = [1,2,3,4,5,6,7];
+
+  numbers.push(7);
+
+}).call(this);

data/shark/test_files/{correct_interpolation.js → correct_string_interpolation.js}

@@ -10,4 +10,8 @@
 
   console.log("Hello " + "world");
 
+  console.log('Hello #{world}');
+
+  console.log('Hello');
+
 }).call(this);

data/shark/test_files/correct_string_operators.js

@@ -16,4 +16,10 @@
 
   str = "this is a wonderful string"  + "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";
+
 }).call(this);

data/shark/test_files/default_parameters.js

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

data/shark/test_files/heredoc.nila

@@ -0,0 +1,14 @@
+puts <<-Hello
+Grocery list
+----
+1. Salad mix.
+2. Strawberries.*
+3. Cereal.
+4. Milk.*
+ 
+* Organic
+Hello
+
+numbers = [1,2,3,4,5,6,7]
+
+numbers << 7

data/shark/test_files/multiline_array.nila

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

data/shark/test_files/string_interpolation.js

@@ -0,0 +1,17 @@
+//Written using Nila. Visit http://adhithyan15.github.io/nila
+(function() {
+  var msg;
+
+  //This file tests the limits of the string interpolation feature present in Nila
+
+  msg = "Hello " + "world. A lovely place." + "" + "Another " + "Lovely quote";
+
+  console.log(msg);
+
+  console.log("Hello " + "world");
+
+  console.log('Hello #{world}');
+
+  console.log('Hello');
+
+}).call(this);

data/shark/test_files/string_interpolation.nila

@@ -5,3 +5,7 @@ msg = "Hello #{"world. A lovely place."}" + "Another #{"Lovely quote"}"
 puts msg
 
 puts "Hello #{"world"}"
+
+puts 'Hello #{world}'
+
+puts 'Hello'

data/src/nilac.rb

@@ -200,6 +200,67 @@ def compile(input_file_path,*output_file_name)
 
   end
 
+  def compile_heredocs(input_file_contents,temporary_nila_file)
+
+    joined_file_contents = input_file_contents.join
+
+    possible_heredocs = input_file_contents.reject{|element| !element.include?("<<-")}
+
+    possible_heredocs = possible_heredocs.collect {|element| element.match(/<<-(.*|\w*)/).to_a[0]}
+
+    possible_heredocs.each do |heredoc|
+
+      delimiter = heredoc[3..-1]
+
+      quote = 2
+
+      if delimiter.include?("'")
+
+        quote = 1
+
+      end
+
+      delimiter = delimiter.gsub("\"","") if quote == 2
+
+      delimiter = delimiter.gsub("'","") if quote == 1
+
+      string_split = joined_file_contents.split(heredoc,2)
+
+      string_extract = string_split[1]
+
+      heredoc_extract = string_extract[0...string_extract.index(delimiter)]
+
+      replacement_string = ""
+
+      if quote == 1
+
+        replacement_string = "'#{heredoc_extract.delete("\"")}'".lstrip.inspect
+
+        replacement_string = replacement_string[1..-2]
+
+      elsif quote == 2
+
+        replacement_string = heredoc_extract.lstrip.inspect
+
+      end
+
+      joined_file_contents = joined_file_contents.sub(heredoc + heredoc_extract + delimiter,replacement_string)
+
+    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
+
   def compile_interpolated_strings(input_file_contents)
 
     def find_all_matching_indices(input_string,pattern)
@@ -224,6 +285,26 @@ def compile(input_file_path,*output_file_name)
 
     modified_file_contents = input_file_contents.dup
 
+    single_quoted_strings = input_file_contents.reject {|element| !(element.count("'") >= 2)}
+
+    single_quoted_strings.each do |str|
+
+      modified_string = str.dup
+
+      while modified_string.include?("'")
+
+        first_index = modified_string.index("'")
+
+        string_extract = modified_string[first_index..modified_string.index("'",first_index+1)]
+
+        modified_string = modified_string.sub(string_extract,"--single_quoted")
+
+      end
+
+      input_file_contents[input_file_contents.index(str)] = modified_string
+
+    end
+
     input_file_contents.each_with_index do |line,index|
 
       if line.include?("\#{")
@@ -784,10 +865,6 @@ def compile(input_file_path,*output_file_name)
 
   def compile_arrays(input_file_contents,temporary_nila_file)
 
-    #Currently the following kinds of array constructs are compilable
-
-    # 1. %w{} syntax
-
     def compile_w_arrays(input_file_contents)
 
       def extract(input_string,pattern_start,pattern_end)
@@ -1030,12 +1107,30 @@ def compile(input_file_path,*output_file_name)
 
     end
 
+    def compile_array_operators(input_file_contents)
+
+      possible_operator_usage = input_file_contents.reject {|element| !element.include?("<<")}
+
+      possible_operator_usage.each do |usage|
+
+        left,right = usage.split("<<")
+
+        input_file_contents[input_file_contents.index(usage)] = left.rstrip + ".push(#{right.lstrip})"
+
+      end
+
+      return input_file_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)
 
+    input_file_contents = compile_array_operators(input_file_contents)
+
     return input_file_contents
 
 
@@ -3131,6 +3226,8 @@ def compile(input_file_path,*output_file_name)
 
     file_contents = split_semicolon_seperated_expressions(file_contents)
 
+    file_contents = compile_heredocs(file_contents,temp_file)
+
     file_contents = compile_interpolated_strings(file_contents)
 
     file_contents = compile_conditional_structures(file_contents,temp_file)
@@ -3233,7 +3330,7 @@ def find_file_path(input_path,file_extension)
 
 end
 
-nilac_version = "0.0.4.1.8"
+nilac_version = "0.0.4.1.9"
 
 opts = Slop.parse do
   on :c, :compile=, 'Compile Nila File', as:Array, delimiter:":"
@@ -3247,6 +3344,8 @@ opts = Slop.parse do
 
     puts "    nilac -v/--version\n"
 
+    puts "    nilac -u/--update => Update Checker\n"
+
     puts "    nilac [command] [file_options]\n\n"
 
     puts "  Available Commands:\n\n"
@@ -3263,7 +3362,7 @@ opts = Slop.parse do
 
     puts "  Further Information:\n\n"
 
-    puts "    Visit http://adhithyan15.github.io/nila to know more about the project."
+    puts "    Visit http://adhithyan15.github.io/nila to know more about the project.\n\n"
 
   end
   on :v, :version, 'Output Nilac Version No' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nilac
 version: !ruby/object:Gem::Version
-  version: 0.0.4.1.8
+  version: 0.0.4.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shark
@@ -65,6 +65,7 @@ files:
 - shark/features/barebones_compilation.feature
 - shark/features/default_method_parameters.feature
 - shark/features/fix_newlines.feature
+- shark/features/heredoc.feature
 - shark/features/method_multiple_return.feature
 - shark/features/multiline_array.feature
 - shark/features/multiple_variable_initialization.feature
@@ -78,9 +79,9 @@ files:
 - shark/test_files/array_string_indexing.nila
 - shark/test_files/correct.js
 - shark/test_files/correct_default_parameters.js
+- shark/test_files/correct_heredoc.js
 - shark/test_files/correct_indexing.js
 - shark/test_files/correct_initialization.js
-- shark/test_files/correct_interpolation.js
 - shark/test_files/correct_multiline_array.js
 - shark/test_files/correct_multiple_return.js
 - shark/test_files/correct_operators.js
@@ -88,11 +89,14 @@ files:
 - shark/test_files/correct_regular_while.js
 - shark/test_files/correct_return.js
 - 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_unless_until.js
 - shark/test_files/correct_whitespace_delimiter.js
+- shark/test_files/default_parameters.js
 - shark/test_files/default_parameters.nila
 - shark/test_files/erratic.nila
+- shark/test_files/heredoc.nila
 - shark/test_files/multiline_array.nila
 - shark/test_files/multiple_initialization.nila
 - shark/test_files/multiple_return.nila
@@ -103,6 +107,7 @@ files:
 - shark/test_files/regular_while.nila
 - shark/test_files/simple.nila
 - shark/test_files/single_return.nila
+- shark/test_files/string_interpolation.js
 - shark/test_files/string_interpolation.nila
 - shark/test_files/string_operators.nila
 - shark/test_files/unless_until.nila