nilac 0.0.4.1.4 → 0.0.4.1.5

data/bin/nilac

@@ -696,7 +696,6 @@ def compile(input_file_path,*output_file_name)
     #Currently the following kinds of array constructs are compilable
 
     # 1. %w{} syntax
-    # 2. Range - Coming soon!
 
     def compile_w_arrays(input_file_contents)
 
@@ -895,6 +894,98 @@ def compile(input_file_path,*output_file_name)
 
   end
 
+  def compile_strings(input_file_contents)
+
+    # This method will compile %q, %Q and %{} syntax. Heredocs support will be added in the future
+
+    def compile_small_q_syntax(input_file_contents)
+
+      possible_syntax_usage = input_file_contents.reject {|element| !element.include?("%q")}
+
+      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("%q")+2]
+
+          string_extract = str[str.index("%q")..-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[3...-1]}'")
+
+            modified_line = modified_line.sub(string_extract,"'#{string_extract[3...-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[3..-1]}'")
+
+            modified_line = modified_line.sub(string_extract,"'#{string_extract[3..-1]}'")
+
+          end
+
+        end
+
+      end
+
+      return input_file_contents
+
+    end
+
+    def compile_big_q_syntax(input_file_contents)
+
+      possible_syntax_usage = input_file_contents.reject {|element| !element.include?("%Q")}
+
+      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("%Q")+2]
+
+          string_extract = str[str.index("%Q")..-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[3...-1]}\"")
+
+            modified_line = modified_line.sub(string_extract,"\"#{string_extract[3...-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[3..-1]}\"")
+
+            modified_line = modified_line.sub(string_extract,"\"#{string_extract[3..-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)
+
+    return file_contents
+
+  end
+
   def compile_named_functions(input_file_contents,named_code_blocks,nested_functions,temporary_nila_file)
 
     #This method compiles all the named Nila functions. Below is an example of what is meant
@@ -1324,8 +1415,6 @@ def compile(input_file_path,*output_file_name)
         "p" => "console.log",
 
         "print" => "process.stdout.write"
-
-
     }
 
     function_map = function_map_replacements.keys
@@ -1936,12 +2025,12 @@ def compile(input_file_path,*output_file_name)
 
       def compile_while_syntax(input_block)
 
+        modified_input_block = input_block.dup
+
         strings = []
 
         string_counter = 0
 
-        modified_input_block = input_block.dup
-
         input_block.each_with_index do |line,index|
 
           if line.include?("\"")
@@ -2056,7 +2145,7 @@ def compile(input_file_path,*output_file_name)
 
             else
 
-              joined_file_contents = joined_file_contents.sub(rejected_elements_index[0],rejected_elements[0])
+              joined_file_contents = joined_file_contents.sub(rejected_elements_index[0],rejected_elements[0].join)
 
               rejected_elements_index.delete_at(0)
 
@@ -2066,7 +2155,7 @@ def compile(input_file_path,*output_file_name)
 
           else
 
-            joined_file_contents = joined_file_contents.sub(rejected_elements_index[0],rejected_elements[0])
+            joined_file_contents = joined_file_contents.sub(rejected_elements_index[0],rejected_elements[0].join)
 
             rejected_elements_index.delete_at(0)
 
@@ -2094,12 +2183,84 @@ def compile(input_file_path,*output_file_name)
 
     end
 
-    file_contents = replace_unless_until(input_file_contents)
+    def ignore_statement_modifiers(input_block)
+
+      modified_input_block = input_block.dup
+
+      rejectionregexp = /( if | while )/
+
+      rejected_lines = {}
+
+      rejected_line_counter = 0
+
+      input_block.each_with_index do |line,index|
+
+        if line.lstrip.index(rejectionregexp) != nil
+
+          rejected_lines["--rejected{#{rejected_line_counter}}\n\n"] = line
+
+          modified_input_block[index] = "--rejected{#{rejected_line_counter}}\n\n"
+
+          rejected_line_counter += 1
+
+        end
+
+      end
+
+      return modified_input_block,rejected_lines
+
+    end
+
+    def replace_statement_modifiers(input_block,rejected_lines)
+
+      unless rejected_lines.empty?
+
+        rejected_replacements = rejected_lines.keys
+
+        loc = 0
+
+        indices = []
+
+        index_counter = 0
+
+        rejected_replacements.each do |replacement_string|
+
+          input_block.each_with_index do |line,index|
+
+            break if line.include?(replacement_string.rstrip)
+
+            index_counter += 1
+
+          end
+
+          indices << index_counter
+
+          index_counter = 0
+
+        end
+
+        indices.each_with_index do |location,index|
+
+          input_block[location] = rejected_lines.values[index] + "\n\n"
+
+        end
+
+      end
+
+      return input_block
+
+    end
+
+    file_contents,rejected_lines = ignore_statement_modifiers(input_file_contents)
+
+    file_contents = replace_unless_until(file_contents)
 
     file_contents = compile_regular_if(file_contents,temporary_nila_file)
 
     file_contents = compile_regular_while(file_contents,temporary_nila_file)
 
