alphalang 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dbe6c0cb099f96c68feadb26492b409cdb71d2db52fd5e6436a6c142d273584
-  data.tar.gz: 215b6ea3d011610dbdb3d2021025c29361df8d6cc4dba74a7a8dabf0d7596fdb
+  metadata.gz: 03e9f2d6c36766c890ac954b41a9bf02f2fe70e1f4ac4a3d40843ff03c228b28
+  data.tar.gz: bd5b500b199a1e32964a311847a28f39ca3b6059c2f06e0e8fcbd608106a641a
 SHA512:
-  metadata.gz: c99ce78b496f2eb91ddb26c799fe51e18e5fb0f2d23d546fcadff0cc7a293c28af455ecad577d43b1e9c4e156f781d17b9ba4b4f7f856861158b68301c23ef77
-  data.tar.gz: d6fd552131866752356ce35a82c1ce032dc1863597b1ba618e9f9924fc1d9c2c86a8e595fe64358757156150125ba937350bd422e5818f77f453be9be0882a1a
+  metadata.gz: 9ad4f5de676ecdd7afc6d630c4a3934aba3d45623a8b45e19196574b7453641b077c5c5ac3a2d1c4edad06cacfaa17b28d7abf778fd894c7c4494c01a9d56654
+  data.tar.gz: 39f631c8dff1ecd6879786cee70656cb6c6b018db070d49d8c7e5cc6fccf8de018ba0ccf0608cdf11c00670f36d63eb2dcce5780c4cd2122b5b0a4cbc6e1ab9a

data/bin/alphalang

@@ -56,7 +56,7 @@ list_locales_flag = options[:listlocales]
 list_locale_flag = options[:listlocale]
 
 if create_locale_flag
-  require_relative '../lib/lang_creator'
+  require_relative '../lib/locale_creator'
   create_locale_file
   return
 end
@@ -104,7 +104,9 @@ if verify_flag
     puts 'Flag for verification found. Ignoring input file.'
     sleep 1
   end
+  TEST_UNIT_ACTIVE = true
   require_relative '../lib/tester/test_unit'
 else
+  TEST_UNIT_ACTIVE = false
   LangParser.new(language_flag, verbose_flag).parse_file(ARGV[0])
 end

data/lib/locale_defaulter.rb

@@ -5,11 +5,15 @@ require_relative 'locale_lister'
 def set_default_locale(new_locale)
   available_locales = get_locale_files
 
-  available_locales.each do |locale|
-    if locale == new_locale
-      File.open("#{LOCALES_PATH}/default", 'w') { |f| f.write(new_locale)}
-      puts "[alphalang] Default syntax locale is now set to #{locale}."
-      return
+  available_locales.each do |available_locale|
+    if available_locale == new_locale
+      begin
+        File.open("#{LOCALES_PATH}/default", 'w') { |f| f.write(new_locale) }
+        puts "[alphalang] Default syntax locale is now set to #{new_locale}."
+      rescue Errno::ENOENT
+        puts '[alphalang] Failed to change default locale. Likely permissions error on your machine.'
+        puts "Could not open #{LOCALES_PATH}/default}"
+      end
     end
   end
 end

data/lib/locale_lister.rb

@@ -30,22 +30,24 @@ end
 
 def print_clean_locale_array(locale_name, clean_array)
   longest_word = clean_array.max_by(&:length).size
-  padding = ' ' * (longest_word/2-5)
+  padding = ' ' * (longest_word / 2 - 5)
 
   header = "#{padding}[alphalang] Syntax for locale <#{locale_name}>.#{padding}"
   puts header
   puts '+' * (header.size - 2)
+
   clean_line = ''
   clean_array.each_with_index do |word, index|
     if index.even?
       clean_line += "+ #{word}"
     else
-      clean_line += (' ' * (20 -clean_line.size)) + "#{word}"
+      clean_line += (' ' * (20 - clean_line.size)) + "#{word}"
       clean_line += (' ' * (header.size - clean_line.size - 3) + '+')
       puts clean_line
       clean_line = ''
     end
   end
+
   puts '+' * (header.size - 2)
 end
 
@@ -53,9 +55,7 @@ def list_specific_locale_file()
   list_locale_files
   specific_locale = gets.chomp
 
