alphalang 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb11af78d1a68ee1f2a5aaba719040996f435be0183e690bea2532a7fce80201
-  data.tar.gz: 0f5a33e46b3fa611bab83528e90c481e5ba4ec1a480808a1bc7551fc25b90e4e
+  metadata.gz: 1c31a662b58f22db4c35e2e784739c0c0def7b9ccef89ad3f06292581dfdf28d
+  data.tar.gz: bc02c5bfcdac5985367a5c722b88b01a4d95d35c973dcb6e61d1a05c66de23e2
 SHA512:
-  metadata.gz: 7411738e5cd015019a137324144b4a735f3e195263cc23ddf1301ecc2a3803be9ede4d28cc4f84403cb6547bc8dc6c75cf9ee59e307ef22d692632daa1439b58
-  data.tar.gz: b9ebbb5a83f4a2fb5f547754e7458e0de1249ff0e15fa79a293c5d56727d68237b6ff2de9d9b9be08866440dd5195f1eeff777b11eda23606a05c6b62941c54f
+  metadata.gz: 7c104ae659e875f33f9b3d9ac8f358613feab8dfe56b2b166b580626994a9089c8e6ecdb307cee7b8d64e80ba0e1b63f7be7380360cf427bc18e0eb34469d966
+  data.tar.gz: 30f09cb6a7a6c914b0be2d84a50cd88495e482fdec29c06c49fc8d2d9bd306795a86cf26d08065b6d0da8b0b0a8458fa06cc664694c72fe546abd6f1e3adbb41

data/bin/alphalang

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 require 'optparse'
 require File.expand_path('../lib/alpha', __dir__)
-ALPHA_VER = '0.1.2'.freeze
+ALPHA_VER = '0.1.3'.freeze
+ABORT_ANSWERS = [' ', '', 'none', 'abort'].freeze # something here? Some cases empty means yes tho..
 
 basic_error_msg = "Usage: alphalang [options] file.alpha\nUsage: alphalang -h for the help menu."
 
@@ -21,22 +22,55 @@ OptionParser.new do |opts|
     options[:lang] = lang
   end
 
-  opts.on('--createlocale', 'Creates a new locale-file for all program keywords available.') do
+  opts.on('--createlocale', 'Creates a new locale file for all program keywords available.') do
     options[:createlocale] = true
   end
+
+  opts.on('--deletelocale', 'Deletes a locale file from your locales directory.') do
+    options[:deletelocale] = true
+  end
+
+  opts.on('--listlocales', 'Lists all available locale files from your locales directory.') do
+    options[:listlocales] = true
+  end
+
+  opts.on('--listlocale', 'Lists all keywords from a specific locale file from your locales directory.') do
+    options[:listlocale] = true
+  end
 end.parse!
 
 verbose = options[:verbose]
 verify = options[:verify]
 language = options[:lang] || 'en'
-createlocale = options[:createlocale]
+create_locale_flag = options[:createlocale]
+delete_locale_flag = options[:deletelocale]
+list_locales_flag = options[:listlocales]
+list_locale_flag = options[:listlocale]
 
-if createlocale
+if create_locale_flag
   require_relative '../lib/lang_creator'
   create_locale_file
   return
 end
 
+if delete_locale_flag
+  require_relative '../lib/locale_deleter'
+  delete_locale_file
+  return
+end
+
+if list_locales_flag
+  require_relative '../lib/locale_lister'
+  list_locale_files
+  return
+end
+
+if list_locale_flag
+  require_relative '../lib/locale_lister'
+  list_specific_locale_file
+  return
+end
+
 raise OptionParser::MissingArgument, "No file provided.
 Usage: alphalang my_file.alpha | alphalang -h" if ARGV.empty? unless verify
 raise OptionParser::InvalidArgument, 'Too many files provided.
@@ -50,7 +84,7 @@ else
 end
 
 if verify
-  if !ARGV.empty?
+  unless ARGV.empty?
     puts 'Flag for verification found. Ignoring input file.'
     sleep 1
   end

data/lib/alpha.rb

@@ -1,7 +1,8 @@
 require_relative './nodes/stmtnodes'
 
 class LangParser
-  def initialize(locale='en')
+  def initialize(locale = 'en')
+    ScopeManager.new
     @langParser = Parser.new('lang parser', locale) do
       token(/while/) { |_| :WHILE }
       token(/print/) { |_| :PRINT }
@@ -81,11 +82,6 @@ class LangParser
         match(:member, '=', :array_stmt) { |var, _, value| VariableDecNode.new(var, value) }
       end
 
-      #array inte klar kan assigna till vaiabel men inte kolla upp än
-      rule :array_stmt do
-        match('[', :arg_list, ']') { |_, array, _| array }
-      end
-
       rule :pause_stmt do
         match(:PAUSE, :expr) { |_, a| PauseNode.new(a) }
       end
