alphalang 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c31a662b58f22db4c35e2e784739c0c0def7b9ccef89ad3f06292581dfdf28d
-  data.tar.gz: bc02c5bfcdac5985367a5c722b88b01a4d95d35c973dcb6e61d1a05c66de23e2
+  metadata.gz: c9d0971b25f1f629686a4ca72899a014ab9dd0934b3021e1509faa46870e79fc
+  data.tar.gz: 7ff3c836669793b4b58deea30bd8e8c485ca7ce9465ab3ac6ef490b8a7508d04
 SHA512:
-  metadata.gz: 7c104ae659e875f33f9b3d9ac8f358613feab8dfe56b2b166b580626994a9089c8e6ecdb307cee7b8d64e80ba0e1b63f7be7380360cf427bc18e0eb34469d966
-  data.tar.gz: 30f09cb6a7a6c914b0be2d84a50cd88495e482fdec29c06c49fc8d2d9bd306795a86cf26d08065b6d0da8b0b0a8458fa06cc664694c72fe546abd6f1e3adbb41
+  metadata.gz: 7a44e1156d6e59488c1891af9eaa3d9a304ddd812b54ad44656762d169d84a2c1df057a8030654aea52c791037dfc1620a551b0e72b4f8882b20ea8d9c45edc2
+  data.tar.gz: 1459484c62af5206acf1d9e657f25fae40cc8adfbb36838c59e1a37434034be283bdb48fbe4efb820eb0c6cb779e2a933925d4cbcc35796769df56e0bcce5f20

data/bin/alphalang

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 require 'optparse'
 require File.expand_path('../lib/alpha', __dir__)
-ALPHA_VER = '0.1.3'.freeze
+ALPHA_VER = '0.1.5'.freeze
 ABORT_ANSWERS = [' ', '', 'none', 'abort'].freeze # something here? Some cases empty means yes tho..
+LOCALES_PATH = File.join(__dir__, '../lib/locales')
+PROTECTED_LOCALES = ['.', '..', 'locale_template', 'default', 'default.old', 'en', 'sv', 'de'].freeze
 
 basic_error_msg = "Usage: alphalang [options] file.alpha\nUsage: alphalang -h for the help menu."
 
@@ -18,8 +20,12 @@ OptionParser.new do |opts|
     options[:verify] = true
   end
 
-  opts.on('--lang=LOCALE', 'Set the locale language for all program keywords. Available: en, sv, de') do |lang|
-    options[:lang] = lang
+  opts.on('--locale=LOCALE', 'Set the syntax locale for current program keywords.') do |locale|
+    options[:locale] = locale
+  end
+
+  opts.on('--setlocale=LOCALE', 'Set the default syntax locale for all program keywords.') do |new_locale|
+    options[:defaultlocale] = new_locale
   end
 
   opts.on('--createlocale', 'Creates a new locale file for all program keywords available.') do
@@ -39,9 +45,10 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-verbose = options[:verbose]
-verify = options[:verify]
-language = options[:lang] || 'en'
+verbose_flag = options[:verbose]
+verify_flag = options[:verify]
+language_flag = options[:locale]
+set_locale_flag = options[:defaultlocale]
 create_locale_flag = options[:createlocale]
 delete_locale_flag = options[:deletelocale]
 list_locales_flag = options[:listlocales]
@@ -53,6 +60,20 @@ if create_locale_flag
   return
 end
 
+if language_flag.is_a?(NilClass)
+  language_flag = 'default'
+end
+
+if !set_locale_flag.is_a?(NilClass)
+  unless ARGV.empty?
+    puts 'Flag for verification found. Ignoring input file.'
+    sleep 0.5
+  end
+  require_relative '../lib/locale_defaulter'
+  set_default_locale(set_locale_flag)
+  return
+end
+
 if delete_locale_flag
   require_relative '../lib/locale_deleter'
   delete_locale_file
@@ -72,23 +93,23 @@ if list_locale_flag
 end
 
 raise OptionParser::MissingArgument, "No file provided.