-  if specific_locale == 'default'
-    specific_locale = File.read("#{LOCALES_PATH}/#{specific_locale}")
-  end
+  specific_locale = File.read("#{LOCALES_PATH}/#{specific_locale}") if specific_locale == 'default'
 
   return if ABORT_ANSWERS.include?(specific_locale)
 

data/lib/nodes/basenodes.rb

@@ -1,6 +1,4 @@
-#!/usr/bin/env ruby
-
-####################################################
+###################### Base Nodes
 
 class Node
   attr_accessor :value
@@ -43,6 +41,8 @@ class BoolNode < Node
   end
 end
 
+###################### Logic Gate Nodes
+
 class AndNode < Node
   def initialize(lhs, rhs)
     @lhs, @rhs = lhs, rhs
@@ -83,7 +83,7 @@ class NotNode < Node
   end
 end
 
-####################################################
+###################### Operation Nodes
 
 class CompareNode < Node
   attr_accessor :lhs, :op, :rhs
@@ -119,7 +119,7 @@ class BinaryOperationNode < Node
     end
 
     if @rhs.evaluate.is_a?(ArrayNode) or @rhs.evaluate.is_a?(Array) and @lhs.evaluate.is_a?(Numeric)
-      raise SyntaxError, "You can't subtract and array from a number! #{@lhs.evaluate} #{@op} #{@rhs.name}"
+      raise SyntaxError, "You can't subtract an array from a number! #{@lhs.evaluate} #{@op} #{@rhs.name}"
     end
 
     if @op == '/'
@@ -130,21 +130,7 @@ class BinaryOperationNode < Node
   end
 end
 
-####################################################
-
-class CompStmtNode < Node
-  def initialize(stmt_compstmt)
-    super
-    @comp_statements = stmt_compstmt
-  end
-
-  def evaluate
-    @comp_statements[0].evaluate
-    @comp_statements[1].evaluate
-  end
-end
-
-####################################################
+###################### Array / Data Structure Nodes
 
 class ArrayNode < Node
   attr_accessor :lhs, :rhs
@@ -205,3 +191,17 @@ class ArrayNode < Node
     self
   end
 end
+
+###################### Root Program Node
+
+class CompStmtNode < Node
+  def initialize(stmt_compstmt)
+    super
+    @comp_statements = stmt_compstmt
+  end
+
+  def evaluate
+    @comp_statements[0].evaluate
+    @comp_statements[1].evaluate
+  end
+end

data/lib/nodes/scopemanager.rb

@@ -2,8 +2,6 @@ require_relative 'stmtnodes'
 
 ####################################################
 
-$test_nodes = false
-
 class ScopeManager
   def initialize(true_value, false_value)
     @@true_value = true_value

data/lib/nodes/stmtnodes.rb

@@ -1,6 +1,6 @@
 require_relative 'basenodes'
 
-####################################################
+###################### Variable Nodes
 
 class VariableCallNode < Node
   attr_accessor :name
@@ -29,7 +29,22 @@ class VariableDecNode < Node
   end
 end
 
-####################################################
+class ArrayCallNode < Node
+  def initialize(array, index)
+    super(array)
+    @index = index.to_i
+  end
+
+  def evaluate
+    arr = ScopeManager.lookup_var(@value)
+    if @index > arr.size - 1
+      raise ArgumentError, "You are trying to access an out of bounds index. Here -> #{@value}[#{@index}]"
+    end
+    @value = arr[@index]
+  end
+end
+
+###################### Function Nodes
 
 class FunctionDecNode < Node
   def initialize(node, value)
@@ -84,7 +99,7 @@ class FuncCallNode < Node
   end
 end
 
-####################################################
+###################### If Statement Nodes
 
 class IfNode < Node
   attr_accessor :argument
@@ -138,7 +153,7 @@ class IfCompStmtNode < Node
   end
 end
 
-####################################################
+###################### Loop Nodes
 
 class WhileLoopNode < Node
   attr_accessor :condition
@@ -156,24 +171,7 @@ class WhileLoopNode < Node
   end
 end
 
