nilac 0.0.4.1.7 → 0.0.4.1.8

data/bin/nilac

@@ -204,13 +204,101 @@ def compile(input_file_path,*output_file_name)
 
   def compile_interpolated_strings(input_file_contents)
 
+    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
+
     modified_file_contents = input_file_contents.dup
 
     input_file_contents.each_with_index do |line,index|
 
       if line.include?("\#{")
 
-        interpolated_strings = line.scan(/\#{\S{1,}}/)
+        modified_line = line.dup
+
+        interpol_starting_loc = find_all_matching_indices(modified_line,"\#{") + [-1]
+
+        interpolated_strings = []
+
+        until interpol_starting_loc.empty?
+
+          interpol_starting_loc[1] = -2 if interpol_starting_loc[1] == -1
+
+          string_extract = modified_line[interpol_starting_loc[0]+1..interpol_starting_loc[1]+1]
+
+          closed_curly_brace_index = find_all_matching_indices(string_extract,"}")
+
+          index_counter = 0
+
+          test_string = ""
+
+          until closed_curly_brace_index.empty?
+
+            test_string = string_extract[0..closed_curly_brace_index[0]]
+
+            original_string = test_string.dup
+
+            if test_string.include?("{")
+
+              test_string = test_string.reverse.sub("{","$#{index_counter}$").reverse
+
+              test_string[-1] = "@#{index_counter}@"
+
+            end
+
+            string_extract = string_extract.sub(original_string,test_string)
+
+            closed_curly_brace_index = find_all_matching_indices(string_extract,"}")
+
+            index_counter += 1
+
+          end
+
+          string_extract = string_extract[0..string_extract.length-string_extract.reverse.index(/@\d@/)]
+
+          interpolated_string = "\#{" + string_extract.split("@#{index_counter-1}@")[0].split("$#{index_counter-1}$")[1] + "}"
+
+          to_be_replaced = interpolated_string.scan(/\$\d\$/)
+
+          closing_brace_rep = interpolated_string.scan(/@\d@/)
+
+          to_be_replaced.each_with_index do |rep,index|
+
+            interpolated_string = interpolated_string.sub(rep,"{").sub(closing_brace_rep[index],"}")
+
+          end
+
+          interpolated_strings << interpolated_string
+
+          modified_line = modified_line.sub(interpolated_string,"--interpolate")
+
+          if find_all_matching_indices(modified_line,"\#{").empty?
+
+            interpol_starting_loc = []
+
+          else
+
+            interpol_starting_loc = find_all_matching_indices(modified_line,"\#{") + [-1]
+
+          end
+
+        end
 
         interpolated_strings.each do |interpol|
 
@@ -977,6 +1065,10 @@ def compile(input_file_path,*output_file_name)
 
           delimiter = "}" if delimiter.eql?("{")
 
+          delimiter = ")" if delimiter.eql?("(")
+
+          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[3...-1]}'")
@@ -1017,6 +1109,10 @@ def compile(input_file_path,*output_file_name)
 
           delimiter = "}" if delimiter.eql?("{")
 
+          delimiter = ")" if delimiter.eql?("(")
+
+          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[3...-1]}\"")
@@ -1059,6 +1155,10 @@ def compile(input_file_path,*output_file_name)
 
           delimiter = "}" if delimiter.eql?("{")
 
+          delimiter = ")" if delimiter.eql?("(")
+
+          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]}\"")
@@ -3135,7 +3235,7 @@ def find_file_path(input_path,file_extension)
 
 end
 
-nilac_version = "0.0.4.1.7"
+nilac_version = "0.0.4.1.8"
 
 opts = Slop.parse do
   on :c, :compile=, 'Compile Nila File', as:Array, delimiter:":"

data/lib/nilac/version.rb

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

data/shark/features/string_interpolation.feature

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

data/shark/test_files/correct_interpolation.js

@@ -0,0 +1,13 @@
+//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");
+
+}).call(this);

data/shark/test_files/correct_multiline_array.js

@@ -0,0 +1,13 @@
+//Written using Nila. Visit http://adhithyan15.github.io/nila
+(function() {
+  var myarray, name, numbers;
+
+  numbers = [1,2,3,4,5,6,7,8,9,10];
+
+  myarray = ["string 1","string 2","string 3"];
+
+  name = "Adhithya";
+
+  name[5] = "t";
+
+}).call(this);

data/shark/test_files/string_interpolation.nila

@@ -0,0 +1,7 @@
+#This file tests the limits of the string interpolation feature present in Nila
+
+msg = "Hello #{"world. A lovely place."}" + "Another #{"Lovely quote"}"
+
+puts msg
+
+puts "Hello #{"world"}"

data/src/nilac.rb

