papki -> fsif

igagis · igagis · commit fa49155d67c6 · 2025-11-03T14:25:35.000+02:00
diff --git a/build/android/tml-$(version).pom.in b/build/android/tml-$(version).pom.in
@@ -9,7 +9,7 @@
   <dependencies>
 	  <dependency>
 		  <groupId>io.github.cppfw</groupId>
-		  <artifactId>papki</artifactId>
+		  <artifactId>fsif</artifactId>
 		  <version>[1.0.93,)</version>
 		  <type>aar</type>
 		  <scope>compile</scope>
diff --git a/build/android/tml/build.gradle b/build/android/tml/build.gradle
@@ -50,7 +50,7 @@ repositories {
 }
 dependencies {
     implementation 'io.github.cppfw:utki:+'
-    implementation 'io.github.cppfw:papki:+'
+    implementation 'io.github.cppfw:fsif:+'
 }
 
 // copy and rename release AAR to unified name
diff --git a/build/archlinux/PKGBUILD b/build/archlinux/PKGBUILD
@@ -10,7 +10,7 @@ url="http://github.com/cppfw/${pkgname}"
 license=('MIT')
 groups=()
 
-depends=("utki" "papki")
+depends=("utki" "fsif")
 
 makedepends=(
 	'myci'
diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
@@ -23,5 +23,5 @@ myci_declare_library(${name}
         ../../src/${name}
     DEPENDENCIES
         utki
-        papki
+        fsif
 )
diff --git a/build/conan/conanfile.py b/build/conan/conanfile.py
@@ -18,7 +18,7 @@ class TmlConan(ConanFile):
 	generators = "AutotoolsDeps" # this will set CXXFLAGS etc. env vars
 
 	def requirements(self):
-		self.requires("papki/[>=0.0.0]@cppfw/main", transitive_headers=True, transitive_libs=True)
+		self.requires("fsif/[>=0.0.0]@cppfw/main", transitive_headers=True, transitive_libs=True)
 
 	def build_requirements(self):
 		self.tool_requires("prorab/[>=2.0.27]@cppfw/main")
diff --git a/build/debian/control.in b/build/debian/control.in
@@ -11,7 +11,7 @@ Build-Depends:
 	clang-tidy,
 	clang-format,
 	libutki-dev,
-	libpapki-dev,
+	libfsif-dev,
 	libclargs-dev,
 	libtst-dev
 Build-Depends-Indep: doxygen
@@ -43,7 +43,7 @@ Depends:
 	libtml-dbg$(soname) (= ${binary:Version}),
 	${misc:Depends},
 	libutki-dev,
-	libpapki-dev
+	libfsif-dev
 Suggests: libtml-doc
 Description: tree markup language C++ library.
 	tml is a simple markup language.
diff --git a/build/homebrew/libtml.rb.in b/build/homebrew/libtml.rb.in
@@ -7,7 +7,7 @@ class Libtml < Formula
   depends_on "prorab" => :build
   depends_on "libclargs" => :build
   depends_on "libtst" => :build
-  depends_on "libpapki"
+  depends_on "libfsif"
   depends_on "libutki"
 
   # use gmake here because otherwise homebrew uses default Mac's make which is of too old version 3.81
diff --git a/build/msys2/PKGBUILD.in b/build/msys2/PKGBUILD.in
@@ -29,7 +29,7 @@ url="http://github.com/cppfw/${packageName}"
 license=('MIT')
 groups=()
 
-depends=("${pkgPrefix}utki" "${pkgPrefix}papki")
+depends=("${pkgPrefix}utki" "${pkgPrefix}fsif")
 
 makedepends=(
 	'myci'
diff --git a/build/vcpkg/test/vcpkg-configuration.json b/build/vcpkg/test/vcpkg-configuration.json
@@ -13,7 +13,7 @@
         "packages": [
           "myci",
           "utki",
-          "papki"
+          "fsif"
         ]
       }
     ],
diff --git a/build/vcpkg/vcpkg.json.in b/build/vcpkg/vcpkg.json.in
@@ -18,6 +18,6 @@
         "host" : false
       },
       "utki",
-      "papki"
+      "fsif"
     ]
   }
diff --git a/src/makefile b/src/makefile
@@ -13,7 +13,7 @@ this_soname := $(shell cat $(d)soname.txt)
 
 this_srcs += $(call prorab-src-dir, $(this_src_dir))
 
-this_ldlibs += -l papki$(this_dbg)
+this_ldlibs += -l fsif$(this_dbg)
 this_ldlibs += -l utki$(this_dbg)
 
 $(eval $(prorab-build-lib))
diff --git a/src/tml/parser.cpp b/src/tml/parser.cpp
@@ -697,9 +697,9 @@ void parser::end_of_data(listener& listener)
 	this->reset();
 }
 