@@ -109,6 +105,15 @@ class LangParser
         match(:NOT, :expr_stmt) { |_, b| NotNode.new(b) }
       end
 
+      rule :array_stmt do
+        match('[', :arg_list, ']') { |_, array, _| array }
+      end
+
+      rule :arg_list do
+        match(:expr, ',', :arg_list) { |a, _, b| ArrayNode.new(a, b) }
+        match(:expr) { |a| ArrayNode.new(a, NilClass) }
+      end
+
       rule :expr do
         match(:expr, /(<|>)/, :expr) { |a, op, b| CompareNode.new(a, op, b) }
         match(/(<|>)/, :expr) { |op, b| CompareNode.new(nil, op, b) }
@@ -141,14 +146,11 @@ class LangParser
       rule :member do
         match(/[a-z]/, '(', :arg_list, ')') { |var, _, args, _| FuncCallNode.new(var, args) }
         match(/[a-z]/, '(', ')') { |var, _, _| FuncCallNode.new(var, NilClass) }
+        match(/[a-z]/, '[', '-', /\d+/, ']') { |var, _, neg, index, _| ArrayCallNode.new(var, (neg+index)) }
+        match(/[a-z]/, '[', /\d+/, ']') { |var, _, index, _| ArrayCallNode.new(var, index) }
         match(/[a-z]/) { |var| VariableCallNode.new(var) }
       end
 
-      rule :arg_list do
-        match(:expr, ',', :arg_list) { |a, _, b| ArrayNode.new(a, b) }
-        match(:expr) { |a| ArrayNode.new(a, NilClass) }
-      end
-
       rule :prio_stmt do
         match('(', :stmt, ')') { |_, a, _| a }
       end

data/lib/locale_deleter.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+
+def prompt_user_for_deletion(locales, install_path, protected_paths)
+  puts 'Which locale would you like to delete?:                    RET or "none" to abort'
+
+  locales.each do |locale|
+    puts locale
+  end
+
+  locale_file = gets.chomp
+
+  return if ABORT_ANSWERS.include?(locale_file)
+
+  if protected_paths.include?(locale_file)
+    puts 'You may not delete a default locale.'
+    return
+  else
+    File.delete("#{install_path}/#{locale_file}")
+    puts "Successfully deleted #{install_path}/#{locale_file}"
+  end
+end
+
+def delete_locale_file()
+  locale_path = File.join(__dir__, 'locales')
+  protected_locales = ['.', '..', 'locale_template', 'en', 'sv', 'de']
+
+  imported_locales = Dir.entries(locale_path).reject { |entry| protected_locales.include?(entry) }
+
+  if imported_locales.empty?
+    puts '[alphalang] There are no locale files to delete. Default locale files are protected.'
+    return
+  else
+    prompt_user_for_deletion(imported_locales, locale_path, protected_locales)
+  end
+end

data/lib/locale_lister.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+
+# extra_entries_array in case we wanna make a "protected locale" function later on
+def get_locale_files(extra_entries_array = [])
+  locale_path = File.join(__dir__, 'locales')
+  protected_locales = ['.', '..', 'locale_template', extra_entries_array].flatten
+  Dir.entries(locale_path).reject { |entry| protected_locales.include?(entry) }
+end
+
+def list_locale_files()
+  locales = get_locale_files
+  puts '[alphalang] These are the available locales.'
+  locales.each do |locale|
+    puts locale
+  end
+  puts
+end
+
+def list_specific_locale_file()
+  list_locale_files
+  specific_locale = gets.chomp
+
+  return if ABORT_ANSWERS.include?(specific_locale)
+
+  locale_path = File.join(__dir__, 'locales')
+  locale_file = File.readlines("#{locale_path}/#{specific_locale}")
+
+  clean_locale_file_array = []
+  locale_file.each do |line|
+    line.scan(/\b\p{L}+\b/) do |word|
+      clean_locale_file_array << word if word.size > 1
+    end
+  end
+
+  header = "\n[alphalang] Syntax for locale <#{specific_locale}>."
+  puts header
+  puts '+' * (header.size - 2)
+  clean_line = ''
+  clean_locale_file_array.each_with_index do |word, index|
+    if index.even?
+      clean_line += "+        #{word}"
+    else
+      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

data/lib/nodes/basenodes.rb

@@ -1,9 +1,4 @@
 #!/usr/bin/env ruby
-####################################################
-
-$scopes = [{}]
-$scope_lvl = 0
-$test_nodes = false
 
 ####################################################
 

data/lib/nodes/stmtnodes.rb

