Fixed bug in parsing of paths on Unix.

StanzaOrg · Jul 30, 2024 · b93c6f6 · b93c6f6
2 parents c305b7b + 84e737a
commit b93c6f6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/compiler/params.stanza b/compiler/params.stanza
@@ -18,7 +18,7 @@ public defn compiler-flags () :
   to-tuple(COMPILE-FLAGS)
 
 ;========= Stanza Configuration ========
-public val STANZA-VERSION = [0 18 89]
+public val STANZA-VERSION = [0 18 90]
 public var STANZA-INSTALL-DIR:String = ""
 public var OUTPUT-PLATFORM:Symbol = `platform
 public var STANZA-PKG-DIRS:List<String> = List()

diff --git a/compiler/proj-normalization.stanza b/compiler/proj-normalization.stanza
@@ -37,8 +37,9 @@ public defn normalize (v:ProjValue,
                        current-platform:Symbol,
                        current-link-type:Symbol,
                        workdir:String,
+                       stanzadir:String,
                        proj-path:String) -> ProjValue :
-  val dirtable = SpecialDirTable(workdir, proj-path)
+  val dirtable = SpecialDirTable(proj-path, workdir = workdir, stanzadir = stanzadir)
   normalize(v, current-platform, current-link-type, dirtable)
 
 ;============================================================

diff --git a/compiler/proj.stanza b/compiler/proj.stanza
@@ -65,7 +65,7 @@ public defn read-proj-files (filenames:Seqable<String>,
     fn (v, t:ValueType, projpath:String, errors:Vector<ProjFileError>) -> ProjValue :
       v $> translate-to-proj-value
         $> variable-substitution{_, vartable, errors}
-        $> normalize{_, platform, link-type, workdir(env), projpath}
+        $> normalize{_, platform, link-type, workdir(env), stanzadir(env), projpath}
 
   ;Stage: Finish all postprocessing stages to get files into final form.
   defn sub-variables-and-finish-processing (files:Tuple<ProjFileS0>,

diff --git a/core/parsed-path.stanza b/core/parsed-path.stanza
@@ -163,12 +163,8 @@ defmethod parse-path (path:String, platform:OS-X|Linux) -> ParsedPath :
           make-path-element()
           loop(i + 1)
         '\\' :
-          if i + 1 < len :
-            add(buffer, path[i + 1])
-            loop(i + 2)
-          else :
-            add(buffer, c)
-            loop(i + 1)
+          make-path-element()
+          loop(i + 1)
         else :
           add(buffer, c)
           loop(i + 1)