sus 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e39bdf28a3135bf28cf66714d3ac2998c1c863e979c172573a3e5e509de2246e
-  data.tar.gz: 88273ca646abe719cb562693f233d6210d8e505456ae8dd663d74971086d33b7
+  metadata.gz: cfeea4d70fa47d75bd19bf498b1172dc61124f1d3cc517800c70ae087342c14c
+  data.tar.gz: e1b2279e1168e680fd068af67f6d44f376cfe1c7c74728b7506f661dafdb1db9
 SHA512:
-  metadata.gz: eca3ca7daddbc30591698658f6d87cc11a56c9dee2456b1060339fe1442aa5d8479a11ccdf7d9f4e7d617478ff033b0c24482db8d8145b7046e69a106a75409c
-  data.tar.gz: 2df536e6206a37f475bde130d8a6f8f4f8c8eab49a3ea2f7d29f48b4a64b53d6145cc77c27f2105043385756cc8d44d34983334a6de633c5c8d78275777b1ee7
+  metadata.gz: b09f509fccb65717ae48c657ecb0a2e530761276614d3dc1f9f49fb131caeaf074cbd4bfef1458e029b38347b3aa95a3eb93f7cf6fd7ceeb6e0a23914bbaca66
+  data.tar.gz: ac457785b0c6753fd85107c08a37ae735ba1b4e9716aa3b167e51a2de0e5d27dea4a93062c730af5fb36a4a5279472cef71c20431d5602778d04040c6c420d83

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.19.0"
 end

data/lib/sus/with.rb

@@ -44,7 +44,9 @@ module Sus
 	end
 	
 	module Context
-		def with(subject, **variables, &block)
+		def with(subject = nil, **variables, &block)
+			subject ||= variables.inspect
+			
 			add With.build(self, subject, variables, &block)
 		end
 	end

metadata

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