nilac 0.0.3.9 → 0.0.4.0

data/lib/nilac/version.rb

@@ -1,3 +1,3 @@
 module Nilac
-  VERSION = "0.0.3.9"
+  VERSION = "0.0.4.0"
 end

data/shark/features/default_method_parameters.feature

@@ -0,0 +1,12 @@
+Feature: Javascript,by default,doesn't allow for the usage of default parameters for functions. So this
+feature addresses that issue.  
+  Scenario: Input function with default parameters
+    Given the input file "default_parameters.nila"
+    When the ~compiler is run
+    The output file must be "default_parameters.js"
+    The output file must equal "correct_default_parameters.js"
+
+Configurations:
+
+~compiler => src/nilac.rb
+:v $cliusage => ruby :v --compile $file

data/shark/test_files/correct_default_parameters.js

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

data/shark/test_files/correct_multiple_return.js

@@ -5,9 +5,11 @@
   // This method demonstrates multiple return values
 
   function parse_name(input_name) {
-    var name_split;
-    name_split = input_name.split(" ");
-    return [name_split[0],name_split[1]];
+    var multipleinit1, first_name, last_name;
+    multipleinit1 = input_name.split(" ");
+    first_name = multipleinit1[0];
+    last_name = multipleinit1[1];
+    return [first_name,last_name];
   }
 
   function test_method() {

data/shark/test_files/default_parameters.nila

@@ -0,0 +1,11 @@
+# This is a demo of default parameters
+
+def fill(container,liquid = "coffee")
+
+  puts "Filling #{container} with #{liquid}"
+
+end
+
+fill("cup")
+
+fill("bowl","soup")

data/shark/test_files/multiple_return.nila

@@ -2,9 +2,9 @@
 
 def parse_name(input_name)
 
-  name_split = input_name.split(" ")
+  first_name,last_name = input_name.split(" ")
 
-  return name_split[0],name_split[1]
+  return first_name,last_name
 
 end
 

data/src/nilac.rb

@@ -466,6 +466,84 @@ def compile(input_file_path,*output_file_name)
 
   end
 
+  def compile_default_values(input_file_contents,temporary_nila_file)
+
+    #This method compiles default values present in functions. An example is provided below
+
+    # def fill(container = "cup",liquid = "coffee")
+    #   puts "Filling the #{container} with #{liquid}"
+    # end
+
+    def parse_default_values(input_function_definition)
+
+      puts input_function_definition
+
+      split1,split2 = input_function_definition.split("(")
+
+      split2,split3 = split2.split(")")
+
+      function_parameters = split2.split(",")
+
+      default_value_parameters = function_parameters.reject {|element| !element.include?"="}
+
+      replacement_parameters = []
+
+      replacement_string = ""
+
+      default_value_parameters.each do |paramvalue|
+
+        param, value = paramvalue.split("=")
+
+        replacement_parameters << param.lstrip.rstrip
+
+        replacement_string = replacement_string + "\n" + "if (#{param.lstrip.rstrip} == null) {\n  #{paramvalue.lstrip.rstrip}\n}\n" +"\n"
+
+      end
+
+      return replacement_string,default_value_parameters,replacement_parameters
+
+    end
+
+    possible_default_values = input_file_contents.dup.reject {|element| !element.include?("def")}
+
+    possible_default_values = possible_default_values.reject {|element| !element.include?("=")}
+
+    if !possible_default_values.empty?
+
+      possible_default_values.each do |line|
+
+        current_line_index = input_file_contents.each_index.select {|index| input_file_contents[index] == line}.flatten[0]
+
+        replacement_string,value_parameters,replacement_parameters = parse_default_values(line)
+
+        modified_line = line.dup
+
+        value_parameters.each_with_index do |val,index|
+
+          modified_line = modified_line.sub(val,replacement_parameters[index])
+
+        end
+
+        input_file_contents[current_line_index] = modified_line
+
+        input_file_contents[current_line_index + 1] = replacement_string
+
+      end
+
+    end
+
+    file_id = open(temporary_nila_file, 'w')
+
+    file_id.write(input_file_contents.join)
+
+    file_id.close()
+
+    line_by_line_contents = read_file_line_by_line(temporary_nila_file)
+
+    return line_by_line_contents
+
+  end
+
   def get_variables(input_file_contents,temporary_nila_file)
 
     #This method is solely focused on getting a list of variables to be declared.
@@ -820,11 +898,19 @@ def compile(input_file_path,*output_file_name)
       #This method will pickup and declare all the variables inside a function block. In future, this method will be
       #merged with the get variables method
 
+      controlregexp = /(if |while |def |function |function\()/
+
       variables = []
 
+      function_name,parameters = input_function_block[0].split("(")
+
+      parameters = parameters.split(")")[0].split(",")
+
+      parameters = parameters.collect {|element| element.strip}
+
       input_function_block.each do |line|
 
-        if line.include? "=" and !line.include?("def")
+        if line.include? "=" and line.index(controlregexp).nil?
 
           current_line_split = line.strip.split("=")
 
@@ -834,7 +920,25 @@ def compile(input_file_path,*output_file_name)
 
       end
 
-      variables.uniq
+      parameters.each do |param|
+
+        if variables.include?(param)
+
+          variables.delete(param)
+
+        end
+
+      end
+
+      if variables.empty?
+
+        return []
+
+      else
+
+        return variables.uniq
+
+      end
 
     end
 
@@ -1078,6 +1182,8 @@ def compile(input_file_path,*output_file_name)
 
       modified_input_array[-1] = input_array[-1].sub "end","}\n"
 
+      modified_input_array = compile_multiple_variable_initialization(modified_input_array,temporary_nila_file)
+
       variables = lexical_scoped_variables(modified_input_array)
 
       if !variables.empty?
@@ -1824,6 +1930,8 @@ def compile(input_file_path,*output_file_name)
 
     file_contents = compile_arrays(file_contents)
 
+    file_contents = compile_default_values(file_contents,temp_file)
+
     file_contents,named_functions,nested_functions = replace_named_functions(file_contents,temp_file)
 
     comments = [singleline_comments,multiline_comments]
@@ -1918,7 +2026,7 @@ def find_file_path(input_path,file_extension)
 
 end
 
-nilac_version = "0.0.3.9"
+nilac_version = "0.0.4.0"
 
 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.3.9
+  version: 0.0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shark
@@ -65,22 +65,24 @@ files:
 - shark/features/add_auto_return_statement.feature
 - shark/features/array_and_string_indexing.feature
 - shark/features/barebones_compilation.feature
+- shark/features/default_method_parameters.feature
 - shark/features/fix_newlines.feature
 - shark/features/method_multiple_return.feature
 - shark/features/multiple_variable_initialization.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_multiple_return.js
 - shark/test_files/correct_return.js
 - shark/test_files/correct_single_return.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/perfect.js
-- shark/test_files/regular_if.nila
 - shark/test_files/simple.nila
 - shark/test_files/single_return.nila
 - src/nilac.rb

data/shark/test_files/regular_if.nila

@@ -1,8 +0,0 @@
-#This is a simple if statement
-
-if happy and knowsIt
-  clapsHands()
-  chaChaCha()
-else
-  showIt()
-end