Fix end of string issue with quotes.

egorpugin · egorpugin · commit ee4be4a8558d · 2017-07-07T00:20:49.000+03:00
diff --git a/src/client/fix_imports.cpp b/src/client/fix_imports.cpp
@@ -56,7 +56,8 @@ void fix_imports(const String &target, const path &aliases_file, const path &old
     auto aliases_s = read_file(aliases_file);
     auto dep = extractFromString(target);
 
-    fs::create_directories(new_file.parent_path());
+    if (!new_file.parent_path().empty())
+        fs::create_directories(new_file.parent_path());
     std::ofstream ofile(new_file.string());
     if (!ofile)
         throw std::runtime_error("Cannot open the output file for writing");
diff --git a/src/support/cppan_string.cpp b/src/support/cppan_string.cpp
@@ -29,10 +29,10 @@ int get_end_of_string_block(const String &s, int i)
 
         if (c == '\"')
         {
-            if (n_quotes == 0)
-                i = get_end_of_string_block(s.c_str(), i + 1) - 1;
-            else if (s[i - 1] == '\\')
+            if (i && s[i - 1] == '\\')
                 ;
+            else if (n_quotes == 0)
+                i = get_end_of_string_block(s, i + 1) - 1;
             else
                 n_quotes--;
         }
@@ -42,7 +42,7 @@ int get_end_of_string_block(const String &s, int i)
             {
             case '(':
             case '[':
-                i = get_end_of_string_block(s.c_str(), i + 1) - 1;
+                i = get_end_of_string_block(s, i + 1) - 1;
                 break;
             case ')':
                 n_curly--;
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -13,4 +13,9 @@ set_property(TARGET source_test PROPERTY FOLDER test)
 target_link_libraries(source_test common pvt.cppan.demo.philsquared.catch)
 add_test(NAME source COMMAND source_test)
 
+add_executable(string_test string.cpp)
+set_property(TARGET string_test PROPERTY FOLDER test)
+target_link_libraries(string_test support pvt.cppan.demo.philsquared.catch)
+add_test(NAME string COMMAND string_test)
+
 ################################################################################
diff --git a/test/string.cpp b/test/string.cpp
@@ -0,0 +1,29 @@
+/*
+name: main
+
+*/
+
+#include <cppan_string.h>
+
+#define CATCH_CONFIG_RUNNER
+#include <catch.hpp>
+
+TEST_CASE("save/load", "[source]")
+{
+    std::string s(R"xxx((pvt.cppan.demo.xz_utils.lzma-5.2.3 PROPERTIES
+      INTERFACE_COMPILE_DEFINITIONS "CPPAN_API_pvt_cppan_demo_xz_utils_lzma_5_2_3=CPPAN_SYMBOL_IMPORT;CPPAN;CPPAN_BUILD;CPPAN_SYMBOL_EXPORT=__attribute__((__visibility__(\"default\")));CPPAN_SYMBOL_IMPORT=;HAVE_CLOCK_GETTIME=1;HAVE_FUTIMENS=1;HAVE_FUTIMES=1;HAVE_FUTIMESAT=1;HAVE_POSIX_FADVISE=1;HAVE_UTIME=1;HAVE_UTIMES=1;HAVE_FCNTL_H=1;HAVE_IMMINTRIN_H=1;HAVE_INTTYPES_H=1;HAVE_LIMITS_H=1;HAVE_MEMORY_H=1;HAVE_STDBOOL_H=1;HAVE_STDDEF_H=1;HAVE_STDINT_H=1;HAVE_STDLIB_H=1;HAVE_STRINGS_H=1;HAVE_STRING_H=1;HAVE_SYS_STAT_H=1;HAVE_SYS_TIME_H=1;HAVE_SYS_TYPES_H=1;HAVE_UNISTD_H=1;HAVE_INT32_T=1;SIZEOF_INT32_T=4;SIZE_OF_INT32_T=4;HAVE_INT64_T=1;SIZEOF_INT64_T=8;SIZE_OF_INT64_T=8;HAVE_SIZE_T=1;SIZEOF_SIZE_T=8;SIZE_OF_SIZE_T=8;HAVE_UINT16_T=1;SIZEOF_UINT16_T=2;SIZE_OF_UINT16_T=2;HAVE_UINT32_T=1;SIZEOF_UINT32_T=4;SIZE_OF_UINT32_T=4;HAVE_UINT64_T=1;SIZEOF_UINT64_T=8;SIZE_OF_UINT64_T=8;HAVE_UINT8_T=1;SIZEOF_UINT8_T=1;SIZE_OF_UINT8_T=1;HAVE_UINTPTR_T=1;SIZEOF_UINTPTR_T=8;SIZE_OF_UINTPTR_T=8;HAVE_VOID_P=1;SIZEOF_VOID_P=8;SIZE_OF_VOID_P=8;HAVE__BOOL=1;SIZEOF__BOOL=1;SIZE_OF__BOOL=1;STDC_HEADERS=1;HAVE_DECL_CLOCK_MONOTONIC=0;HAVE_DECL__MM_MOVEMASK_EPI8=0;HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC=1"
+      INTERFACE_INCLUDE_DIRECTORIES "/tmp/1/s/obj/a7/68/fa0b/build/f30476c3/cppan/a768fa0b;/tmp/1/s/src/a7/68/fa0b/src/liblzma/api;/tmp/1/s/src/a7/68/fa0b"
+      INTERFACE_LINK_LIBRARIES "m;pthread;rt;dl"
+    )gdfgfdg
+dfgdf
+)xxx");
+
+    auto e = get_end_of_string_block(s, 1);
+    REQUIRE(e == 1445);
+}
+
+int main(int argc, char **argv)
+{
+    auto rc = Catch::Session().run(argc, argv);
+    return rc;
+}

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,10 @@ int get_end_of_string_block(const String &s, int i)`
`29`	`29`
`30`	`30`	`if (c == '\"')`
`31`	`31`	`{`
`32`		`- if (n_quotes == 0)`
`33`		`- i = get_end_of_string_block(s.c_str(), i + 1) - 1;`
`34`		`- else if (s[i - 1] == '\\')`
	`32`	`+ if (i && s[i - 1] == '\\')`
`35`	`33`	`;`
	`34`	`+ else if (n_quotes == 0)`
	`35`	`+ i = get_end_of_string_block(s, i + 1) - 1;`
`36`	`36`	`else`
`37`	`37`	`n_quotes--;`
`38`	`38`	`}`
`@@ -42,7 +42,7 @@ int get_end_of_string_block(const String &s, int i)`
`42`	`42`	`{`
`43`	`43`	`case '(':`
`44`	`44`	`case '[':`
`45`		`- i = get_end_of_string_block(s.c_str(), i + 1) - 1;`
	`45`	`+ i = get_end_of_string_block(s, i + 1) - 1;`
`46`	`46`	`break;`
`47`	`47`	`case ')':`
`48`	`48`	`n_curly--;`