Merge pull request #415 from schungx/master

Minor updates.
rhaiscript · May 25, 2021 · 9a54fd6 · 9a54fd6
2 parents 5c00b89 + c6ee200
commit 9a54fd6
Show file tree

Hide file tree

Showing 31 changed files with 1,243 additions and 1,061 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,25 +4,34 @@ Rhai Release Notes
 Version 0.20.2
 ==============
 
+This version adds a number of convenience features:
+
+* Ability for a `Dynamic` to hold an `i32` _tag_ of arbitrary data
+
+* Simplifies dynamic properties access by falling back to an indexer (passing the name of the property as a string) when a property is not found.
+
 Bug fixes
 ---------
 
-* Constant propagation during optimization for constants held in a custom scope now works properly instead of always replacing by `()`.
+* Propagation of constants held in a custom scope now works properly instead of always replacing by `()`.
 
 Breaking changes
 ----------------
 
 * `Engine::disable_doc_comments` is removed because doc-comments are now placed under the `metadata` feature flag.
 * Registering a custom syntax now only requires specifying whether the `Scope` is adjusted (i.e. whether variables are added or removed). There is no need to specify the number of variables added/removed.
 * Assigning to a property of a constant is now allowed and no longer raise an `EvalAltResult::ErrorAssignmentToConstant` error. This is to facilitate the Singleton pattern. Registered setter functions are automatically guarded against setters calling on constants and will continue to raise errors unless the `pure` attribute is present (for plugins).
+* If a property getter/setter is not found, an indexer with string index, if any, is tried.
+* The indexers API (`Engine::register_indexer_XXX` and `Module::set_indexer_XXX`) are now also exposed under `no_index`.
 
 New features
 ------------
 
-* Each `Dynamic` value can now contain arbitrary data (type `i16`) in the form of a _tag_. This is to use up otherwise wasted space in the `Dynamic` type.
+* Each `Dynamic` value can now contain arbitrary data (type `i32`) in the form of a _tag_. This is to use up otherwise wasted space in the `Dynamic` type.
 * A new internal feature `no_smartstring` to turn off `SmartString` for those rare cases that it is needed.
 * `DynamicReadLock` and `DynamicWriteLoc` are exposed under `internals`.
 * `From<Shared<Locked<Dynamic>>>` is added for `Dynamic` mapping directly to a shared value, together with support for `Dynamic::from`.
+* An indexer with string index acts as a _fallback_ to a property getter/setter.
 
 Enhancements
 ------------

diff --git a/Cargo.toml b/Cargo.toml
@@ -92,7 +92,7 @@ default_features = false
 optional = true
 
 [dependencies.rust_decimal]
-version = "1.13"
+version = "1.14"
 default_features = false
 features = ["maths"]
 optional = true

