Merge pull request #9634 from 9999years/combine-abstract-pos-and-pos

guiwf/lix

Combine `AbstractPos`, `PosAdapter`, and `Pos`

(cherry picked from commit 113499d16fc87d53b73fb62fe6242154909756ed)

===

this is a bit cursed because originally it was based on InputAccessor
code that we don't have and moved/patched features we likewise don't
have (fetchToStore caching, all the individual accessors,
ContentAddressMethod). the commit is adjusted accordingly to
match (remove caching, ignore accessors, use FileIngestionMethod).

note that `state.rootPath . CanonPath == abs` and
computeStorePathForPath works relative to cwd, so the slight rewrite in
the moved fetchToStore is legal.

Change-Id: I05fd340c273f0bcc8ffabfebdc4a88b98083bce5

This commit is contained in:

eldritch horrors

2024-03-05 23:46:18 -07:00

parent e9b5929b22

commit 89e99d94e4

24 changed files with 311 additions and 241 deletions

									
										src/libexpr/value.hh
									
		+1
		
												View File
												
				@@ -7,6 +7,7 @@

				#include "symbol-table.hh"

				#include "value/context.hh"

				#include "input-accessor.hh"

				#include "source-path.hh"

				#if HAVE_BOEHMGC

				#include <gc/gc_allocator.h>