Skip to content

Commit

Permalink
cleanup and new version
Browse files Browse the repository at this point in the history
  • Loading branch information
melsman committed Jan 3, 2024
1 parent e01603d commit a312f16
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 39 deletions.
4 changes: 3 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
## MLKit NEWS

### MLKit version 4.7.8 is released

* mael 2023-12-29: Cleanup and ensurance that mlkit does not write
into the installation directory when the repl is launched or when
into the installation directory when the REPL is launched or when
linking with compiled versions of the SML Basis Library (PR #158).

* mael 2023-12-29: MacOS Sonoma / Xcode 15 support.
Expand Down
61 changes: 24 additions & 37 deletions basis/OS_PATH.sml
Original file line number Diff line number Diff line change
Expand Up @@ -5,42 +5,29 @@ signature OS_PATH =
exception Path
exception InvalidArc

val parentArc : string
val currentArc : string
val fromString : string -> {isAbs : bool,
vol : string,
arcs : string list
}
val toString : {isAbs : bool,
vol : string,
arcs : string list
} -> string

val parentArc : string
val currentArc : string
val fromString : string -> {isAbs: bool, vol: string, arcs: string list}
val toString : {isAbs: bool, vol: string, arcs: string list} -> string
val validVolume : {isAbs: bool, vol: string} -> bool

val getVolume : string -> string
val getParent : string -> string

val splitDirFile : string -> {dir: string, file: string}
val joinDirFile : {dir : string, file : string} -> string
val dir : string -> string
val file : string -> string

val splitBaseExt : string -> {base: string, ext: string option}
val joinBaseExt : {base: string, ext: string option} -> string
val base : string -> string
val ext : string -> string option

val mkCanonical : string -> string
val isCanonical : string -> bool
val mkAbsolute : {path: string, relativeTo: string} -> string
val mkRelative : {path: string, relativeTo: string} -> string
val isAbsolute : string -> bool
val isRelative : string -> bool
val isRoot : string -> bool

val concat : string * string -> string

val fromUnixPath : string -> string
val toUnixPath : string -> string
end
Expand Down Expand Up @@ -117,7 +104,7 @@ Here are some examples for Unix paths:
"a/b/" "a/b/.."
".." "../.."
"." ".."
"" ".."
"" ".."
[splitDirFile path] splits the string path path into its directory and
file parts, where the file part is defined to be the last arc. The
Expand Down Expand Up @@ -156,15 +143,15 @@ base part.
Here are some examples for Unix paths:
path splitBaseExt path
"" {base = "", ext = NONE}
".login" {base = ".login", ext = NONE}
"/.login" {base = "/.login", ext = NONE}
"a" {base = "a", ext = NONE}
"a." {base = "a.", ext = NONE}
"a.b" {base = "a", ext = SOME "b"}
"a.b.c" {base = "a.b", ext = SOME "c"}
".news/comp" {base = ".news/comp", ext = NONE}
path splitBaseExt path
"" {base = "", ext = NONE}
".login" {base = ".login", ext = NONE}
"/.login" {base = "/.login", ext = NONE}
"a" {base = "a", ext = NONE}
"a." {base = "a.", ext = NONE}
"a.b" {base = "a", ext = SOME "b"}
"a.b.c" {base = "a.b", ext = SOME "c"}
".news/comp" {base = ".news/comp", ext = NONE}
[joinBaseExt {base, ext}] returns an arc composed of the base name and
the extension (if different from NONE). It is a left inverse of
Expand Down Expand Up @@ -225,19 +212,19 @@ greater than String.maxSize.
Here are some examples for Unix paths:
path relativeTo mkRelative{path, relativeTo}
"a/b" "/c/d" "a/b"
"a/b" "/c/d" "a/b"
"/" "/a/b/c" "../../.."
"/a/b/" "/a/c" "../b/"
"/a/b" "/a/c" "../b"
"/a/b/" "/a/c" "../b/"
"/a/b" "/a/c" "../b"
"/a/b/" "/a/c/" "../b/"
"/a/b" "/a/c/" "../b"
"/" "/" "."
"/" "/." "."
"/" "/.." "."
"/a/b/../c" "/a/d" "../b/../c"
"/a/b" "/c/d" "../../a/b"
"/c/a/b" "/c/d" "../a/b"
"/c/d/a/b" "/c/d" "a/b"
"/" "/" "."
"/" "/." "."
"/" "/.." "."
"/a/b/../c" "/a/d" "../b/../c"
"/a/b" "/c/d" "../../a/b"
"/c/a/b" "/c/d" "../a/b"
"/c/d/a/b" "/c/d" "a/b"
[isAbsolute path]
[isRelative path]
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT(MLKit, [v4.7.7])
AC_INIT(MLKit, [v4.7.8])
AC_CONFIG_HEADERS([src/config.h])
AC_REVISION($Revision$)
AC_CONFIG_FILES([src/Runtime/Makefile
Expand Down

0 comments on commit a312f16

Please sign in to comment.