@@ -1,26 +1,65 @@
 require_relative 'basenodes'
 
 ####################################################
-class VariableCallNode < Node
-  attr_accessor :name
 
-  def initialize(name)
-    @name = name
+$scopes = [{}]
+$scope_lvl = 0
+$test_nodes = false
+
+# Need to expand this to actually handle scopes, not just lookups
+class ScopeManager
+  def self.scope_lvl
+    $scope_lvl
   end
 
-  def lookup_var(name)
+  def self.lookup_var(name)
     temp_scope_lvl = $scope_lvl
     while temp_scope_lvl >= 0
-      if not $scopes[temp_scope_lvl].has_key?(name)
+      if !$scopes[temp_scope_lvl].key?(name)
         temp_scope_lvl -= 1
       else
         return $scopes[temp_scope_lvl][name]
       end
     end
+    raise ArgumentError, "Variable '#{name}' is not defined" unless @value
+  end
+
+  def self.increment_scope_level
+    $scope_lvl += 1
+    $scopes.push({})
+  end
+
+  def self.decrement_scope_level
+    $scope_lvl -= 1
+    $scopes.pop
+  end
+
+  def self.lookup_func(name)
+    raise ArgumentError, "Function '#{name}' is not defined" if $scopes[0][name].is_a?(NilClass)
+    return $scopes[0][name]
+  end
+
+  def self.add_to_current_scope(name, value)
+    $scopes[$scope_lvl][name.name] = value.evaluate
+  end
+
+  def self.add_func_to_global_scope(name, value, args)
+    $scopes[0][name.name] = [value, args]
+  end
+end
+
+####################################################
+
+class VariableCallNode < Node
+  attr_accessor :name
+
+  def initialize(name)
+    @name = name
   end
 
   def evaluate
-    return @value = lookup_var(@name)
+    @value = ScopeManager.lookup_var(@name)
+    return @value
   end
 end
 
@@ -33,9 +72,8 @@ class VariableDecNode < Node
   end
 
   def evaluate
-    $scopes[$scope_lvl][@name.name] = @value.evaluate
+    ScopeManager.add_to_current_scope(name, @value)
     self
-    # return nil
   end
 end
 
@@ -49,7 +87,7 @@ class FunctionDecNode < Node
   end
 
   def evaluate
-    $scopes[0][@name.name] = [@value, @args]
+    ScopeManager.add_func_to_global_scope(@name, @value, @args)
     return nil
   end
 end
@@ -62,19 +100,13 @@ class FuncCallNode < Node
     @args = args
   end
 
-  def lookup_var(name)
-    return $scopes[0][name]
-  end
-
   def evaluate
-    $scopes.push({})
-    func = lookup_var(@name)
+    func = ScopeManager.lookup_func(@name)
+
     function_body = func[0]
     function_param = func[1]
 
-    return nil if func.is_a?(NilClass)
-
-    $scope_lvl += 1
+    ScopeManager.increment_scope_level
 
     if function_param.is_a?(ArrayNode)
       function_param.each do |val, index|
@@ -83,18 +115,18 @@ class FuncCallNode < Node
       end
     end
 
-    func_result = function_body.evaluate
-    old_scope_lvl = $scope_lvl
-    # Om en assign är returnvärde så declareras variablen i globalt scope
-    if func_result.is_a?(VariableDecNode)
-      $scope_lvl = 0
-      func_result.evaluate
-      $scope_lvl = old_scope_lvl
-    end
+    func_return_value = function_body.evaluate
 
-    $scope_lvl -= 1
-    $scopes.pop
-    return func_result
+    ScopeManager.decrement_scope_level
+
+    # If function return value is an "Assign" then we declare that variable in the global scope.
+    old_scope_lvl = ScopeManager.scope_lvl
+    if func_return_value.is_a?(VariableDecNode)
+      ScopeManager.scope_lvl = 0
+      func_return_value.evaluate
+      ScopeManager.scope_lvl = old_scope_lvl
+    end
+    return func_return_value
   end
 end
 
@@ -176,6 +208,23 @@ 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
+
+####################################################
+
 class PrintNode
   attr_accessor :value
 
@@ -185,7 +234,7 @@ class PrintNode
 
   def evaluate
     puts @value.evaluate
-    self.class # detta kanske är trevligare än nil, åter igen den diskussionen.
+    self.class
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alphalang
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - mattias
@@ -61,6 +61,10 @@ files:
 - bin/alphalang
 - lib/alpha.rb
 - lib/lang_creator.rb
+- lib/locale_deleter.rb
+- lib/locale_deleter.rb~
+- lib/locale_lister.rb
+- lib/locale_lister.rb~
 - lib/locales/de
 - lib/locales/en
 - lib/locales/locale_template