-void tml::parse(const papki::file& fi, listener& listener)
+void tml::parse(const fsif::file& fi, listener& listener)
 {
-	papki::file::guard file_guard(fi);
+	fsif::file::guard file_guard(fi);
 
 	tml::parser parser;
 
diff --git a/src/tml/parser.hpp b/src/tml/parser.hpp
@@ -29,7 +29,7 @@ SOFTWARE.
 #include <string_view>
 #include <vector>
 
-#include <papki/file.hpp>
+#include <fsif/file.hpp>
 #include <utki/span.hpp>
 
 #include "extra_info.hpp"
@@ -199,6 +199,6 @@ class parser
  * @param fi - file interface to use for getting the data to parse.
  * @param listener - listener object which will receive notifications about parsed tokens.
  */
-void parse(const papki::file& fi, listener& listener);
+void parse(const fsif::file& fi, listener& listener);
 
 } // namespace tml
diff --git a/src/tml/tree.cpp b/src/tml/tree.cpp
@@ -30,15 +30,15 @@ SOFTWARE.
 #include <cstring>
 #include <stack>
 
-#include <papki/span_file.hpp>
-#include <papki/vector_file.hpp>
+#include <fsif/span_file.hpp>
+#include <fsif/vector_file.hpp>
 #include <utki/string.hpp>
 
 #include "parser.hpp"
 
 using namespace tml;
 