+    file_contents = replace_statement_modifiers(file_contents,rejected_lines)
+
     file_contents = compile_inline_conditionals(file_contents,temporary_nila_file)
 
     return file_contents
@@ -2258,7 +2419,7 @@ def compile(input_file_path,*output_file_name)
 
   end
 
-  def pretty_print_javascript(javascript_file_contents,temporary_nila_file,comments)
+  def pretty_print_javascript(javascript_file_contents,temporary_nila_file)
 
     def reset_tabs(input_file_contents)
 
@@ -2699,6 +2860,26 @@ def compile(input_file_path,*output_file_name)
 
   def compile_operators(input_file_contents)
 
+    def compile_power_operator(input_string)
+
+      matches = input_string.scan(/(\w{1,}\*\*\w{1,})/).to_a.flatten
+
+      unless matches.empty?
+
+        matches.each do |match|
+
+          left,right = match.split("**")
+
+          input_string = input_string.sub(match,"Math.pow(#{left},#{right})")
+
+        end
+
+      end
+
+      return input_string
+
+    end
+
     input_file_contents = input_file_contents.collect {|element| element.sub(" and "," && ")}
 
     input_file_contents = input_file_contents.collect {|element| element.sub(" or "," || ")}
@@ -2709,13 +2890,15 @@ def compile(input_file_path,*output_file_name)
 
     input_file_contents = input_file_contents.collect {|element| element.sub("elsuf","else if")}
 
+    input_file_contents = input_file_contents.collect {|element| compile_power_operator(element)}
+
     return input_file_contents
 
   end
 
-  def pretty_print_nila(input_file_contents)
+  def pretty_print_nila(input_file_contents,temporary_nila_file)
+
 
-    #Implementation is pending
 
   end
 
@@ -2751,6 +2934,8 @@ def compile(input_file_path,*output_file_name)
 
     file_contents = compile_arrays(file_contents)
 
+    file_contents = compile_strings(file_contents)
+
     file_contents = compile_default_values(file_contents,temp_file)
 
     file_contents,named_functions,nested_functions = replace_named_functions(file_contents,temp_file)
@@ -2775,7 +2960,7 @@ def compile(input_file_path,*output_file_name)
 
     file_contents = compile_comments(file_contents,comments,temp_file)
 
-    file_contents = pretty_print_javascript(file_contents,temp_file,comments)
+    file_contents = pretty_print_javascript(file_contents,temp_file)
 
     file_contents = compile_operators(file_contents)
 

data/lib/nilac/version.rb

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

data/shark/features/ruby_operators.feature

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

data/shark/features/strings.feature

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

data/shark/test_files/correct_operators.js

@@ -0,0 +1,11 @@
+//Written using Nila. Visit http://adhithyan15.github.io/nila
+(function() {
+  var a;
+
+  a = Math.pow(2,3);
+
+  if (a === 8) {
+    console.log("Correct Calculation!");
+  }
+
+}).call(this);

data/shark/test_files/correct_string_operators.js

@@ -0,0 +1,19 @@
+//Written using Nila. Visit http://adhithyan15.github.io/nila
+(function() {
+  var str;
+
+  // This file demonstrates different ways to declare a string
+
+  str = 'this is a wonderful string';
+
+  str = 'this is a wonderful string';
+
+  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/correct_unless_until.js

@@ -21,7 +21,9 @@
   while (!(i > 10)) {
     process.stdout.write("" + i + " ");
     i+=1;
-    //redo if i > 10
+    if (i === 9) {
+      break;
+    }
   }
 
 }).call(this);

data/shark/test_files/operators.nila

@@ -0,0 +1,3 @@
+a = 2**3
+
+puts "Correct Calculation!" if a == 8

data/shark/test_files/string_operators.nila

@@ -0,0 +1,13 @@
+# This file demonstrates different ways to declare a string
+
+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}
+
+str = %Q!this is a wonderful string!
+
+str = %Q this is a wonderful string  + %Q this is another wonderful string 