@@ -202,13 +202,101 @@ def compile(input_file_path,*output_file_name)
 
   def compile_interpolated_strings(input_file_contents)
 
+    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
+
     modified_file_contents = input_file_contents.dup
 
     input_file_contents.each_with_index do |line,index|
 
       if line.include?("\#{")
 
-        interpolated_strings = line.scan(/\#{\S{1,}}/)
+        modified_line = line.dup
+
+        interpol_starting_loc = find_all_matching_indices(modified_line,"\#{") + [-1]
+
+        interpolated_strings = []
+
+        until interpol_starting_loc.empty?
+
+          interpol_starting_loc[1] = -2 if interpol_starting_loc[1] == -1
+
+          string_extract = modified_line[interpol_starting_loc[0]+1..interpol_starting_loc[1]+1]
+
+          closed_curly_brace_index = find_all_matching_indices(string_extract,"}")
+
+          index_counter = 0
+
+          test_string = ""
+
+          until closed_curly_brace_index.empty?
+
+            test_string = string_extract[0..closed_curly_brace_index[0]]
+
+            original_string = test_string.dup
+
+            if test_string.include?("{")
+
+              test_string = test_string.reverse.sub("{","$#{index_counter}$").reverse
+
+              test_string[-1] = "@#{index_counter}@"
+
+            end
+
+            string_extract = string_extract.sub(original_string,test_string)
+
+            closed_curly_brace_index = find_all_matching_indices(string_extract,"}")
+
+            index_counter += 1
+
+          end
+
+          string_extract = string_extract[0..string_extract.length-string_extract.reverse.index(/@\d@/)]
+
+          interpolated_string = "\#{" + string_extract.split("@#{index_counter-1}@")[0].split("$#{index_counter-1}$")[1] + "}"
+
+          to_be_replaced = interpolated_string.scan(/\$\d\$/)
+
+          closing_brace_rep = interpolated_string.scan(/@\d@/)
+
+          to_be_replaced.each_with_index do |rep,index|
+
+            interpolated_string = interpolated_string.sub(rep,"{").sub(closing_brace_rep[index],"}")
+
+          end
+
+          interpolated_strings << interpolated_string
+
+          modified_line = modified_line.sub(interpolated_string,"--interpolate")
+
+          if find_all_matching_indices(modified_line,"\#{").empty?
+
+            interpol_starting_loc = []
+
+          else
+
+            interpol_starting_loc = find_all_matching_indices(modified_line,"\#{") + [-1]
+
+          end
+
+        end
 
         interpolated_strings.each do |interpol|
 
@@ -975,6 +1063,10 @@ def compile(input_file_path,*output_file_name)
 
           delimiter = "}" if delimiter.eql?("{")
 
+          delimiter = ")" if delimiter.eql?("(")
+
+          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[3...-1]}'")
@@ -1015,6 +1107,10 @@ def compile(input_file_path,*output_file_name)
 
           delimiter = "}" if delimiter.eql?("{")
 
+          delimiter = ")" if delimiter.eql?("(")
+
+          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[3...-1]}\"")
@@ -1057,6 +1153,10 @@ def compile(input_file_path,*output_file_name)
 
           delimiter = "}" if delimiter.eql?("{")
 
+          delimiter = ")" if delimiter.eql?("(")
+
+          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]}\"")
@@ -3133,7 +3233,7 @@ def find_file_path(input_path,file_extension)
 
 end
 
-nilac_version = "0.0.4.1.7"
+nilac_version = "0.0.4.1.8"
 
 opts = Slop.parse do
   on :c, :compile=, 'Compile Nila File', as:Array, delimiter:":"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nilac
 version: !ruby/object:Gem::Version
-  version: 0.0.4.1.7
+  version: 0.0.4.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -71,6 +71,7 @@ files:
 - shark/features/regular_if.feature
 - shark/features/regular_while.feature
 - shark/features/ruby_operators.feature
+- shark/features/string_interpolation.feature
 - shark/features/strings.feature
 - shark/features/unless_until.feature
 - shark/features/whitespace_delimitation.feature
@@ -79,7 +80,8 @@ files:
 - 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_interpolation.js
+- shark/test_files/correct_multiline_array.js
 - shark/test_files/correct_multiple_return.js
 - shark/test_files/correct_operators.js
 - shark/test_files/correct_regular_if.js
@@ -101,6 +103,7 @@ files:
 - shark/test_files/regular_while.nila
 - shark/test_files/simple.nila
 - shark/test_files/single_return.nila
+- shark/test_files/string_interpolation.nila
 - shark/test_files/string_operators.nila
 - shark/test_files/unless_until.nila
 - shark/test_files/whitespace_delimiter.nila