fprime-fpp-python 3.3.16__tar.gz → 3.3.17__tar.gz

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/Cargo.lock

@@ -352,7 +352,7 @@ dependencies = [
 
 [[package]]
 name = "fpp"
-version = "3.3.16"
+version = "3.3.17"
 dependencies = [
  "fpp_analysis",
  "fpp_core",
@@ -363,7 +363,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_analysis"
-version = "3.3.16"
+version = "3.3.17"
 dependencies = [
  "fpp_ast",
  "fpp_core",
@@ -378,7 +378,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_ast"
-version = "3.3.16"
+version = "3.3.17"
 dependencies = [
  "fpp_core",
  "fpp_macros",
@@ -386,7 +386,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_core"
-version = "3.3.16"
+version = "3.3.17"
 dependencies = [
  "line-index",
  "rustc-hash 2.1.1",
@@ -395,7 +395,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_diagram"
-version = "3.3.16"
+version = "3.3.17"
 dependencies = [
  "clap",
  "fpp_analysis",
@@ -412,7 +412,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_errors"
-version = "3.3.16"
+version = "3.3.17"
 dependencies = [
  "annotate-snippets",
  "anstream",
@@ -421,7 +421,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_format"
-version = "3.3.16"
+version = "3.3.17"
 dependencies = [
  "clap",
  "fpp_lsp_parser",
@@ -430,14 +430,14 @@ dependencies = [
 
 [[package]]
 name = "fpp_fs"
-version = "3.3.16"
+version = "3.3.17"
 dependencies = [
  "fpp_core",
 ]
 
 [[package]]
 name = "fpp_lexer"
-version = "3.3.16"
+version = "3.3.17"
 dependencies = [
  "memchr",
  "pretty_assertions",
@@ -446,7 +446,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_lsp_parser"
-version = "3.3.16"
+version = "3.3.17"
 dependencies = [
  "drop_bomb",
  "fpp_lexer",
@@ -456,7 +456,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_lsp_server"
-version = "3.3.16"
+version = "3.3.17"
 dependencies = [
  "anyhow",
  "clap",
@@ -485,7 +485,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_macros"
-version = "3.3.16"
+version = "3.3.17"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -495,7 +495,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_parser"
-version = "3.3.16"
+version = "3.3.17"
 dependencies = [
  "fpp_ast",
  "fpp_core",
@@ -508,7 +508,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_python"
-version = "3.3.16"
+version = "3.3.17"
 dependencies = [
  "fpp_analysis",
  "fpp_ast",
@@ -523,7 +523,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_python_bindgen"
-version = "3.3.16"
+version = "3.3.17"
 dependencies = [
  "rustdoc-json",
  "rustdoc-types",
@@ -533,7 +533,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_python_macros"
-version = "3.3.16"
+version = "3.3.17"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -542,7 +542,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_util"
-version = "3.3.16"
+version = "3.3.17"
 
 [[package]]
 name = "getopts"

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/Cargo.toml

@@ -4,7 +4,7 @@ members = ["fpp_analysis", "fpp_ast", "fpp_core", "fpp_errors", "fpp_fs", "fpp_l
 resolver = "2"
 
 [workspace.package]
-version = "3.3.16"
+version = "3.3.17"
 edition = "2024"
 authors = ["Andrei Tumbar"]
 license = "Apache-2.0"

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fprime-fpp-python
-Version: 3.3.16
+Version: 3.3.17
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development :: Compilers

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_analysis/Cargo.toml

@@ -13,11 +13,11 @@ repository.workspace = true
 disabled-tests = []
 
 [dependencies]
-fpp_ast = { path = "../fpp_ast", version = "=3.3.16" }
-fpp_core = { path = "../fpp_core", version = "=3.3.16" }
-fpp_util = { path = "../fpp_util", version = "=3.3.16" }
-fpp_macros = { path = "../fpp_macros", version = "=3.3.16" }
-fpp_parser = { path = "../fpp_parser", version = "=3.3.16" }
+fpp_ast = { path = "../fpp_ast", version = "=3.3.17" }
+fpp_core = { path = "../fpp_core", version = "=3.3.17" }
+fpp_util = { path = "../fpp_util", version = "=3.3.17" }
+fpp_macros = { path = "../fpp_macros", version = "=3.3.17" }
+fpp_parser = { path = "../fpp_parser", version = "=3.3.17" }
 rustc-hash = "2.1.1"
 
 [dev-dependencies]

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_analysis/src/passes/check_expr_types.rs

@@ -384,7 +384,7 @@ impl<'ast> Visitor<'ast> for CheckExprTypes<'ast> {
                 };
 
                 match e_ty.as_anon_struct() {
-                    Some(anon_struct) => match anon_struct.members.get(&id.data) {
+                    Some(anon_struct) => match anon_struct.get_member(&id.data) {
                         None => {
                             SemanticError::InvalidType {
                                 loc: id.span(),
@@ -428,13 +428,13 @@ impl<'ast> Visitor<'ast> for CheckExprTypes<'ast> {
                 }
             }
             ExprKind::Struct(struct_expr) => {
-                let mut members_out = HashMap::default();
+                let mut members_out = Vec::default();
                 let mut member_locs = HashMap::default();
 
                 for member in struct_expr {
                     match a.type_map.get(&member.value.node_id) {
                         Some(member_ty) => {
-                            members_out.insert(member.name.data.clone(), member_ty.clone());
+                            members_out.push((member.name.data.clone(), member_ty.clone()));
                             if let Some(old_member) =
                                 member_locs.insert(member.name.data.clone(), member.value.span())
                             {
@@ -510,7 +510,7 @@ impl<'ast> Visitor<'ast> for CheckExprTypes<'ast> {
                         a,
                         every,
                         &Arc::new(Type::AnonStruct(AnonStructType {
-                            members: HashMap::from_iter([
+                            members: vec![
                                 (
                                     "seconds".to_string(),
                                     Arc::new(Type::PrimitiveInt(IntegerKind::U32)),
@@ -519,7 +519,7 @@ impl<'ast> Visitor<'ast> for CheckExprTypes<'ast> {
                                     "useconds".to_string(),
                                     Arc::new(Type::PrimitiveInt(IntegerKind::U32)),
                                 ),
-                            ]),
+                            ],
                         })),
                     )
                 {

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_analysis/src/passes/check_type_uses.rs

@@ -183,7 +183,7 @@ impl<'ast> Visitor<'ast> for CheckTypeUses<'ast> {
             match member_locs.insert(member.name.data.clone(), member.span()) {
                 None => {
                     let member_ty = a.type_map.get(&member.type_name.node_id).unwrap().clone();
-                    anon_ty.members.insert(member.name.data.clone(), member_ty);
+                    anon_ty.members.push((member.name.data.clone(), member_ty));
                 }
                 Some(old) => {
                     SemanticError::DuplicateStructMember {

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_analysis/src/passes/eval_constant_exprs.rs

@@ -101,7 +101,7 @@ impl<'ast> EvalConstantExprs<'ast> {
             Type::Struct(struct_ty) => {
                 let def = struct_ty.node.clone();
                 self.visit_def_struct(a, &def)?;
-                for member_type in struct_ty.anon_struct.members.values() {
+                for (_, member_type) in &struct_ty.anon_struct.members {
                     self.finalize_if_needed(a, member_type)?;
                 }
                 finalize_defs.visit_def_struct(a, &def)?;

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_analysis/src/passes/finalize_type_defs.rs

@@ -350,7 +350,7 @@ impl<'ast> Visitor<'ast> for FinalizeTypeDefs<'ast> {
             let member_ty = self.ty(a, &member.type_name)?;
             ty.anon_struct
                 .members
-                .insert(member.name.data.clone(), member_ty.clone());
+                .push((member.name.data.clone(), member_ty.clone()));
 
             // Compute the size
             let size = self.expr_as_integer_opt(a, &member.size);

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_analysis/src/semantics/component.rs

@@ -435,10 +435,12 @@ fn check_throttle_interval(
     let loc = every.span();
     use crate::semantics::{AnonStructType, StructValue};
     let u32_ty = Arc::new(Type::PrimitiveInt(fpp_ast::IntegerKind::U32));
-    let mut members = HashMap::default();
-    members.insert("seconds".to_string(), u32_ty.clone());
-    members.insert("useconds".to_string(), u32_ty.clone());
-    let interval_ty = Arc::new(Type::AnonStruct(AnonStructType { members }));
+    let interval_ty = Arc::new(Type::AnonStruct(AnonStructType {
+        members: vec![
+            ("seconds".to_string(), u32_ty.clone()),
+            ("useconds".to_string(), u32_ty.clone()),
+        ],
+    }));
 
     let Some(value) = a.value_map.get(&every.node_id) else {
         return Ok(None);

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_analysis/src/semantics/test_helpers.rs

@@ -255,9 +255,9 @@ pub fn anon_array(size: Option<usize>, elt_type: Arc<Type>) -> Arc<Type> {
 }
 
 pub fn anon_struct(members: &[(&str, Arc<Type>)]) -> Arc<Type> {
-    let mut m = HashMap::default();
+    let mut m = Vec::default();
     for (name, ty) in members {
-        m.insert((*name).to_string(), ty.clone());
+        m.push(((*name).to_string(), ty.clone()));
     }
     Arc::new(Type::AnonStruct(AnonStructType { members: m }))
 }
@@ -302,8 +302,7 @@ pub fn types_structurally_eq(a: &Type, b: &Type) -> bool {
         (Type::AnonStruct(s1), Type::AnonStruct(s2)) => {
             s1.members.len() == s2.members.len()
                 && s1.members.iter().all(|(name, ty1)| {
-                    s2.members
-                        .get(name)
+                    s2.get_member(name)
                         .is_some_and(|ty2| types_structurally_eq(ty1, ty2))
                 })
         }

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_analysis/src/semantics/types.rs

@@ -168,12 +168,12 @@ impl Type {
             Type::Struct(ty) => ty
                 .anon_struct
                 .members
-                .values()
-                .all(|member| member.has_numeric_members()),
+                .iter()
+                .all(|(_, member)| member.has_numeric_members()),
             Type::AnonStruct(ty) => ty
                 .members
-                .values()
-                .all(|member| member.has_numeric_members()),
+                .iter()
+                .all(|(_, member)| member.has_numeric_members()),
             _ => self.is_numeric(),
         }
     }
@@ -216,8 +216,8 @@ impl Type {
             Type::Struct(ty) => ty
                 .anon_struct
                 .members
-                .values()
-                .all(|member| member.is_displayable()),
+                .iter()
+                .all(|(_, member)| member.is_displayable()),
             Type::AnonStruct(_) => false,
         }
     }
@@ -330,7 +330,7 @@ impl Type {
             }
             Type::AnonStruct(ty) => {
                 let mut total = 0i128;
-                for member_ty in ty.members.values() {
+                for (_, member_ty) in &ty.members {
                     total = total
                         .checked_add(member_ty.serialized_size(a)?)
                         .ok_or(SerializedSizeError::TooLarge)?;
@@ -444,7 +444,7 @@ impl Type {
         if let (Some(from_struct), Some(to_struct)) = (from.as_anon_struct(), to.as_anon_struct()) {
             // May sure all the members in 'from' can fit into 'to'
             for (name, from_member_ty) in &from_struct.members {
-                match to_struct.members.get(name) {
+                match to_struct.get_member(name) {
                     None => return Err(TypeConversionError::MissingStructMember(name.clone())),
                     Some(to_member_ty) => match Type::convert(from_member_ty, to_member_ty) {
                         Ok(_) => {}
@@ -618,24 +618,24 @@ impl Type {
             // - If the member only exists in t2, bring it in unchanged
             // - If the member exists in _both_, find the common type of the member on both
             //    - If there is no common type, return None
-            let mut out_members = HashMap::default();
+            let mut out_members = Vec::default();
 
             for (name, t1_ty) in &t1_struct.members {
-                match t2_struct.members.get(name) {
+                match t2_struct.get_member(name) {
                     None => {
-                        out_members.insert(name.clone(), t1_ty.clone());
+                        out_members.push((name.clone(), t1_ty.clone()));
                     }
                     Some(t2_ty) => {
                         let member_common = Type::common_type(t1_ty, t2_ty)?;
-                        out_members.insert(name.clone(), member_common);
+                        out_members.push((name.clone(), member_common));
                     }
                 }
             }
 
             // Add the remaining members left over in t2
             for (name, t2_ty) in &t2_struct.members {
-                if !t1_struct.members.contains_key(name) {
-                    out_members.insert(name.clone(), t2_ty.clone());
+                if !t1_struct.has_member(name) {
+                    out_members.push((name.clone(), t2_ty.clone()));
                 }
             }
 
@@ -655,12 +655,12 @@ impl Type {
             }
             // Build a new struct with the same members as the old one while trying
             // to find the common type between the single element and all the members
-            let mut out_members = HashMap::default();
+            let mut out_members = Vec::default();
             let other_rc = Arc::new(other.clone());
 
             for (name, in_member_ty) in &str.members {
                 let out_member_ty = Type::common_type(&other_rc, in_member_ty)?;
-                out_members.insert(name.clone(), out_member_ty);
+                out_members.push((name.clone(), out_member_ty));
             }
 
             // Create a new struct with similar shape of the old struct
@@ -887,7 +887,19 @@ pub struct StructType {
 #[derive(Debug, Clone)]
 pub struct AnonStructType {
     /// The members
-    pub members: HashMap<String, Arc<Type>>,
+    pub members: Vec<(String, Arc<Type>)>,
+}
+
+impl AnonStructType {
+    pub fn get_member(&self, name: &str) -> Option<&Arc<Type>> {
+        self.members
+            .iter()
+            .find_map(|(k, v)| if k == name { Some(v) } else { None })
+    }
+
+    pub fn has_member(&self, name: &str) -> bool {
+        self.get_member(name).is_some()
+    }
 }
 
 #[cfg(test)]
@@ -1081,10 +1093,11 @@ mod tests {
             !anon_array(Arc::new(Type::Boolean), Some(3)).is_displayable(),
             "anonymous array must not be displayable"
         );
-        let mut members = HashMap::default();
-        members.insert("x".to_string(), Arc::new(Type::Boolean));
         assert!(
-            !Type::AnonStruct(AnonStructType { members }).is_displayable(),
+            !Type::AnonStruct(AnonStructType {
+                members: vec![("x".to_string(), Arc::new(Type::Boolean))]
+            })
+            .is_displayable(),
             "anonymous struct must not be displayable"
         );
     }

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_analysis/tests/event/bad_throttle_interval.ref.txt

@@ -3,7 +3,7 @@
 3 |   event E severity activity low format "" throttle 10 every false
   |                                                             ^^^^^ event throttle every must be convertable to a time interval
   |
-  = note: struct member `useconds` type cannot be converted
+  = note: struct member `seconds` type cannot be converted
   = note: boolean cannot be converted to U32
 
  --> [ local path prefix ]/event/bad_throttle_interval.fpp:1:1

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_ast/Cargo.toml

@@ -9,5 +9,5 @@ license.workspace = true
 repository.workspace = true
 
 [dependencies]
-fpp_core = { path = "../fpp_core", version = "=3.3.16" }
-fpp_macros = { path = "../fpp_macros", version = "=3.3.16" }
+fpp_core = { path = "../fpp_core", version = "=3.3.17" }
+fpp_macros = { path = "../fpp_macros", version = "=3.3.17" }

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_errors/Cargo.toml

@@ -11,4 +11,4 @@ repository.workspace = true
 [dependencies]
 annotate-snippets = "0.12.8"
 anstream = "0.6.21"
-fpp_core = { path = "../fpp_core", version = "=3.3.16" }
+fpp_core = { path = "../fpp_core", version = "=3.3.17" }

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_fs/Cargo.toml

@@ -9,4 +9,4 @@ license.workspace = true
 repository.workspace = true
 
 [dependencies]
-fpp_core = { path = "../fpp_core", version = "=3.3.16" }
+fpp_core = { path = "../fpp_core", version = "=3.3.17" }

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_parser/Cargo.toml

@@ -10,9 +10,9 @@ repository.workspace = true
 readme = "README.md"
 
 [dependencies]
-fpp_lexer = { path = "../fpp_lexer", version = "=3.3.16" }
-fpp_core = { path = "../fpp_core", version = "=3.3.16" }
-fpp_ast = { path = "../fpp_ast", version = "=3.3.16" }
+fpp_lexer = { path = "../fpp_lexer", version = "=3.3.17" }
+fpp_core = { path = "../fpp_core", version = "=3.3.17" }
+fpp_ast = { path = "../fpp_ast", version = "=3.3.17" }
 rustc-hash = "2.1.1"
 
 [dev-dependencies]

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_python/Cargo.toml

@@ -37,14 +37,14 @@ pyo3-stub-gen = { version = "0.23", default-features = false, features = [
 ] }
 
 # Attribute macros that remove wrapper boilerplate (in-workspace proc-macro crate).
-fpp_python_macros = { path = "../fpp_python_macros", version = "=3.3.16" }
+fpp_python_macros = { path = "../fpp_python_macros", version = "=3.3.17" }
 
 # FPP compiler crates (in-workspace path deps).
-fpp_core = { path = "../fpp_core", version = "=3.3.16" }
-fpp_ast = { path = "../fpp_ast", version = "=3.3.16" }
-fpp_analysis = { path = "../fpp_analysis", version = "=3.3.16" }
-fpp_parser = { path = "../fpp_parser", version = "=3.3.16" }
-fpp_fs = { path = "../fpp_fs", version = "=3.3.16" }
+fpp_core = { path = "../fpp_core", version = "=3.3.17" }
+fpp_ast = { path = "../fpp_ast", version = "=3.3.17" }
+fpp_analysis = { path = "../fpp_analysis", version = "=3.3.17" }
+fpp_parser = { path = "../fpp_parser", version = "=3.3.17" }
+fpp_fs = { path = "../fpp_fs", version = "=3.3.17" }
 
 rustc-hash = "2"
 

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_python/fpp.pyi

@@ -401,7 +401,9 @@ class AnonArrayValue(ValueBase):
 @typing.final
 class AnonStructType(TypeBase):
     @property
-    def members(self) -> builtins.dict[builtins.str, Type]: ...
+    def members(self) -> builtins.list[tuple[builtins.str, Type]]: ...
+    def get_member(self, name: builtins.str) -> typing.Optional[Type]: ...
+    def has_member(self, name: builtins.str) -> builtins.bool: ...
     def __repr__(self) -> builtins.str: ...
 
 @typing.final

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_python/src/sem/defs.rs

@@ -360,7 +360,11 @@ fpp_python_macros::fpp_sem_bindings! {
 
     payload AnonStructType native fpp_analysis::semantics::AnonStructType {
         fields {
-            members: map(str, union(Type)),
+            members: list(tuple(str, union(Type))),
+        }
+        methods {
+            get_member(name: str) -> opt(union(Type)),
+            has_member(name: str) -> bool,
         }
     }
 

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_python/tests/test_api_contracts.py

@@ -384,16 +384,20 @@ def test_a_union_keyed_map_orders_by_its_key_s_node():
     assert ids == sorted(ids)
 
 
-def test_anon_struct_members_are_name_ordered_and_the_node_is_declaration_ordered():
+def test_anon_struct_members_are_declaration_ordered():
     m = analyzed(ORDER_SRC)
     struct = m.analysis.type_map[m.lookup("M.Complex").node_id]
-    members = list(struct.anon_struct.members)
-    assert members == sorted(members)
-    # The analysis stores these unordered, so declaration order lives on the AST
-    # node — which is what the docs now point at.
-    declared = [member.name for member in struct.node.members]
-    assert declared != members
-    assert sorted(declared) == members
+    anon = struct.anon_struct
+    names = [name for name, _ in anon.members]
+    assert names == [member.name for member in struct.node.members]
+    assert names != sorted(names)
+    # Name lookup is a method, not indexing, since the members are a sequence.
+    for name, member_ty in anon.members:
+        assert anon.has_member(name)
+        assert anon.get_member(name) is not None
+        assert str(anon.get_member(name)) == str(member_ty)
+    assert anon.get_member("nope") is None
+    assert anon.has_member("nope") is False
 
 
 # --- a modeled string keeps its declared size everywhere ------------------
@@ -634,11 +638,11 @@ module Ref {
     assert spelled("Ref.Simple") == "Simple"
 
     simple = a.type_map[m.lookup("Ref.Simple").node_id]
-    members = simple.anon_struct.members
-    assert str(members["x"]) == "U32"
-    assert str(members["f"]) == "F32"
+    anon = simple.anon_struct
+    assert str(anon.get_member("x")) == "U32"
+    assert str(anon.get_member("f")) == "F32"
     # A declared size is not part of how the compiler renders a string type.
-    assert str(members["y"]) == "string"
+    assert str(anon.get_member("y")) == "string"
     # Every member renders by `Display` too, so an aggregate stays one line.
     assert (
         str(simple.anon_struct)

{fprime_fpp_python-3.3.16 → fprime_fpp_python-3.3.17}/fpp_python/tests/test_semantics_types.py

@@ -75,10 +75,10 @@ def test_enum_type(m):
 def test_struct_type(m: f.Model):
     t = rtype(m, "M.S")
     assert isinstance(t, StructType)
-    members = t.anon_struct.members
-    assert set(members) == {"x", "y"}
-    assert isinstance(members["x"], PrimitiveIntType)
-    assert isinstance(members["y"], FloatType)
+    anon = t.anon_struct
+    assert [name for name, _ in anon.members] == ["x", "y"]
+    assert isinstance(anon.get_member("x"), PrimitiveIntType)
+    assert isinstance(anon.get_member("y"), FloatType)
 
 
 def test_alias_type(m):