diff --git a/scripts/fibonacci.rhai b/scripts/fibonacci.rhai
@@ -6,7 +6,7 @@ const REPEAT = 5;
 
 fn fib(n) {
     if n < 2 {
-         n
+        n
     } else {
         fib(n-1) + fib(n-2)
     }
@@ -19,7 +19,7 @@ let result;
 let now = timestamp();
 
 for n in range(0, REPEAT) {
-	result = fib(TARGET);
+    result = fib(TARGET);
 }
 
 print(`Finished. Run time = ${now.elapsed} seconds.`);

diff --git a/scripts/loop.rhai b/scripts/loop.rhai
@@ -8,7 +8,7 @@ loop {
 
     x -= 1;
 
-	if x <= 0 { break; }
+    if x <= 0 { break; }
 }
 
 export x as foo;
diff --git a/scripts/mat_mul.rhai b/scripts/mat_mul.rhai
@@ -1,13 +1,13 @@
 const SIZE = 50;
 
 fn new_mat(x, y) {
-	let row = [];
-	row.pad(y, 0.0);
-	
-	let matrix = [];
-	matrix.pad(x, row);
-	
-	matrix
+    let row = [];
+    row.pad(y, 0.0);
+    
+    let matrix = [];
+    matrix.pad(x, row);
+    
+    matrix
 }
 
 fn mat_gen() {
@@ -20,13 +20,13 @@ fn mat_gen() {
             m[i][j] = tmp * (i - j) * (i + j);
         }
     }
-	
+    
     m
 }
 
 fn mat_mul(a, b) {
     let b2 = new_mat(a[0].len, b[0].len);
-	
+    
     for i in range(0, a[0].len) {
         for j in range(0, b[0].len) {
             b2[j][i] = b[i][j];
@@ -35,13 +35,13 @@ fn mat_mul(a, b) {
 
     let c = new_mat(a.len, b[0].len);
 
-	for i in range(0, c.len) {
-		for j in range(0, c[i].len) {
-			c[i][j] = 0.0;
-			
-			for z in range(0, a[i].len) {
-				c[i][j] += a[i][z] * b2[j][z];
-			}
+    for i in range(0, c.len) {
+        for j in range(0, c[i].len) {
+            c[i][j] = 0.0;
+            
+            for z in range(0, a[i].len) {
+                c[i][j] += a[i][z] * b2[j][z];
+            }
         }
     }
 
@@ -56,7 +56,7 @@ const c = mat_mul(a, b);
 
 /*
 for i in range(0, SIZE) {
-	print(c[i]);
+    print(c[i]);
 }
 */
 

diff --git a/scripts/strings_map.rhai b/scripts/strings_map.rhai
@@ -5,98 +5,98 @@ let now = timestamp();
 let adverbs = [ "moderately", "really", "slightly", "very" ];
 
 let adjectives = [
-  "abandoned", "able", "absolute", "academic", "acceptable", "acclaimed",
-  "accomplished", "accurate", "aching", "acidic", "acrobatic", "active",
-  "actual", "adept", "admirable", "admired", "adolescent", "adorable", "adored",
-  "advanced", "adventurous", "affectionate", "afraid", "aged", "aggravating",
-  "aggressive", "agile", "agitated", "agonizing", "agreeable", "ajar",
-  "alarmed", "alarming", "alert", "alienated", "alive", "all", "altruistic",
-  "amazing", "ambitious", "ample", "amused", "amusing", "anchored", "ancient",
-  "angelic", "angry", "anguished", "animated", "annual", "another", "antique",
-  "anxious", "any", "apprehensive", "appropriate", "apt", "arctic", "arid",
-  "aromatic", "artistic", "ashamed", "assured", "astonishing", "athletic",
-  "attached", "attentive", "attractive", "austere", "authentic", "authorized",
-  "automatic", "avaricious", "average", "aware", "awesome", "awful", "awkward",
-  "babyish", "back", "bad", "baggy", "bare", "barren", "basic", "beautiful",
-  "belated", "beloved", "beneficial", "best", "better", "bewitched", "big",
-  "big-hearted", "biodegradable", "bite-sized", "bitter", "black",
-  "black-and-white", "bland", "blank", "blaring", "bleak", "blind", "blissful",
-  "blond", "blue", "blushing", "bogus", "boiling", "bold", "bony", "boring",
-  "bossy", "both", "bouncy", "bountiful", "bowed", "brave", "breakable",
-  "brief", "bright", "brilliant", "brisk", "broken", "bronze", "brown",
-  "bruised", "bubbly", "bulky", "bumpy", "buoyant", "burdensome", "burly",
-  "bustling", "busy", "buttery", "buzzing", "calculating", "calm", "candid",
-  "canine", "capital", "carefree", "careful", "careless", "caring", "cautious",
-  "cavernous", "celebrated", "charming", "cheap", "cheerful", "cheery", "chief",
-  "chilly", "chubby", "circular", "classic", "clean", "clear", "clear-cut",
-  "clever", "close", "closed", "cloudy", "clueless", "clumsy", "cluttered",
-  "coarse", "cold", "colorful", "colorless", "colossal", "comfortable",
-  "common", "compassionate", "competent", "complete", "complex", "complicated",
-  "composed", "concerned", "concrete", "confused", "conscious", "considerate",
-  "constant", "content", "conventional", "cooked", "cool", "cooperative",
-  "coordinated", "corny", "corrupt", "costly", "courageous", "courteous",
-  "crafty"
+    "abandoned", "able", "absolute", "academic", "acceptable", "acclaimed",
+    "accomplished", "accurate", "aching", "acidic", "acrobatic", "active",
+    "actual", "adept", "admirable", "admired", "adolescent", "adorable", "adored",
+    "advanced", "adventurous", "affectionate", "afraid", "aged", "aggravating",
+    "aggressive", "agile", "agitated", "agonizing", "agreeable", "ajar",
+    "alarmed", "alarming", "alert", "alienated", "alive", "all", "altruistic",
+    "amazing", "ambitious", "ample", "amused", "amusing", "anchored", "ancient",
+    "angelic", "angry", "anguished", "animated", "annual", "another", "antique",
+    "anxious", "any", "apprehensive", "appropriate", "apt", "arctic", "arid",
+    "aromatic", "artistic", "ashamed", "assured", "astonishing", "athletic",
+    "attached", "attentive", "attractive", "austere", "authentic", "authorized",
+    "automatic", "avaricious", "average", "aware", "awesome", "awful", "awkward",
+    "babyish", "back", "bad", "baggy", "bare", "barren", "basic", "beautiful",
+    "belated", "beloved", "beneficial", "best", "better", "bewitched", "big",
+    "big-hearted", "biodegradable", "bite-sized", "bitter", "black",
+    "black-and-white", "bland", "blank", "blaring", "bleak", "blind", "blissful",
+    "blond", "blue", "blushing", "bogus", "boiling", "bold", "bony", "boring",
+    "bossy", "both", "bouncy", "bountiful", "bowed", "brave", "breakable",
+    "brief", "bright", "brilliant", "brisk", "broken", "bronze", "brown",
+    "bruised", "bubbly", "bulky", "bumpy", "buoyant", "burdensome", "burly",
+    "bustling", "busy", "buttery", "buzzing", "calculating", "calm", "candid",
+    "canine", "capital", "carefree", "careful", "careless", "caring", "cautious",
+    "cavernous", "celebrated", "charming", "cheap", "cheerful", "cheery", "chief",
+    "chilly", "chubby", "circular", "classic", "clean", "clear", "clear-cut",
+    "clever", "close", "closed", "cloudy", "clueless", "clumsy", "cluttered",
+    "coarse", "cold", "colorful", "colorless", "colossal", "comfortable",
+    "common", "compassionate", "competent", "complete", "complex", "complicated",
+    "composed", "concerned", "concrete", "confused", "conscious", "considerate",
+    "constant", "content", "conventional", "cooked", "cool", "cooperative",
+    "coordinated", "corny", "corrupt", "costly", "courageous", "courteous",
+    "crafty"
 ];
 
 let animals = [
-  "aardvark", "african buffalo", "albatross", "alligator", "alpaca", "ant",
-  "anteater", "antelope", "ape", "armadillo", "baboon", "badger", "barracuda",
-  "bat", "bear", "beaver", "bee", "bison", "black panther", "blue jay", "boar",
-  "butterfly", "camel", "capybara", "carduelis", "caribou", "cassowary", "cat",
-  "caterpillar", "cattle", "chamois", "cheetah", "chicken", "chimpanzee",
-  "chinchilla", "chough", "clam", "cobra", "cockroach", "cod", "cormorant",
-  "coyote", "crab", "crane", "crocodile", "crow", "curlew", "deer", "dinosaur",
-  "dog", "dolphin", "domestic pig", "donkey", "dotterel", "dove", "dragonfly",
-  "duck", "dugong", "dunlin", "eagle", "echidna", "eel", "elephant seal",
-  "elephant", "elk", "emu", "falcon", "ferret", "finch", "fish", "flamingo",
-  "fly", "fox", "frog", "gaur", "gazelle", "gerbil", "giant panda", "giraffe",
-  "gnat", "goat", "goldfish", "goose", "gorilla", "goshawk", "grasshopper",
-  "grouse", "guanaco", "guinea fowl", "guinea pig", "gull", "hamster", "hare",
-  "hawk", "hedgehog", "heron", "herring", "hippopotamus", "hornet", "horse",
-  "human", "hummingbird", "hyena", "ibex", "ibis", "jackal", "jaguar", "jay",
-  "jellyfish", "kangaroo", "kingfisher", "koala", "komodo dragon", "kookabura",
-  "kouprey", "kudu", "lapwing", "lark", "lemur", "leopard", "lion", "llama",
-  "lobster", "locust", "loris", "louse", "lyrebird", "magpie", "mallard",
-  "manatee", "mandrill", "mantis", "marten", "meerkat", "mink", "mole",
-  "mongoose", "monkey", "moose", "mosquito", "mouse", "mule", "narwhal", "newt",
-  "nightingale", "octopus", "okapi", "opossum", "oryx", "ostrich", "otter",
-  "owl", "oyster", "parrot", "partridge", "peafowl", "pelican", "penguin",
-  "pheasant", "pigeon", "pinniped", "polar bear", "pony", "porcupine",
-  "porpoise", "prairie dog", "quail", "quelea", "quetzal", "rabbit", "raccoon",
-  "ram", "rat", "raven", "red deer", "red panda", "reindeer", "rhinoceros",
-  "rook", "salamander", "salmon", "sand dollar", "sandpiper", "sardine",
-  "scorpion", "sea lion", "sea urchin", "seahorse", "shark", "sheep", "shrew",
-  "skunk", "snail", "snake", "sparrow", "spider", "spoonbill", "squid",
-  "wallaby", "wildebeest"
+    "aardvark", "african buffalo", "albatross", "alligator", "alpaca", "ant",
+    "anteater", "antelope", "ape", "armadillo", "baboon", "badger", "barracuda",
+    "bat", "bear", "beaver", "bee", "bison", "black panther", "blue jay", "boar",
+    "butterfly", "camel", "capybara", "carduelis", "caribou", "cassowary", "cat",
+    "caterpillar", "cattle", "chamois", "cheetah", "chicken", "chimpanzee",
+    "chinchilla", "chough", "clam", "cobra", "cockroach", "cod", "cormorant",
+    "coyote", "crab", "crane", "crocodile", "crow", "curlew", "deer", "dinosaur",
+    "dog", "dolphin", "domestic pig", "donkey", "dotterel", "dove", "dragonfly",
+    "duck", "dugong", "dunlin", "eagle", "echidna", "eel", "elephant seal",
+    "elephant", "elk", "emu", "falcon", "ferret", "finch", "fish", "flamingo",
+    "fly", "fox", "frog", "gaur", "gazelle", "gerbil", "giant panda", "giraffe",
+    "gnat", "goat", "goldfish", "goose", "gorilla", "goshawk", "grasshopper",
+    "grouse", "guanaco", "guinea fowl", "guinea pig", "gull", "hamster", "hare",
+    "hawk", "hedgehog", "heron", "herring", "hippopotamus", "hornet", "horse",
+    "human", "hummingbird", "hyena", "ibex", "ibis", "jackal", "jaguar", "jay",
+    "jellyfish", "kangaroo", "kingfisher", "koala", "komodo dragon", "kookabura",
+    "kouprey", "kudu", "lapwing", "lark", "lemur", "leopard", "lion", "llama",
+    "lobster", "locust", "loris", "louse", "lyrebird", "magpie", "mallard",
+    "manatee", "mandrill", "mantis", "marten", "meerkat", "mink", "mole",
+    "mongoose", "monkey", "moose", "mosquito", "mouse", "mule", "narwhal", "newt",
+    "nightingale", "octopus", "okapi", "opossum", "oryx", "ostrich", "otter",
+    "owl", "oyster", "parrot", "partridge", "peafowl", "pelican", "penguin",
+    "pheasant", "pigeon", "pinniped", "polar bear", "pony", "porcupine",
+    "porpoise", "prairie dog", "quail", "quelea", "quetzal", "rabbit", "raccoon",
+    "ram", "rat", "raven", "red deer", "red panda", "reindeer", "rhinoceros",
+    "rook", "salamander", "salmon", "sand dollar", "sandpiper", "sardine",
+    "scorpion", "sea lion", "sea urchin", "seahorse", "shark", "sheep", "shrew",
+    "skunk", "snail", "snake", "sparrow", "spider", "spoonbill", "squid",
+    "wallaby", "wildebeest"
 ];
 
 let keys = [];
 
 for animal in animals {
-  for adjective in adjectives {
-    for adverb in adverbs {
-      keys.push(`${adverb} ${adjective} ${animal}`)
+    for adjective in adjectives {
+        for adverb in adverbs {
+            keys.push(`${adverb} ${adjective} ${animal}`)
+        }
     }
-  }
 }
 
 let map = #{};
 
 let i = 0;
 
 for key in keys {
-  map[key] = i;
-  i += 1;
+    map[key] = i;
+    i += 1;
 }
 
 let sum = 0;
 
 for key in keys {
-  sum += map[key];
+    sum += map[key];
 }
 
 for key in keys {
-  map.remove(key);
+    map.remove(key);
 }
 
 print(`Sum = ${sum}`);