-Usage: alphalang my_file.alpha | alphalang -h" if ARGV.empty? unless verify
+Usage: alphalang my_file.alpha | alphalang -h" if ARGV.empty? unless verify_flag
 raise OptionParser::InvalidArgument, 'Too many files provided.
 Did you mean to use an --[option]? | alphalang -h' if ARGV.length > 1
-raise OptionParser::InvalidArgument, 'File must end with .alpha' unless verify or ARGV[0].end_with?('.alpha')
+raise OptionParser::InvalidArgument, 'File must end with .alpha' unless verify_flag or ARGV[0].end_with?('.alpha')
 
-if verbose
+if verbose_flag
   require_relative '../lib/rdparse'
 else
   require_relative '../lib/rdparse_quiet'
 end
 
-if verify
+if verify_flag
   unless ARGV.empty?
     puts 'Flag for verification found. Ignoring input file.'
     sleep 1
   end
   require_relative '../lib/tester/test_unit'
 else
-  LangParser.new(language).parse_file(ARGV[0])
+  LangParser.new(language_flag).parse_file(ARGV[0])
 end

data/lib/alpha.rb

@@ -1,9 +1,9 @@
-require_relative './nodes/stmtnodes'
+require_relative './nodes/scopemanager'
 
 class LangParser
-  def initialize(locale = 'en')
-    ScopeManager.new
+  def initialize(locale = 'default')
     @langParser = Parser.new('lang parser', locale) do
+      token(/;;.*$/)
       token(/while/) { |_| :WHILE }
       token(/print/) { |_| :PRINT }
       token(/pause/) { |_| :PAUSE }

data/lib/lang_creator.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require_relative 'locale_lister'
 
 # Function to read user input for translation
 def read_translation(line)
@@ -29,77 +30,67 @@ def read_translation_not_and_or(line)
   return "(#{input.empty? ? word : input}#{postfix}"
 end
 
-def prompt_user(locale_template, file)
+def prompt_user(file)
+  locale_template = File.readlines("#{LOCALES_PATH}/locale_template")
+
   counter = 0
-  locale_template.each do |line|
-    counter += 1
-    break if counter == 14
+  File.open(file, 'a') do |f|
+    f.puts ';;.*$ ;;.*$'
+    locale_template.each do |line|
+      counter += 1
+      break if counter == 15
 
-    if counter < 9
-      translation = read_translation(line.chomp)
-      File.open(file, 'a') { |f| f.puts "#{line.chomp} #{translation}" }
-    end
-    if counter == 9
-      translation = read_translation_true_false(line.chomp)
-      File.open(file, 'a') { |f| f.puts "#{line.chomp} #{translation}" }
-    end
-    if counter == 10
-      File.open(file, 'a') { |f| f.puts "#{line.chomp} (==|<=|>=)" }
+      if counter > 1 && counter < 10
+        translation = read_translation(line.chomp)
+        f.puts "#{line.chomp} #{translation}"
+      end
+      if counter == 10
+        translation = read_translation_true_false(line.chomp)
+        f.puts "#{line.chomp} #{translation}"
+      end
+      if counter == 11
+        f.puts "#{line.chomp} (==|<=|>=)"
+      end
+      if counter > 11
+        translation = read_translation_not_and_or(line.chomp)
+        f.puts "#{line.chomp} #{translation}"
+      end
     end
-    if counter > 10
-      translation = read_translation_not_and_or(line.chomp)
-      File.open(file, 'a') { |f| f.puts "#{line.chomp} #{translation}" }
-    end
-  end
-end
-
-def save_file(file)
-  ruby_version = "#{RUBY_VERSION}"
-  ruby_version[-1] = '0'
-  install_path = "/home/#{ENV['USER']}/.local/share/gem/ruby/#{ruby_version}/gems/alphalang-#{ALPHA_VER}"
-
-  if File.exist?(install_path)
-    File.rename(file, "#{install_path}/lib/locales/#{file}")
-    puts "Locale/syntax saved to #{install_path}/lib/locales/#{file}"
-  else
-    raise ArgumentError, "Didn't find your #{install_path}.\nTried #{ruby_version} as <VERSION>"
+    f.puts '\s+ \s+'
+    f.puts '\d+ \d+'
+    f.puts '\w+ \w+'
+    f.puts '. .'
   end
 end
 
 def create_locale_file()
   puts 'Choose a filename for your locale/syntax:'