data/shark/test_files/unless_until.nila

@@ -13,5 +13,5 @@ i=1
 until i > 10
   print "#{i} "
   i+=1
-  #redo if i > 10
+  break if i == 9
 end

data/src/nilac.rb

@@ -694,7 +694,6 @@ def compile(input_file_path,*output_file_name)
     #Currently the following kinds of array constructs are compilable
 
     # 1. %w{} syntax
-    # 2. Range - Coming soon!
 
     def compile_w_arrays(input_file_contents)
 
@@ -893,6 +892,98 @@ def compile(input_file_path,*output_file_name)
 
   end
 
+  def compile_strings(input_file_contents)
+
+    # This method will compile %q, %Q and %{} syntax. Heredocs support will be added in the future
+
+    def compile_small_q_syntax(input_file_contents)
+
+      possible_syntax_usage = input_file_contents.reject {|element| !element.include?("%q")}
+
+      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("%q")+2]
+
+          string_extract = str[str.index("%q")..-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[3...-1]}'")
+
+            modified_line = modified_line.sub(string_extract,"'#{string_extract[3...-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[3..-1]}'")
+
+            modified_line = modified_line.sub(string_extract,"'#{string_extract[3..-1]}'")
+
+          end
+
+        end
+
+      end
+
+      return input_file_contents
+
+    end
+
+    def compile_big_q_syntax(input_file_contents)
+
+      possible_syntax_usage = input_file_contents.reject {|element| !element.include?("%Q")}
+
+      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("%Q")+2]
+
+          string_extract = str[str.index("%Q")..-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[3...-1]}\"")
+
+            modified_line = modified_line.sub(string_extract,"\"#{string_extract[3...-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[3..-1]}\"")
+
+            modified_line = modified_line.sub(string_extract,"\"#{string_extract[3..-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)
+
+    return file_contents
+
+  end
+
   def compile_named_functions(input_file_contents,named_code_blocks,nested_functions,temporary_nila_file)
 
     #This method compiles all the named Nila functions. Below is an example of what is meant
@@ -1322,8 +1413,6 @@ def compile(input_file_path,*output_file_name)
         "p" => "console.log",
 
         "print" => "process.stdout.write"
-
-
     }
 
     function_map = function_map_replacements.keys
@@ -1934,12 +2023,12 @@ def compile(input_file_path,*output_file_name)
 
       def compile_while_syntax(input_block)
 
+        modified_input_block = input_block.dup
+
         strings = []
 
         string_counter = 0
 
-        modified_input_block = input_block.dup
-
         input_block.each_with_index do |line,index|
 
           if line.include?("\"")
@@ -2054,7 +2143,7 @@ def compile(input_file_path,*output_file_name)
 
             else
 
-              joined_file_contents = joined_file_contents.sub(rejected_elements_index[0],rejected_elements[0])
+              joined_file_contents = joined_file_contents.sub(rejected_elements_index[0],rejected_elements[0].join)
 
               rejected_elements_index.delete_at(0)
 
@@ -2064,7 +2153,7 @@ def compile(input_file_path,*output_file_name)
 
           else
 
-            joined_file_contents = joined_file_contents.sub(rejected_elements_index[0],rejected_elements[0])
+            joined_file_contents = joined_file_contents.sub(rejected_elements_index[0],rejected_elements[0].join)
 
             rejected_elements_index.delete_at(0)
 
@@ -2092,12 +2181,84 @@ def compile(input_file_path,*output_file_name)
 
     end
 
-    file_contents = replace_unless_until(input_file_contents)
+    def ignore_statement_modifiers(input_block)
+
+      modified_input_block = input_block.dup
+
+      rejectionregexp = /( if | while )/
+
+      rejected_lines = {}
+
+      rejected_line_counter = 0
+
+      input_block.each_with_index do |line,index|
+
+        if line.lstrip.index(rejectionregexp) != nil
+
+          rejected_lines["--rejected{#{rejected_line_counter}}\n\n"] = line
+
+          modified_input_block[index] = "--rejected{#{rejected_line_counter}}\n\n"
+
+          rejected_line_counter += 1
+
+        end
+
+      end
+
+      return modified_input_block,rejected_lines
+
+    end
+
+    def replace_statement_modifiers(input_block,rejected_lines)
+
+      unless rejected_lines.empty?
+
+        rejected_replacements = rejected_lines.keys
+
+        loc = 0
+
+        indices = []
+
+        index_counter = 0
+
+        rejected_replacements.each do |replacement_string|
+
+          input_block.each_with_index do |line,index|
+
+            break if line.include?(replacement_string.rstrip)
+
+            index_counter += 1
+
+          end
+
+          indices << index_counter
+
+          index_counter = 0
+
+        end
+
+        indices.each_with_index do |location,index|
+
+          input_block[location] = rejected_lines.values[index] + "\n\n"
+
+        end
+
+      end
+
+      return input_block
+
+    end
+
+    file_contents,rejected_lines = ignore_statement_modifiers(input_file_contents)
+
+    file_contents = replace_unless_until(file_contents)
 
     file_contents = compile_regular_if(file_contents,temporary_nila_file)
 
     file_contents = compile_regular_while(file_contents,temporary_nila_file)
 
