alphalang 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f69af7ab6e40605d9118d7125caf0c99ea961bd20108210a91d77ea790e0489
-  data.tar.gz: 0bd9593abf719ba7e5704a873f3d5d14aff15a20d424bcc858e7d9a7e45b22f4
+  metadata.gz: a9264317b60fae6805130ff9692189ba73bf08530c025d8a732c0c520b19a466
+  data.tar.gz: e7bff4ae6de5fbade8cbc6b0a779ddd06259fad639b3650239fbb5f39d0adff9
 SHA512:
-  metadata.gz: 34c909f692a34e3eae601ec4eddcb6361e46480d74a857b277fdbe652d65b2cfa99b6c427661fea5c64720a2122b28e8644f079df2e76b267e53c9bf11c8d26f
-  data.tar.gz: 0aebab81771209c1f955abd3954e0ba7b9d4c8544fe2d308779d56d19669085b8cb925e6fbdda1cedd3c6b4a7755b95caa17b509bc9f948e85359025aefaf530
+  metadata.gz: 9c8f5078f5f91b224847c2c43134e84fb053d3ba6b5eb456104ae7a4f0f267009ee78077fc8e338e1bb5002616d16627491469df240492f045546b20d4a18c5a
+  data.tar.gz: daf389f2da9e82cd86a921639b5d8843ef4c45b33ef294d2c93a3281d64dfb0d6674c36f16aac04e76ef2f75c160865554e8325e57bb3c5864462a4739fc9f4f

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/rdparse.rb

@@ -188,6 +188,9 @@ class Parser
   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|
@@ -212,28 +215,33 @@ class Parser
   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}"
 
-    if @max_pos - 5 <= 0
-      puts 'problem in the beginning of file, figure it out'
-      return
-    elsif @max_pos + 5 < @max_pos
-      puts 'problem in the end of file, figure it out'
-      return
-    end
+    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'.downcase]}' tokens."
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alphalang
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - mattias, victor