-####################################################
-
-class ArrayCallNode < Node
-  def initialize(array, index)
-    super(array)
-    @index = index.to_i
-  end
-
-  def evaluate
-    arr = ScopeManager.lookup_var(@value)
-    if @index > arr.size - 1
-      raise ArgumentError, "You are trying to access an out of bounds index. Here -> #{@value}[#{@index}]"
-    end
-    @value = arr[@index]
-  end
-end
-
-####################################################
+###################### Built-in Functions
 
 class PrintNode
   attr_accessor :value
@@ -184,11 +182,11 @@ class PrintNode
 
   def evaluate
     if @value.evaluate.is_a?(ArrayNode)
-      print "Array #{@value.name}: "
-      puts @value.evaluate
+      print "Array #{@value.name}: "     unless TEST_UNIT_ACTIVE
+      puts @value.evaluate               unless TEST_UNIT_ACTIVE
     elsif @value.evaluate.is_a?(Array)
-      print "Array #{@value.name}: "
-      puts @value.evaluate.join(', ')
+      print "Array #{@value.name}: "     unless TEST_UNIT_ACTIVE
+      puts @value.evaluate.join(', ')    unless TEST_UNIT_ACTIVE
     else
       if @value.evaluate == PrintNode
         if @value.value.is_a?(VariableCallNode)
@@ -197,7 +195,7 @@ class PrintNode
           raise SyntaxError, "You have a duplicate 'print' statement! Printing #{@value.value} twice."
         end
       end
-      puts @value.evaluate
+      puts @value.evaluate              unless TEST_UNIT_ACTIVE
     end
     self.class
   end

data/lib/tester/assign.alpha

@@ -0,0 +1,14 @@
+x = 1
+
+def foo(bar)
+  y = 0
+  while bar < 20
+    print bar
+    bar = bar + 1
+    y = bar
+  end
+  print y
+  y
+end
+
+foo(x)

data/lib/tester/assign.alpha~

@@ -0,0 +1,5 @@
+x = 1
+
+def foo(bar)
+  y = bar
+end

data/lib/tester/fibonacci.alpha

@@ -1,7 +1,17 @@
 a = 1
 b = 1
-print b
+
 def fib(x)
+  if 2 < x
+
+    temp = a + b
+    a = b
+    b = temp
+
+    fib(x - 1)
+  else
+    b
+  end
 end
 
-fib(100)
+print fib(11)

data/lib/tester/test_unit.rb

@@ -239,3 +239,64 @@ class TesCompactIf < Test::Unit::TestCase
                                               #{$end}"))
   end
 end
+
+class TestPrograms < Test::Unit::TestCase
+  def test_fibonacci
+    program = "
+a = 1
+b = 1
+
+#{$def} fib(x)
+  #{$if} 2 < x
+
+    temp = a + b
+    a = b
+    b = temp
+
+    fib(x - 1)
+  #{$else}
+    b
+  #{$end}
+#{$end}
+
+fib(11)
+"
+    assert_equal(89, LangParser.new.calc_test(program))
+  end
+
+  def test_func_with_while
+    program = "
+x = 1
+
+#{$def} foo(bar)
+  #{$while} bar < 20
+    #{$print} bar
+    bar = bar + 1
+  #{$end}
+#{$end}
+
+foo(x)
+"
+    assert_equal(WhileLoopNode, LangParser.new.calc_test(program))
+  end
+
+  def test_func_with_while_return_value
+    program = "
+x = 1
+
+#{$def} foo(bar)
+  y = 0
+  #{$while} bar < 20
+    #{$print} bar
+    bar = bar + 1
+    y = bar
+  #{$end}
+  #{$print} y
+  y
+#{$end}
+
+foo(x)
+"
+    assert_equal(20, LangParser.new.calc_test(program))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alphalang
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - mattias, victor
@@ -60,7 +60,7 @@ extra_rdoc_files: []
 files:
 - bin/alphalang
 - lib/alpha.rb
-- lib/lang_creator.rb
+- lib/locale_creator.rb
 - lib/locale_defaulter.rb
 - lib/locale_deleter.rb
 - lib/locale_lister.rb
@@ -74,6 +74,8 @@ files:
 - lib/nodes/scopemanager.rb
 - lib/nodes/stmtnodes.rb
 - lib/rdparse.rb
+- lib/tester/assign.alpha
+- lib/tester/assign.alpha~
 - lib/tester/demo_de.alpha
 - lib/tester/demo_emoji.alpha
 - lib/tester/demo_emoji.alpha~