+    file_contents = replace_statement_modifiers(file_contents,rejected_lines)
+
     file_contents = compile_inline_conditionals(file_contents,temporary_nila_file)
 
     return file_contents
@@ -2256,7 +2417,7 @@ def compile(input_file_path,*output_file_name)
 
   end
 
-  def pretty_print_javascript(javascript_file_contents,temporary_nila_file,comments)
+  def pretty_print_javascript(javascript_file_contents,temporary_nila_file)
 
     def reset_tabs(input_file_contents)
 
@@ -2697,6 +2858,26 @@ def compile(input_file_path,*output_file_name)
 
   def compile_operators(input_file_contents)
 
+    def compile_power_operator(input_string)
+
+      matches = input_string.scan(/(\w{1,}\*\*\w{1,})/).to_a.flatten
+
+      unless matches.empty?
+
+        matches.each do |match|
+
+          left,right = match.split("**")
+
+          input_string = input_string.sub(match,"Math.pow(#{left},#{right})")
+
+        end
+
+      end
+
+      return input_string
+
+    end
+
     input_file_contents = input_file_contents.collect {|element| element.sub(" and "," && ")}
 
     input_file_contents = input_file_contents.collect {|element| element.sub(" or "," || ")}
@@ -2707,13 +2888,15 @@ def compile(input_file_path,*output_file_name)
 
     input_file_contents = input_file_contents.collect {|element| element.sub("elsuf","else if")}
 
+    input_file_contents = input_file_contents.collect {|element| compile_power_operator(element)}
+
     return input_file_contents
 
   end
 
-  def pretty_print_nila(input_file_contents)
+  def pretty_print_nila(input_file_contents,temporary_nila_file)
+
 
-    #Implementation is pending
 
   end
 
@@ -2749,6 +2932,8 @@ def compile(input_file_path,*output_file_name)
 
     file_contents = compile_arrays(file_contents)
 
+    file_contents = compile_strings(file_contents)
+
     file_contents = compile_default_values(file_contents,temp_file)
 
     file_contents,named_functions,nested_functions = replace_named_functions(file_contents,temp_file)
@@ -2773,7 +2958,7 @@ def compile(input_file_path,*output_file_name)
 
     file_contents = compile_comments(file_contents,comments,temp_file)
 
-    file_contents = pretty_print_javascript(file_contents,temp_file,comments)
+    file_contents = pretty_print_javascript(file_contents,temp_file)
 
     file_contents = compile_operators(file_contents)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nilac
 version: !ruby/object:Gem::Version
-  version: 0.0.4.1.4
+  version: 0.0.4.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shark
@@ -69,6 +69,8 @@ files:
 - 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/test_files/array_string_indexing.nila
 - shark/test_files/correct.js
@@ -76,21 +78,25 @@ files:
 - shark/test_files/correct_indexing.js
 - shark/test_files/correct_initialization.js
 - shark/test_files/correct_multiple_return.js
+- shark/test_files/correct_operators.js
 - shark/test_files/correct_regular_if.js
 - 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_operators.js
 - shark/test_files/correct_unless_until.js
 - shark/test_files/default_parameters.nila
 - shark/test_files/erratic.nila
 - shark/test_files/multiple_initialization.nila
 - shark/test_files/multiple_return.nila
 - shark/test_files/no_return.nila
+- shark/test_files/operators.nila
 - shark/test_files/perfect.js
 - shark/test_files/regular_if.nila
 - shark/test_files/regular_while.nila
 - shark/test_files/simple.nila
 - shark/test_files/single_return.nila
+- shark/test_files/string_operators.nila
 - shark/test_files/unless_until.nila
 - src/nilac.rb
 homepage: http://adhithyan15.github.com/nila