Merge pull request #205 from wrapl/dev

dev

Makefile

@@ -78,6 +78,10 @@ ifeq ($(PLATFORM), Linux)
 	objects += obj/targetwatch.o
 endif
 
+ifeq ($(PLATFORM), Android)
+	LDFLAGS += -Wl,--dynamic-list=src/exports.lst -ldl -lgc
+endif
+
 ifeq ($(PLATFORM), FreeBSD)
 	CFLAGS += -I/usr/local/include
 	LDFLAGS += -L/usr/local/lib -lgc-threaded

debian/changelog

@@ -1,4 +1,4 @@
-rabs (2.30.6) UNRELEASED; urgency=medium
+rabs (2.30.7) UNRELEASED; urgency=medium
 
   * Updates.
   * Updates.
@@ -57,5 +57,6 @@ rabs (2.30.6) UNRELEASED; urgency=medium
   * Updates.
   * Updates.
   * Updates.
+  * Updates.
 
- -- Raja Mukherji <raja@hinano>  Thu, 04 Apr 2024 08:30:50 +0100
+ -- Raja Mukherji <raja@hinano>  Mon, 15 Apr 2024 09:11:03 +0100

docs/library/context.rst

@@ -13,6 +13,11 @@ context
    A build context.
 
 
+:mini:`fun context(Path?: string): context`
+   If :mini:`Path` is provided then returns the context with path :mini:`Path` or :mini:`nil` is no such context has been defined.
+   Otherwise returns the current context.
+
+
 :mini:`meth (Context: context) :: (Name: string): symbol`
    Returns the symbol :mini:`Name` resolved in :mini:`Context`.
 

docs/library/general.rst

@@ -33,11 +33,6 @@ general
    Builds a shell command from :mini:`Command..` and executes it,  capturing the output. Returns the captured output on success or raises an error.
 
 
-:mini:`fun context(Path?: string): context`
-   If :mini:`Path` is provided then returns the context with path :mini:`Path` or :mini:`nil` is no such context has been defined.
-   Otherwise returns the current context.
-
-
 :mini:`fun execv(Command: list): nil | error`
    Similar to :mini:`execute()` but expects a list of individual arguments instead of letting the shell split the command line.
 

src/context.c

@@ -15,8 +15,23 @@
 static stringmap_t ContextCache[1] = {STRINGMAP_INIT};
 static ml_value_t *DefaultString;
 
-ML_TYPE(ContextT, (MLAnyT), "context");
+ML_FUNCTION(Context) {
+//<Path?:string
+//>context
+// If :mini:`Path` is provided then returns the context with path :mini:`Path` or :mini:`nil` is no such context has been defined.
+// Otherwise returns the current context.
+	if (Count > 0) {
+		ML_CHECK_ARG_TYPE(0, MLStringT);
+		return (ml_value_t *)context_find(ml_string_value(Args[0])) ?: MLNil;
+	} else {
+		return (ml_value_t *)CurrentContext;
+	}
+}
+
+ML_TYPE(ContextT, (MLAnyT), "context",
 // A build context.
+	.Constructor = (ml_value_t *)Context
+);
 
 context_t *context_find(const char *Name) {
 	return stringmap_search(ContextCache, Name);

src/context.h

@@ -15,6 +15,8 @@ struct context_t {
 	stringmap_t Locals[1];
 };
 
+extern ml_type_t ContextT[];
+
 void context_init();
 
 context_t *context_find(const char *Name);

src/rabs.c

@@ -315,19 +315,6 @@ ML_FUNCTION(Vmount) {
 	return MLNil;
 }
 
-ML_FUNCTION(Context) {
-//<Path?:string
-//>context
-// If :mini:`Path` is provided then returns the context with path :mini:`Path` or :mini:`nil` is no such context has been defined.
-// Otherwise returns the current context.
-	if (Count > 0) {
-		ML_CHECK_ARG_TYPE(0, MLStringT);
-		return (ml_value_t *)context_find(ml_string_value(Args[0])) ?: MLNil;
-	} else {
-		return (ml_value_t *)CurrentContext;
-	}
-}
-
 #ifdef __MINGW32__
 #define WIFEXITED(Status) (((Status) & 0x7f) == 0)
 #define WEXITSTATUS(Status) (((Status) & 0xff00) >> 8)
@@ -923,7 +910,7 @@ int main(int Argc, char **Argv) {
 	stringmap_insert(Globals, "symbol", SymbolT);
 	stringmap_insert(Globals, "scan", ScanT);
 	stringmap_insert(Globals, "include", Include);
-	stringmap_insert(Globals, "context", Context);
+	stringmap_insert(Globals, "context", ContextT);
 	stringmap_insert(Globals, "execute", Execute);
 	stringmap_insert(Globals, "shell", Shell);
 	stringmap_insert(Globals, "execv", Execv);

src/rabs.h

@@ -30,7 +30,7 @@ extern __thread target_t *CurrentTarget;
 ml_value_t *rabs_global(const char *Name);
 ml_value_t *rabs_ml_global(void *Data, const char *Name, const char *Source, int Line, int Mode);
 
-#define CURRENT_VERSION 2, 30, 6
+#define CURRENT_VERSION 2, 30, 7
 #define MINIMAL_VERSION 2, 10, 0
 
 #endif

src/vfs.c

@@ -79,7 +79,7 @@ char *vfs_unsolve(const char *Path) {
 	while (Mount) {
 		//printf("%s -> %s\n", Mount->Path, Mount->Target);
 		const char *Suffix = match_prefix(Path, Mount->Target);
-		if (Suffix) Path = concat(Mount->Path, Suffix, NULL);
+		if (Suffix) Path = vfs_unsolve(concat(Mount->Path, Suffix, NULL));
 		Mount = Mount->Previous;
 	}
 	if (Path == Orig) Path = concat(Path, NULL);