-  filename = gets.chomp
-  File.open(filename, 'w') {}
+  new_locale_name = gets.chomp
+  new_locale_file_path = "#{LOCALES_PATH}/#{new_locale_name}"
 
-  # import locale template
-  locale_path = File.join(__dir__, 'locales', 'locale_template')
-  token_template = File.readlines(locale_path)
+  if File.exist?(new_locale_file_path)
+    puts "#{new_locale_name} already exists."
+    return
+  end
 
   # prompt user for translations
-  prompt_user(token_template, filename)
-
-  # Append additional translations
-  File.open(filename, 'a') do |f|
-    f.puts '\s+ \s+'
-    f.puts '\d+ \d+'
-    f.puts '\w+ \w+'
-    f.puts '. .'
-  end
+  prompt_user(new_locale_file_path)
 
   # Clear the screen
   system('clear')
 
   # Display the contents of the translation file
-  puts File.read(filename)
+  locale_as_array = clean_locale_file_to_array(new_locale_name)
+  print_clean_locale_array(new_locale_name, locale_as_array)
 
   # Ask user if the translation is correct
   puts 'Is this correct? [Y/n]'
   answer = gets.chomp
 
   if answer.downcase == /y|Y/ or answer.empty?
-    save_file(filename)
+    puts "Locale is saved as #{new_locale_name} in #{LOCALES_PATH}"
   else
     puts 'Translation removed'
-    File.delete(filename)
+    File.delete(new_locale_file_path)
   end
 end

data/lib/locale_defaulter.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+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.rename("#{LOCALES_PATH}/default", "#{LOCALES_PATH}/default.old")
+      File.copy_stream("#{LOCALES_PATH}/#{new_locale}", "#{LOCALES_PATH}/default")
+      puts "[alphalang] Default syntax locale is now set to #{locale}."
+      return
+    end
+  end
+end

data/lib/locale_deleter.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-def prompt_user_for_deletion(locales, install_path, protected_paths)
+def prompt_user_for_deletion(locales)
   puts 'Which locale would you like to delete?:                    RET or "none" to abort'
 
   locales.each do |locale|
@@ -11,25 +11,22 @@ def prompt_user_for_deletion(locales, install_path, protected_paths)
 
   return if ABORT_ANSWERS.include?(locale_file)
 
-  if protected_paths.include?(locale_file)
+  if PROTECTED_LOCALES.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}"
+    File.delete("#{LOCALES_PATH}/#{locale_file}")
+    puts "Successfully deleted #{LOCALES_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) }
+  imported_locales = Dir.entries(LOCALES_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)
+    prompt_user_for_deletion(imported_locales)
   end
 end

data/lib/locale_lister.rb

@@ -2,41 +2,37 @@
 
 # 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) }
+  protected_locales = ['.', '..', 'locale_template', 'default', 'default.old', extra_entries_array].flatten
+  Dir.entries(LOCALES_PATH).reject { |entry| protected_locales.include?(entry) }
 end
 
 def list_locale_files()
   locales = get_locale_files
-  puts '[alphalang] These are the available locales.'
+  puts "[alphalang] These are the available locales.\ndefault"
   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}")
+def clean_locale_file_to_array(locale_name)
+  locale_file = File.readlines("#{LOCALES_PATH}/#{locale_name}")
 
   clean_locale_file_array = []
   locale_file.each do |line|
-    line.scan(/\b\p{L}+\b/) do |word|
+    line.scan(/\b\p{Word}+\b/) do |word|
       clean_locale_file_array << word if word.size > 1
     end
   end
+  clean_locale_file_array
+end
 
-  header = "\n[alphalang] Syntax for locale <#{specific_locale}>."
+def print_clean_locale_array(locale_name, clean_array)
+  header = "\n[alphalang] Syntax for locale <#{locale_name}>."
   puts header
   puts '+' * (header.size - 2)
   clean_line = ''
-  clean_locale_file_array.each_with_index do |word, index|
+  clean_array.each_with_index do |word, index|
     if index.even?
       clean_line += "+        #{word}"
     else
@@ -48,3 +44,13 @@ def list_specific_locale_file()
   end
   puts '+' * (header.size - 2)
 end
+
+def list_specific_locale_file()
+  list_locale_files
+  specific_locale = gets.chomp
+
+  return if ABORT_ANSWERS.include?(specific_locale)
+
+  specific_locale_array = clean_locale_file_to_array(specific_locale)
+  print_clean_locale_array(specific_locale, specific_locale_array)
+end

data/lib/locales/de

@@ -1,3 +1,4 @@
+;;.*$ ;;.*$
 while während
 print drucken
 pause pause

data/lib/locales/default

@@ -0,0 +1,18 @@
+;;.*$ ;;.*$
+while while
+print print
+pause pause
+def def
+end end
+if if
+elseif elseif
+else else
+(false|true) (false|true)
+(==|<=|>=) (==|<=|>=)
+(not|!) (not|!)
+(and|&&) (and|&&)
+(or|\|\|) (or|\|\|)
+\s+ \s+
+\d+ \d+
+\w+ \w+
+. .

data/lib/locales/en

@@ -1,3 +1,4 @@
+;;.*$ ;;.*$
 while while
 print print
 pause pause

data/lib/locales/locale_template

@@ -1,3 +1,4 @@
+;;.*$
 while
 print
 pause

data/lib/locales/sv

@@ -1,3 +1,4 @@
+;;.*$ ;;.*$
 while medan
 print skriv
 pause vänta

data/lib/nodes/scopemanager.rb

@@ -0,0 +1,53 @@
+require_relative 'stmtnodes'
+
+####################################################
+
+$scopes = [{}]
+$scope_lvl = 0
+$test_nodes = false
+
+# Need to figure out how to move the scopes in here as class members in a sane way
+class ScopeManager
+  def self.scope_lvl
+    $scope_lvl
+  end
+
+  def self.scope_lvl=(value)
+    $scope_lvl = value
+  end
+
+  def self.lookup_var(name)
+    temp_scope_lvl = $scope_lvl
+    while temp_scope_lvl >= 0
+      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

data/lib/nodes/stmtnodes.rb

@@ -2,54 +2,6 @@ require_relative 'basenodes'
 
 ####################################################
 
-$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 self.lookup_var(name)
-    temp_scope_lvl = $scope_lvl
-    while temp_scope_lvl >= 0
-      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
 

data/lib/rdparse.rb

@@ -125,10 +125,9 @@ class Parser
   class ParseError < RuntimeError
   end
 
-  def initialize(language_name, locale='en', &block)
+  def initialize(language_name, locale = 'default', &block)
 
-    locales_path = File.join(__dir__, "locales", locale)
-    token_pairs = File.readlines(locales_path)
+    token_pairs = File.readlines("#{LOCALES_PATH}/#{locale}")
     @token_list = Hash.new
     token_pairs.each do |pair|
       default_value, locale_value = pair.split(' ')

data/lib/rdparse_quiet.rb

@@ -126,10 +126,9 @@ class Parser
   class ParseError < RuntimeError
   end
 
-  def initialize(language_name, locale='en', &block)
+  def initialize(language_name, locale = 'default', &block)
 
-    locales_path = File.join(__dir__, "locales", locale)
-    token_pairs = File.readlines(locales_path)
+    token_pairs = File.readlines("#{LOCALES_PATH}/#{locale}")
     @token_list = Hash.new
     token_pairs.each do |pair|
       default_value, locale_value = pair.split(' ')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alphalang
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - mattias
@@ -61,15 +61,16 @@ files:
 - bin/alphalang
 - lib/alpha.rb
 - lib/lang_creator.rb
+- lib/locale_defaulter.rb
 - lib/locale_deleter.rb
-- lib/locale_deleter.rb~
 - lib/locale_lister.rb
-- lib/locale_lister.rb~
 - lib/locales/de
+- lib/locales/default
 - lib/locales/en
 - lib/locales/locale_template
 - lib/locales/sv
 - lib/nodes/basenodes.rb
+- lib/nodes/scopemanager.rb
 - lib/nodes/stmtnodes.rb
 - lib/rdparse.rb
 - lib/rdparse_quiet.rb