nilac 0.0.4.1.1 → 0.0.4.1.2

data/bin/nilac

@@ -319,96 +319,107 @@ def compile(input_file_path,*output_file_name)
 
     end
 
-    modified_file_contents = nila_file_contents.dup
+    unless key_word_locations.empty?
 
-    for y in 0...end_locations.length
+      modified_file_contents = nila_file_contents.dup
 
-      current_location = end_locations[y]
+      for y in 0...end_locations.length
 
-      current_string = modified_file_contents[current_location]
+        current_location = end_locations[y]
 
-      finder_location = current_location
+        current_string = modified_file_contents[current_location]
 
-      begin
+        finder_location = current_location
 
-        while current_string.index(nila_regexp) == nil
+        begin
 
-          finder_location -= 1
+          while current_string.index(nila_regexp) == nil
 
-          current_string = modified_file_contents[finder_location]
+            finder_location -= 1
 
-        end
+            current_string = modified_file_contents[finder_location]
+
+          end
 
-        code_block_begin = finder_location
+          code_block_begin = finder_location
 
-        code_block_end = current_location
+          code_block_end = current_location
 
-        start_blocks << code_block_begin
+          start_blocks << code_block_begin
 
-        end_blocks << code_block_end
+          end_blocks << code_block_end
 
-        code_block_begin_string_split = modified_file_contents[code_block_begin].split(" ")
+          code_block_begin_string_split = modified_file_contents[code_block_begin].split(" ")
 
-        code_block_begin_string_split[0] = code_block_begin_string_split[0].reverse
+          code_block_begin_string_split[0] = code_block_begin_string_split[0].reverse
 
-        code_block_begin_string = code_block_begin_string_split.join(" ")
+          code_block_begin_string = code_block_begin_string_split.join(" ")
 
-        modified_file_contents[code_block_begin] = code_block_begin_string
+          modified_file_contents[code_block_begin] = code_block_begin_string
 
-      rescue NoMethodError
+        rescue NoMethodError
 
-        puts "Function compilation failed!"
+          puts "Function compilation failed!"
+
+        end
 
       end
 
-    end
+      final_modified_file_contents = nila_file_contents.dup
 
-    final_modified_file_contents = nila_file_contents.dup
+      joined_file_contents = final_modified_file_contents.join
 
-    joined_file_contents = final_modified_file_contents.join
+      while start_blocks.length != 0
 
-    while start_blocks.length != 0
+        top_most_level = start_blocks.min
 
-      top_most_level = start_blocks.min
+        top_most_level_index = start_blocks.index(top_most_level)
 
-      top_most_level_index = start_blocks.index(top_most_level)
+        matching_level = end_blocks[top_most_level_index]
 
-      matching_level = end_blocks[top_most_level_index]
+        named_code_blocks << extract_array(final_modified_file_contents,top_most_level,matching_level)
 
-      named_code_blocks << extract_array(final_modified_file_contents,top_most_level,matching_level)
+        start_blocks.delete_at(top_most_level_index)
 
-      start_blocks.delete_at(top_most_level_index)
+        end_blocks.delete(matching_level)
 
-      end_blocks.delete(matching_level)
+      end
 
-    end
+      codeblock_counter = 1
 
-    codeblock_counter = 1
+      named_functions = named_code_blocks.dup
 
-    named_functions = named_code_blocks.dup
+      nested_functions = []
 
-    nested_functions = []
+      named_code_blocks.each do |codeblock|
 
-    named_code_blocks.each do |codeblock|
+        if joined_file_contents.include?(codeblock.join)
 
-      if joined_file_contents.include?(codeblock.join)
+          joined_file_contents = joined_file_contents.sub(codeblock.join,"--named_function[#{codeblock_counter}]\n")
 
-        joined_file_contents = joined_file_contents.sub(codeblock.join,"--named_function[#{codeblock_counter}]\n")
+          codeblock_counter += 1
 
-        codeblock_counter += 1
+          nested_functions = nested_functions + [[]]
 
-        nested_functions = nested_functions + [[]]
+        else
 
-      else
+          nested_functions[codeblock_counter-2] << codeblock
 
-        nested_functions[codeblock_counter-2] << codeblock
+          named_functions.delete(codeblock)
 
-        named_functions.delete(codeblock)
+        end
 
       end
 
-    end
+    else
+
+      joined_file_contents = nila_file_contents.join
 
+      named_functions = []
+
+      nested_functions = []
+
+    end
 
     file_id = open(temporary_nila_file, 'w')
 
@@ -557,6 +568,10 @@ def compile(input_file_path,*output_file_name)
 
     variables = []
 
+    input_file_contents = input_file_contents.collect {|element| element.gsub("==","equalequal")}
+
+    input_file_contents = input_file_contents.collect {|element| element.gsub("!=","notequal")}
+
     input_file_contents = input_file_contents.collect {|element| element.gsub("+=","plusequal")}
 
     input_file_contents = input_file_contents.collect {|element| element.gsub("-=","minusequal")}