-forest tml::read(const papki::file& fi)
+forest tml::read(const fsif::file& fi)
 {
 	class the_listener : public tml::listener
 	{
@@ -79,7 +79,7 @@ forest tml::read(const papki::file& fi)
 
 forest tml::read(std::string_view str)
 {
-	const papki::span_file fi(to_uint8_t(utki::make_span(str)));
+	const fsif::span_file fi(to_uint8_t(utki::make_span(str)));
 
 	return read(fi);
 }
@@ -160,7 +160,7 @@ void make_escaped_string(
 	}
 }
 
-void write_internal(const tml::forest& roots, papki::file& fi, formatting fmt, unsigned indentation)
+void write_internal(const tml::forest& roots, fsif::file& fi, formatting fmt, unsigned indentation)
 {
 	const std::array<uint8_t, 1> quote = {{'"'}};
 	const std::array<uint8_t, 1> lcurly = {{'{'}};
@@ -282,13 +282,13 @@ void write_internal(const tml::forest& roots, papki::file& fi, formatting fmt, u
 
 void tml::write(
 	const tml::forest& wood, //
-	papki::file& fi,
+	fsif::file& fi,
 	formatting fmt
 )
 {
-	papki::file::guard file_guard(
+	fsif::file::guard file_guard(
 		fi, //
-		papki::mode::create
+		fsif::mode::create
 	);
 
 	write_internal(wood, fi, fmt, 0);
@@ -389,7 +389,7 @@ bool leaf::to_bool() const
 
 std::string tml::to_string(const forest& f)
 {
-	papki::vector_file fi;
+	fsif::vector_file fi;
 	tml::write(f, fi, tml::formatting::minimal);
 	auto v = fi.reset_data();
 	return utki::make_string(v);
diff --git a/src/tml/tree.hpp b/src/tml/tree.hpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <string>
 
-#include <papki/file.hpp>
+#include <fsif/file.hpp>
 #include <utki/string.hpp>
 #include <utki/tree.hpp>
 
@@ -202,7 +202,7 @@ class leaf
 using tree = utki::tree<leaf>;
 using forest = tree::container_type;
 
-forest read(const papki::file& fi);
+forest read(const fsif::file& fi);
 forest read(std::string_view str);
 
 enum class formatting {
@@ -212,7 +212,7 @@ enum class formatting {
 
 void write(
 	const forest& wood, //
-	papki::file& fi,
+	fsif::file& fi,
 	formatting fmt = formatting::normal
 );
 
diff --git a/src/tml/tree_ext.cpp b/src/tml/tree_ext.cpp
@@ -28,13 +28,13 @@ SOFTWARE.
 
 #include <stack>
 
-#include <papki/span_file.hpp>
+#include <fsif/span_file.hpp>
 
 #include "parser.hpp"
 
 using namespace tml;
 
-forest_ext tml::read_ext(const papki::file& fi)
+forest_ext tml::read_ext(const fsif::file& fi)
 {
 	class the_listener : public tml::listener
 	{
@@ -75,7 +75,7 @@ forest_ext tml::read_ext(const papki::file& fi)
 
 forest_ext tml::read_ext(const std::string& str)
 {
-	const papki::span_file fi(to_uint8_t(utki::make_span(str)));
+	const fsif::span_file fi(to_uint8_t(utki::make_span(str)));
 
 	return read_ext(fi);
 }
diff --git a/src/tml/tree_ext.hpp b/src/tml/tree_ext.hpp
@@ -64,7 +64,7 @@ class leaf_ext : public leaf
 using tree_ext = utki::tree<leaf_ext>;
 using forest_ext = tree_ext::container_type;
 
-forest_ext read_ext(const papki::file& fi);
+forest_ext read_ext(const fsif::file& fi);
 forest_ext read_ext(const std::string& str);
 
 tree to_non_ext(const tree_ext& t);
diff --git a/tests/unit/makefile b/tests/unit/makefile
@@ -11,7 +11,7 @@ this_srcs := $(call prorab-src-dir, src)
 
 this_ldlibs += -l tst$(this_dbg)
 this_ldlibs += -l utki$(this_dbg)
-this_ldlibs += -l papki$(this_dbg)
+this_ldlibs += -l fsif$(this_dbg)
 
 this_ldlibs += ../../src/out/$(c)/libtml$(this_dbg)$(dot_so)
 
diff --git a/tests/unit/src/parser.cpp b/tests/unit/src/parser.cpp
@@ -3,7 +3,7 @@
 
 #include <deque>
 
-#include <papki/fs_file.hpp>
+#include <fsif/native_file.hpp>
 
 #include "../../../src/tml/parser.hpp"
 
@@ -128,7 +128,7 @@ const tst::set set("parser", [](auto& suite){
 
 		l.actions.emplace_back(action_enum::string_item, "UnquotedStringAtTheVeryEndOfTheFile");
 
-		papki::fs_file fi("parser_data/test.tml");
+		fsif::native_file fi("parser_data/test.tml");
 
 		tml::parse(fi, l);
 
diff --git a/tests/unit/src/tree_reading.cpp b/tests/unit/src/tree_reading.cpp
@@ -1,14 +1,14 @@
 #include <tst/set.hpp>
 #include <tst/check.hpp>
 
-#include <papki/fs_file.hpp>
+#include <fsif/native_file.hpp>
 
 #include "../../../src/tml/tree.hpp"
 
 namespace{
 const tst::set set("tree_reading", [](tst::suite& suite){
 	suite.add("read", [](){
-		papki::fs_file fi("tree_reading_data/test.tml");
+		fsif::native_file fi("tree_reading_data/test.tml");
 
 		auto roots = tml::read(fi);
 
diff --git a/tests/unit/src/tree_writing.cpp b/tests/unit/src/tree_writing.cpp
@@ -3,8 +3,8 @@
 
 #include <regex>
 
-#include <papki/fs_file.hpp>
-#include <papki/vector_file.hpp>
+#include <fsif/native_file.hpp>
+#include <fsif/vector_file.hpp>
 
 #include "../../../src/tml/tree.hpp"
 
@@ -16,17 +16,17 @@ namespace{
 template <bool formatted>
 std::function<void(const std::string&)> make_test_proc(){
 	return [](const std::string& p){
-		papki::fs_file fi(data_dir + p);
+		fsif::native_file fi(data_dir + p);
 
 		auto roots = tml::read(fi);
 
-		papki::vector_file outfi;
+		fsif::vector_file outfi;
 
 		tml::write(roots, outfi, formatted ? tml::formatting::normal : tml::formatting::minimal);
 
 		auto data = outfi.reset_data();
 
-		papki::fs_file expected_fi(fi.path() + "." + (formatted ? "" : "un") + "formatted");
+		fsif::native_file expected_fi(fi.path() + "." + (formatted ? "" : "un") + "formatted");
 
 		auto expected_data = expected_fi.load();
 
@@ -41,7 +41,7 @@ const tst::set set("tree_writing", [](tst::suite& suite){
 
 	{
 		const std::regex tml_regex("^.*\\.tml$");
-		auto all_files = papki::fs_file(data_dir).list_dir();
+		auto all_files = fsif::native_file(data_dir).list_dir();
 
 		std::copy_if(
 				all_files.begin(),

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ repositories {`
`50`	`50`	`}`
`51`	`51`	`dependencies {`
`52`	`52`	`implementation 'io.github.cppfw:utki:+'`
`53`		`- implementation 'io.github.cppfw:papki:+'`
	`53`	`+ implementation 'io.github.cppfw:fsif:+'`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`// copy and rename release AAR to unified name`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ myci_declare_library(${name}`
`23`	`23`	`../../src/${name}`
`24`	`24`	`DEPENDENCIES`
`25`	`25`	`utki`
`26`		`- papki`
	`26`	`+ fsif`
`27`	`27`	`)`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`"packages": [`
`14`	`14`	`"myci",`
`15`	`15`	`"utki",`
`16`		`- "papki"`
	`16`	`+ "fsif"`
`17`	`17`	`]`
`18`	`18`	`}`
`19`	`19`	`],`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@`
`18`	`18`	`"host" : false`
`19`	`19`	`},`
`20`	`20`	`"utki",`
`21`		`- "papki"`
	`21`	`+ "fsif"`
`22`	`22`	`]`
`23`	`23`	`}`