Merge pull request #210 from wrapl/dev

dev
wrapl · Jul 20, 2024 · 189ed79 · 189ed79
2 parents 53adc72 + dfa6828
commit 189ed79
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,4 +1,4 @@
-rabs (2.30.12) UNRELEASED; urgency=medium
+rabs (2.30.14) UNRELEASED; urgency=medium
 
   * Updates.
   * Updates.
@@ -63,5 +63,7 @@ rabs (2.30.12) UNRELEASED; urgency=medium
   * Updates.
   * Updates.
   * Updates.
+  * Updates.
+  * Updates.
 
- -- Raja Mukherji <raja@hinano>  Mon, 15 Jul 2024 18:39:00 +0100
+ -- Raja Mukherji <raja@hinano>  Sat, 20 Jul 2024 23:52:10 +0100
diff --git a/minilang b/minilang
diff --git a/src/rabs.c b/src/rabs.c
@@ -61,15 +61,10 @@ static long rabs_property_hash(rabs_property_t *Property, ml_hash_chain_t *Chain
 }
 
 static ml_value_t *rabs_property_deref(rabs_property_t *Property) {
-	ml_value_t *Value = context_symb_get(CurrentContext, Property->Name);
-	if (Value) {
-		if (CurrentTarget) {
-			target_depends_auto(target_symb_new(CurrentContext, Property->Name));
-		}
-		return Value;
-	} else {
-		return stringmap_search(Globals, Property->Name) ?: MLNil; //ml_error("NameError", "%s undefined", Name);
-	}
+	ml_value_t *Value = context_symb_get(CurrentContext, Property->Name) ?:
+		stringmap_search(Globals, Property->Name) ?: MLNil;
+	if (CurrentTarget) target_depends_auto(target_symb_new(CurrentContext, Property->Name));
+	return Value;
 }
 
 static void rabs_property_assign(ml_state_t *Caller, rabs_property_t *Property, ml_value_t *Value) {

diff --git a/src/rabs.h b/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, 12
+#define CURRENT_VERSION 2, 30, 14
 #define MINIMAL_VERSION 2, 10, 0
 
 #endif