Fix path resolver and add debugging output

.github/workflows/build.yml

@@ -75,6 +75,7 @@ jobs:
           bun run codegen
           bun run meson-setup.clang-release
           meson compile -C build/ vs:executable
+          bun run test
       - name: Archive production artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -115,6 +116,7 @@ jobs:
           # Unclear fix to be investigated
           rm subprojects/libtcc/VERSION
           meson compile -C build/ vs:executable
+          bun run test
       - name: Archive production artifacts
         uses: actions/upload-artifact@v4
         with:

src/utils/paths.cpp

@@ -30,11 +30,20 @@ std::pair<bool, std::string> resolve_path::normalizer(const char *parent, const
     memset(ret+parent_len,0,child_len+1);
     memcpy(ret,parent,parent_len);
     int ptr = parent_len;
-    
+
     for(int j=0; j<child_len; ){
         if(tkn(child+j,"../")){
             //Go back to the past /
             if(ptr<=1)return {false, ""}; //Early failure, cannot track back.
+            if (j > 0) {
+                if (child[j-1] != '/') {
+                    uint8_t i = 0;
+                    for(;i<=sizeof "../";i++) {
+                        ret[ptr++] = child[j++];
+                    }
+                    continue;
+                }
+            }
             ptr-=2;
             for(;ret[ptr]!='/';ptr--);
             j+=3;
@@ -46,24 +55,17 @@ std::pair<bool, std::string> resolve_path::normalizer(const char *parent, const
             j+=2;   //Just skip this.
             continue;
         }
-        else if(child[j]=='/' && child[j+1]=='/'){
-            j++;
-            continue;
-        }
-        else if(child[j]=='/'){
+        else if(child[j]=='/' && j!=child_len-1){
             j++;
+            ret[ptr]='/';
+            ptr++;
         }
         else{
             ret[ptr]=child[j];
             ptr++;
             j++;
             continue;
         }
-
-        if(j!=child_len){
-            ret[ptr]='/';
-            ptr++;
-        }
     }
 
     //TODO: Stress test for potential unsafety
@@ -157,4 +159,4 @@ std::pair<resolve_path::reason_t::t,scoped_rpath_t> resolve_path::operator()(fro
     return {reason_t::MALFORMED,{rpath_type_t::NONE, ""}};
 }  
 
-}
+}

test/marginal/resolver-paths.cpp

@@ -6,10 +6,10 @@ using namespace vs;
 
 int test_normalizer(const char* expected, const char* parent, const char* child, bool allow_exit, bool base_dir){
     auto tmp = resolve_path::normalizer(parent,child,allow_exit,base_dir);
-    std::cout<<"╭<parent> "<<parent<<"\n";
-    std::cout<<"├<child>  "<<child<<"\n";
-    std::cout<<"├>        "<<tmp.second<<"\n";
-    std::cout<<"╰>>       "<<expected<<"\n";
+    std::cerr<<"╭<parent> "<<parent<<"\n";
+    std::cerr<<"├<child>  "<<child<<"\n";
+    std::cerr<<"├>        "<<tmp.second<<"\n";
+    std::cerr<<"╰>>       "<<expected<<"\n";
     //if(!tmp.first)return 1;
     if(tmp.second==expected){return 0;}
     else{
@@ -26,10 +26,11 @@ int main(){
     ret+=test_normalizer("/quick-js/ww/a", "/hello world/banana/", "./../.././quick-js/ww/a", true, false);
     ret+=test_normalizer("", "/hello world/banana/", "../../quick-js/ww/a", false, false);
     ret+=test_normalizer("", "/hello world/banana/", "./../.././quick-js/ww/a", false, false);
-    ret+=test_normalizer("/hello world/banana/ww/a", "/hello world/banana/", "quick-js/../quick-js/ww/a", false, false);
+    ret+=test_normalizer("/hello world/banana/quick-js/ww/a", "/hello world/banana/", "quick-js/../quick-js/ww/a", false, false);
     ret+=test_normalizer("/hello world/banana/ww/a", "/hello world/banana/", "quick-js/./.././ww/a", false, false);
     ret+=test_normalizer("/a/b../", "/a/", "b../", false, false);
 
-    assert(ret=0);
+    std::cerr<<"ret = "<<ret<<"\n";
+    assert(ret==0);
     return 0;
-}
+}