@@ -623,6 +638,10 @@ def compile(input_file_path,*output_file_name)
 
     line_by_line_contents = line_by_line_contents.collect {|element| element.gsub("modequal","%=")}
 
+    line_by_line_contents = line_by_line_contents.collect {|element| element.gsub("equalequal","==")}
+
+    line_by_line_contents = line_by_line_contents.collect {|element| element.gsub("notequal","!=")}
+
     return variables.uniq,line_by_line_contents
 
   end
@@ -1250,30 +1269,38 @@ def compile(input_file_path,*output_file_name)
 
     joined_file_contents = input_file_contents.join
 
-    codeblock_counter = 1
+    unless named_code_blocks.empty?
 
-    function_names = []
+      codeblock_counter = 1
 
-    named_code_blocks.each do |codeblock|
+      function_names = []
 
-      function_names[codeblock_counter-1] = []
+      named_code_blocks.each do |codeblock|
 
-      joined_file_contents = joined_file_contents.sub("--named_function[#{codeblock_counter}]\n",compile_function(codeblock,temporary_nila_file).join)
+        function_names[codeblock_counter-1] = []
 
-      codeblock_counter += 1
+        joined_file_contents = joined_file_contents.sub("--named_function[#{codeblock_counter}]\n",compile_function(codeblock,temporary_nila_file).join)
+
+        codeblock_counter += 1
 
-      current_nested_functions = nested_functions[codeblock_counter-2]
+        current_nested_functions = nested_functions[codeblock_counter-2]
 
-      function_names[codeblock_counter-2] << extract_function_name(codeblock)
+        function_names[codeblock_counter-2] << extract_function_name(codeblock)
 
-      current_nested_functions.each do |nested_function|
+        current_nested_functions.each do |nested_function|
 
-        function_names[codeblock_counter-2] << extract_function_name(nested_function)
+          function_names[codeblock_counter-2] << extract_function_name(nested_function)
 
-        joined_file_contents = joined_file_contents.sub(nested_function.join,compile_function(nested_function,temporary_nila_file).join)
+          joined_file_contents = joined_file_contents.sub(nested_function.join,compile_function(nested_function,temporary_nila_file).join)
+
+        end
 
       end
 
+    else
+
+      function_names = []
+
     end
 
     file_id = open(temporary_nila_file, 'w')
@@ -1512,7 +1539,7 @@ def compile(input_file_path,*output_file_name)
 
           current_block.each_with_index do |line,index|
 
-            if line.lstrip.eql? "end\n"
+            if line.strip.eql? "end"
 
               end_counter += 1
 
@@ -1556,7 +1583,7 @@ def compile(input_file_path,*output_file_name)
 
               current_block.each_with_index do |line,index|
 
-                if line.lstrip.eql? "end\n"
+                if line.strip.eql? "end"
 
                   end_counter += 1
 
@@ -1578,6 +1605,32 @@ def compile(input_file_path,*output_file_name)
 
       def compile_if_syntax(input_block)
 
+        strings = []
+
+        string_counter = 0
+
+        modified_input_block = input_block.dup
+
+        input_block.each_with_index do |line,index|
+
+          if line.include?("\"")
+
+            opening_quotes = line.index("\"")
+
+            string_extract = line[opening_quotes..line.index("\"",opening_quotes+1)]
+
+            strings << string_extract
+
+            modified_input_block[index] = modified_input_block[index].sub(string_extract,"--string{#{string_counter}}")
+
+            string_counter += 1
+
+          end
+
+        end
+
+        input_block = modified_input_block
+
         starting_line = input_block[0]
 
         starting_line = starting_line + "\n" if starting_line.lstrip == starting_line
@@ -1606,7 +1659,23 @@ def compile(input_file_path,*output_file_name)
 
         end
 
-        return input_block
+        modified_input_block = input_block.dup
+
+        input_block.each_with_index do |line,index|
+
+          if line.include?("--string{")
+
+            junk,remains = line.split("--string{")
+
+            string_index,junk = remains.split("}")
+
+            modified_input_block[index] = modified_input_block[index].sub("--string{#{string_index.strip}}",strings[string_index.strip.to_i])
+
+          end
+
+        end
+
+        return modified_input_block
 
       end
 
@@ -2440,7 +2509,7 @@ def find_file_path(input_path,file_extension)
 
 end
 
-nilac_version = "0.0.4.1"
+nilac_version = "0.0.4.1.2"
 
 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.1"
+  VERSION = "0.0.4.1.2"
 end

data/src/nilac.rb

@@ -2507,7 +2507,7 @@ def find_file_path(input_path,file_extension)
 
 end
 
-nilac_version = "0.0.4.1.1"
+nilac_version = "0.0.4.1.2"
 
 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.1
+  version: 0.0.4.1.2
   prerelease: 
 platform: ruby
 authors: