alphalang 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daa1ca143b51a415a7888d29f6cec78e41fddaa637685af3534708c40cc6de5a
-  data.tar.gz: b2c26c887f7fcf6f14f4efab2787d61a1ce9f7df8e6cb872bfc0b2b7184fa961
+  metadata.gz: a9264317b60fae6805130ff9692189ba73bf08530c025d8a732c0c520b19a466
+  data.tar.gz: e7bff4ae6de5fbade8cbc6b0a779ddd06259fad639b3650239fbb5f39d0adff9
 SHA512:
-  metadata.gz: f811511f84666e1148ea41d5706ed8289482dd8df76d2f0c3f25ebc8513ccf79b1869f83a35f586cbc6af0c1ded8f3ecf28403dc8495562a7f0d034daa0cc16b
-  data.tar.gz: e62cf96b852544722eb6aa3c33e9cbbc32bb5eb3fa03aec71d89121736be7c78f2a027e0b1885419eec53385afa2787a1a8b9d5953aa6720cb8571bd3749b8d2
+  metadata.gz: 9c8f5078f5f91b224847c2c43134e84fb053d3ba6b5eb456104ae7a4f0f267009ee78077fc8e338e1bb5002616d16627491469df240492f045546b20d4a18c5a
+  data.tar.gz: daf389f2da9e82cd86a921639b5d8843ef4c45b33ef294d2c93a3281d64dfb0d6674c36f16aac04e76ef2f75c160865554e8325e57bb3c5864462a4739fc9f4f

data/bin/alphalang

@@ -3,7 +3,7 @@ require 'optparse'
 require File.expand_path('../lib/alpha', __dir__)
 require_relative '../lib/rdparse'
 ALPHA_VER = '0.1.5'.freeze
-ABORT_ANSWERS = [' ', '', 'none', 'abort'].freeze # something here? Some cases empty means yes tho..
+ABORT_ANSWERS = [' ', '', 'none', 'abort'].freeze
 LOCALES_PATH = File.join(__dir__, '../lib/locales')
 PROTECTED_LOCALES = ['.', '..', 'locale_template', 'default', 'default.old', 'en', 'sv', 'de'].freeze
 

data/lib/alpha.rb

@@ -2,7 +2,6 @@ require_relative './nodes/scopemanager'
 
 class LangParser
   def initialize(locale = 'default', debug_mode = false)
-
     @langParser = Parser.new('lang parser', debug_mode, locale) do
       token(/;;.*$/)
       token(/while/) { |_| :WHILE }
@@ -24,7 +23,7 @@ class LangParser
       token(/./) { |m| m }
 
       start :program do
-        match(:comp_stmt) { |comp_stmt| comp_stmt }
+        match(:comp_stmt)
         match(:terminal)
       end
 
@@ -137,7 +136,6 @@ class LangParser
         match(/\d+/, '.', /\d+/) { |a, dot, b| NumberNode.new((a+dot+b)) }
         match('-', /\d+/) { |neg, a| NumberNode.new(neg + a) }
         match(/\d+/) { |a| NumberNode.new(a) }
-        match(/(false|true)/) { |a| BoolNode.new(a) }
         match(ScopeManager.true_value) { |a| BoolNode.new(a) }
         match(ScopeManager.false_value) { |a| BoolNode.new(a) }
         match(:PRINT, :member) { |_, a| PrintNode.new(a) }

data/lib/lang_creator.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require_relative 'locale_lister'
 
-# Function to read user input for translation
 def read_translation(line)
   puts "Enter the translation for: '#{line}'        <RET> to accept '#{line}'"
   translation = gets.chomp
@@ -73,21 +72,16 @@ def create_locale_file()
     return
   end
 
-  # prompt user for translations
   prompt_user(new_locale_file_path)
-
-  # Clear the screen
   system('clear')
 
-  # Display the contents of the translation file
   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?
+  if answer.downcase.match? /y|Y/ or answer.empty?
     puts "Locale is saved as #{new_locale_name} in #{LOCALES_PATH}"
   else
     puts 'Translation removed'

data/lib/nodes/basenodes.rb

@@ -149,12 +149,13 @@ class CompStmtNode < Node
 
   def evaluate
     @comp_statements[0].evaluate
-    @comp_statements[1].evaluate # kanske bör loopas osv??? Root blir nu sista evalueringen.
+    @comp_statements[1].evaluate
   end
 end
 
 ####################################################
 
+#Arraynoden är ofärdig, används inte korrekt
 class ArrayNode < Node
   attr_accessor :lhs, :rhs
 

data/lib/nodes/scopemanager.rb

@@ -37,7 +37,7 @@ class ScopeManager
         return @@scopes[temp_scope_lvl][name]
       end
     end
-    raise ArgumentError, "Variable '#{name}' is not defined" unless @value
+    raise SyntaxError, "Variable '#{name}' is not defined" unless @value
   end
 
   def self.increment_scope_level
@@ -51,7 +51,7 @@ class ScopeManager
   end
 
   def self.lookup_func(name)
