kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

feat(defs): deterministic function ordering

Browse Source
This commit is contained in:
tamasfe 2022-07-26 14:42:30 +02:00
parent ade818b043
commit 6d4b5095d2
3 changed files with 1918 additions and 1910 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/definitions/.rhai/definitions/__builtin-operators__.d.rhai
View File

@ -242,10 +242,10 @@ op -=(String, char);
op +=(char, String); op +=(char, String);
op +=(char, char); op +=(char, char);
op +=(arraArray, item: Array); op +=(arraArray, Array);
op +=(arraArray, item: ?); op +=(arraArray, ?);
op +=(Blob, Blob); op +=(Blob, Blob);
op +=(Blob, value: i64); op +=(Blob, i64);
op +=(Blob, char); op +=(Blob, char);
op +=(Blob, String); op +=(Blob, String);

3808
examples/definitions/.rhai/definitions/__static__.d.rhai
View File

File diff suppressed because it is too large Load Diff

12
src/api/definitions/mod.rs
View File

@ -1,7 +1,7 @@
use crate::{ use crate::{
module::FuncInfo, plugin::*, tokenizer::is_valid_function_name, Engine, Module, Scope, module::FuncInfo, plugin::*, tokenizer::is_valid_function_name, Engine, Module, Scope,
}; };
use core::{fmt, iter}; use core::{cmp::Ordering, fmt, iter};
#[cfg(feature = "no_std")] #[cfg(feature = "no_std")]
use std::prelude::v1::*; use std::prelude::v1::*;
@ -223,7 +223,15 @@ impl Module {
} }
let mut func_infos = self.iter_fn().collect::<Vec<_>>(); let mut func_infos = self.iter_fn().collect::<Vec<_>>();
func_infos.sort_by(|a, b| a.metadata.name.cmp(&b.metadata.name)); func_infos.sort_by(|a, b| match a.metadata.name.cmp(&b.metadata.name) {
Ordering::Equal => match a.metadata.params.cmp(&b.metadata.params) {
Ordering::Equal => (a.metadata.params_info.join("")
+ a.metadata.return_type.as_str())
.cmp(&(b.metadata.params_info.join("") + b.metadata.return_type.as_str())),
o => o,
},
o => o,
});
for f in func_infos { for f in func_infos {
if !first { if !first {