sus 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e39bdf28a3135bf28cf66714d3ac2998c1c863e979c172573a3e5e509de2246e
-  data.tar.gz: 88273ca646abe719cb562693f233d6210d8e505456ae8dd663d74971086d33b7
+  metadata.gz: 7368b0ed0e288959f59f0fe6c2c5dd93ff90ba52f423b1365406e8de260536c1
+  data.tar.gz: 10fe5fec8209ce9cea739f580a3f4bd1b36be3b6e384f6ff85ad813fad32d0f2
 SHA512:
-  metadata.gz: eca3ca7daddbc30591698658f6d87cc11a56c9dee2456b1060339fe1442aa5d8479a11ccdf7d9f4e7d617478ff033b0c24482db8d8145b7046e69a106a75409c
-  data.tar.gz: 2df536e6206a37f475bde130d8a6f8f4f8c8eab49a3ea2f7d29f48b4a64b53d6145cc77c27f2105043385756cc8d44d34983334a6de633c5c8d78275777b1ee7
+  metadata.gz: 1456e34138bea3c5952ababab2950ac946ddce0a3f55879ed1bedb9828c536ffb5c4ced7b9a35f4e80ad1879e230dd26b0fc120b7258e218710530165d9233e5
+  data.tar.gz: b1ea6d027ec46f0aa72e74fd6cb169a71b5209a57791b52b7f41c1a1f2fc7d70353e08e73ebfef2d7262e67a7be10702500d07ee99f18499d898de5b0ad917ed

data/lib/sus/file.rb

@@ -9,6 +9,17 @@ require_relative 'context'
 # This has to be done at the top level. It allows us to define constants within the given class while still retaining top-level constant resolution.
 Sus::TOPLEVEL_CLASS_EVAL = ->(__klass__, __path__){__klass__.class_eval(::File.read(__path__), __path__)}
 
+# This is a hack to allow us to get the line number of a syntax error.
+unless SyntaxError.method_defined?(:lineno)
+	class SyntaxError
+		def lineno
+			if message =~ /:(\d+):/
+				$1.to_i
+			end
+		end
+	end
+end
+
 module Sus
 	module File
 		extend Context
@@ -41,7 +52,15 @@ module Sus
 	
 	class FileLoadError
 		def self.build(parent, path, error)
-			identity = Identity.file(parent.identity, path).scoped(error.backtrace_locations)
+			identity = Identity.file(parent.identity, path)
+			
+			# This is a mess.
+			if error.is_a?(SyntaxError) and error.path == path
+				identity = identity.with_line(error.lineno)
+			else
+				identity = identity.scoped(error.backtrace_locations)
+			end
+			
 			self.new(identity, path, error)
 		end
 		
@@ -52,6 +71,7 @@ module Sus
 		end
 		
 		attr :identity
+		attr :error
 		
 		def leaf?
 			true

data/lib/sus/identity.rb

@@ -26,6 +26,10 @@ module Sus
 			@key = nil
 		end
 		
+		def with_line(line)
+			self.class.new(@path, @name, line, @parent, unique: @unique)
+		end
+		
 		attr :path
 		attr :name
 		attr :line
@@ -103,10 +107,6 @@ module Sus
 		
 		protected
 		
-		def with_line(line)
-			Identity.new(@path, @name, line, @parent, unique: @unique)
-		end
-		
 		def append_unique_key(key, unique = @unique)
 			if @parent
 				@parent.append_unique_key(key)

data/lib/sus/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2021-2022, by Samuel Williams.
 
 module Sus
-	VERSION = "0.18.1"
+	VERSION = "0.18.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sus
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Samuel Williams