-    raise ArgumentError, "Function '#{name}' is not defined" if @@scopes[0][name].is_a?(NilClass)
+    raise SyntaxError, "Function '#{name}' is not defined" if @@scopes[0][name].is_a?(NilClass)
     return @@scopes[0][name]
   end
 

data/lib/nodes/stmtnodes.rb

@@ -72,12 +72,14 @@ class FuncCallNode < Node
     ScopeManager.decrement_scope_level
 
     # If function return value is an "Assign" then we declare that variable in the global scope.
+    # This should be a ScopeManager method, add_variable_to_global_scope is missing.
     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
@@ -196,6 +198,7 @@ class PauseNode < Node
   end
 
   def evaluate
+    @value = 0 if @value.evaluate.negative?
     sleep @value.evaluate
   end
 end

data/lib/rdparse.rb

@@ -132,6 +132,7 @@ class Parser
     @rules = {}
     @start = nil
     @language_name = language_name
+    @file_string = ''
 
     create_tokens_from_locale(locale)
 
@@ -145,7 +146,7 @@ class Parser
     instance_eval(&block)
   end
 
-  # Recreate the tokenlist using locale_template and the chosen locale file
+  # Recreate the tokenlist using the chosen locale file
   def create_tokens_from_locale(locale)
     if locale == 'default'
       lang_file = File.read("#{LOCALES_PATH}/#{locale}")
@@ -186,9 +187,86 @@ class Parser
     end # until
   end
 
+  def find_faulty_expression_within_block(block_start_line, block_end_line, problematic_token)
+    if block_start_line == nil || block_end_line == nil
+      raise ParseError, "Error with <#{problematic_token}> somewhere around line #{block_end_line}#{block_start_line}"
+    end
+    index = 0
+    result = []
+    @file_string.each_line do |line|
+      if index > block_start_line and index < block_end_line
+
+        if line.match?(/;;.*$/)
+          line = line.split(';;')[0]
+        end
+
+        if line.match?(/#{problematic_token}\s+$/)
+          result << "ParseError, #{line.strip}() is missing an expression on line #{index + 1}"
+        end
+      end
+      index += 1
+    end
+    raise ParseError, result[-1]
+  end
+
+  def find_faulty_expression_within_ends
+    puts 'TODO: Implement search for faulty token between two of the same guides'
+    raise ParseError, "Most likely mismatched '#{@token_list['END'.downcase]}' token."
+  end
+
+  def find_faulty_line
+    if @tokens[@max_pos-0].is_a?(NilClass)
+      if @max_pos >= 3
+        puts "Problem is in the end of the file after:\n #{@tokens[@max_pos - 3]}#{@tokens[@max_pos - 2]}#{@tokens[@max_pos - 1]}"
+      else
+        puts "Problem is right in the beginning of the file."
+      end
+      raise ParseError
+    end
+
+    problematic_token = "#{@tokens[@max_pos - 1].downcase}"
+    before_problem = "#{@tokens[@max_pos - 2].downcase}"
+    after_problem = "#{@tokens[@max_pos - 0].downcase}"
+
+    after_problem = "[" + after_problem + "]" if !after_problem.match?(/[a-z]/)
+    before_problem = "[" + before_problem + "]" if !before_problem.match?(/[a-z]/)
+
+    translated_problematic_token = @token_list[problematic_token]
+
+    if translated_problematic_token.is_a?(NilClass)
+      raise ParseError, "Faulty expression likely between two '#{@token_list['end']}' tokens."
+    end
+
+    index = 0
+    problem_match_hash = {}
+    found_end = false
+    @file_string.each_line do |line|
+
+      if line.match?(before_problem) && found_end == false
+        problem_match_hash[before_problem] = index
+      end
+
+      if line.match?(after_problem) && index > problem_match_hash[before_problem]
+        problem_match_hash[after_problem] = index
+        found_end = true
+      end
+      index += 1
+    end
+
+    non_empty_line_before_problem = problem_match_hash[before_problem]
+    non_empty_line_after_problem = problem_match_hash[after_problem]
+
+    unless after_problem == before_problem
+      find_faulty_expression_within_block(non_empty_line_before_problem, non_empty_line_after_problem, problematic_token)
+    else
+      find_faulty_expression_within_ends
+    end
+  end
+
   def parse(string)
     # First, split the string according to the "token" instructions given.
     # Afterwards @tokens contains all tokens that are to be parsed.
+    @file_string = string
     tokenize(string)
 
     # These variables are used to match if the total number of tokens
@@ -205,7 +283,8 @@ class Parser
         raise ParseError, 'Mismatched parenthesis! In Emacs: M-x check-parens RET'
       end
 
-      raise ParseError, "Parse error. expected: '#{@expected.join(', ')}', found '#{@tokens[@max_pos]}'"
+      # raise ParseError, "Parse error. expected: '#{@expected.join(', ')}', found '#{@tokens[@max_pos]}'"
+      return find_faulty_line
     end
     return result
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alphalang
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
-- mattias
+- mattias, victor
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-06 00:00:00.000000000 Z
+date: 2024-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger