feat: add net.CIDR_subnets function (#1917)

Signed-off-by: John Gardiner Myers <[email protected]>

Author: johngmyers

kclvm/api/src/service/service_impl.rs

@@ -223,9 +223,9 @@ impl KclvmServiceImpl {
     /// assert_eq!(result.type_errors.len(), 0);
     /// assert_eq!(result.symbols.len(), 12);
     /// assert_eq!(result.scopes.len(), 3);
-    /// assert_eq!(result.node_symbol_map.len(), 190);
-    /// assert_eq!(result.symbol_node_map.len(), 190);
-    /// assert_eq!(result.fully_qualified_name_map.len(), 201);
+    /// assert_eq!(result.node_symbol_map.len(), 191);
+    /// assert_eq!(result.symbol_node_map.len(), 191);
+    /// assert_eq!(result.fully_qualified_name_map.len(), 202);
     /// assert_eq!(result.pkg_scope_map.len(), 3);
     /// ```
     #[inline]

kclvm/loader/src/snapshots/kclvm_loader__tests__builtin_call_0.snap

@@ -89,13 +89,6 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
             },
         ),
         attrs: [
-            SymbolRef {
-                id: Index {
-                    index: 148,
-                    generation: 0,
-                },
-                kind: Function,
-            },
             SymbolRef {
                 id: Index {
                     index: 149,
@@ -299,6 +292,13 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
                 },
                 kind: Function,
             },
+            SymbolRef {
+                id: Index {
+                    index: 178,
+                    generation: 0,
+                },
+                kind: Function,
+            },
         ],
         is_global: false,
     },

kclvm/loader/src/snapshots/kclvm_loader__tests__builtin_call_1.snap

@@ -246,13 +246,6 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
             },
         ),
         attrs: [
-            SymbolRef {
-                id: Index {
-                    index: 148,
-                    generation: 0,
-                },
-                kind: Function,
-            },
             SymbolRef {
                 id: Index {
                     index: 149,
@@ -456,6 +449,13 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
                 },
                 kind: Function,
             },
+            SymbolRef {
+                id: Index {
+                    index: 178,
+                    generation: 0,
+                },
+                kind: Function,
+            },
         ],
         is_global: false,
     },
@@ -495,13 +495,6 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
             },
         ),
         attrs: [
-            SymbolRef {
-                id: Index {
-                    index: 148,
-                    generation: 0,
-                },
-                kind: Function,
-            },
             SymbolRef {
                 id: Index {
                     index: 149,
@@ -705,6 +698,13 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
                 },
                 kind: Function,
             },
+            SymbolRef {
+                id: Index {
+                    index: 178,
+                    generation: 0,
+                },
+                kind: Function,
+            },
         ],
         is_global: false,
     },
@@ -744,13 +744,6 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
             },
         ),
         attrs: [
-            SymbolRef {
-                id: Index {
-                    index: 148,
-                    generation: 0,
-                },
-                kind: Function,
-            },
             SymbolRef {
                 id: Index {
                     index: 149,
@@ -954,6 +947,13 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
                 },
                 kind: Function,
             },
+            SymbolRef {
+                id: Index {
+                    index: 178,
+                    generation: 0,
+                },
+                kind: Function,
+            },
         ],
         is_global: false,
     },

kclvm/loader/src/snapshots/kclvm_loader__tests__builtin_call_2.snap

@@ -578,13 +578,6 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
             },
         ),
         attrs: [
-            SymbolRef {
-                id: Index {
-                    index: 148,
-                    generation: 0,
-                },
-                kind: Function,
-            },
             SymbolRef {
                 id: Index {
                     index: 149,
@@ -788,6 +781,13 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
                 },
                 kind: Function,
             },
+            SymbolRef {
+                id: Index {
+                    index: 178,
+                    generation: 0,
+                },
+                kind: Function,
+            },
         ],
         is_global: false,
     },
@@ -827,13 +827,6 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
             },
         ),
         attrs: [
-            SymbolRef {
-                id: Index {
-                    index: 148,
-                    generation: 0,
-                },
-                kind: Function,
-            },
             SymbolRef {
                 id: Index {
                     index: 149,
@@ -1037,6 +1030,13 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
                 },
                 kind: Function,
             },
+            SymbolRef {
+                id: Index {
+                    index: 178,
+                    generation: 0,
+                },
+                kind: Function,
+            },
         ],
         is_global: false,
     },
@@ -1076,13 +1076,6 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
             },
         ),
         attrs: [
-            SymbolRef {
-                id: Index {
-                    index: 148,
-                    generation: 0,
-                },
-                kind: Function,
-            },
             SymbolRef {
                 id: Index {
                     index: 149,
@@ -1286,6 +1279,13 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
                 },
                 kind: Function,
             },
+            SymbolRef {
+                id: Index {
+                    index: 178,
+                    generation: 0,
+                },
+                kind: Function,
+            },
         ],
         is_global: false,
     },

kclvm/loader/src/snapshots/kclvm_loader__tests__import_stmt_0.snap

@@ -46,13 +46,6 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
             },
         ),
         attrs: [
-            SymbolRef {
-                id: Index {
-                    index: 51,
-                    generation: 0,
-                },
-                kind: Function,
-            },
             SymbolRef {
                 id: Index {
                     index: 52,
@@ -158,6 +151,13 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
                 },
                 kind: Function,
             },
+            SymbolRef {
+                id: Index {
+                    index: 67,
+                    generation: 0,
+                },
+                kind: Function,
+            },
         ],
         is_global: false,
     },
@@ -247,13 +247,6 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
             },
         ),
         attrs: [
-            SymbolRef {
-                id: Index {
-                    index: 51,
-                    generation: 0,
-                },
-                kind: Function,
-            },
             SymbolRef {
                 id: Index {
                     index: 52,
@@ -359,6 +352,13 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
                 },
                 kind: Function,
             },
+            SymbolRef {
+                id: Index {
+                    index: 67,
+                    generation: 0,
+                },
+                kind: Function,
+            },
         ],
         is_global: false,
     },
@@ -460,7 +460,7 @@ expression: "format! (\"{:#?}\", p.symbols.values())"
         def: Some(
             SymbolRef {
                 id: Index {
-                    index: 61,
+                    index: 62,
                     generation: 0,
                 },
                 kind: Function,

kclvm/runtime/src/_kclvm.h

@@ -12,7 +12,7 @@
 #include <stdint.h>
 
 #ifdef __cplusplus
-extern "C-unwind" {
+extern "C" {
 #endif
 
 // please keep same as 'kclvm/runtime/src/kind/mod.rs#Kind'
@@ -425,24 +425,22 @@ kclvm_value_ref_t* kclvm_math_sqrt(kclvm_context_t* ctx, kclvm_value_ref_t* args
 
 kclvm_value_ref_t* kclvm_net_CIDR_subnet(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
 
+kclvm_value_ref_t* kclvm_net_CIDR_subnets(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
+
 kclvm_value_ref_t* kclvm_net_IP_string(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
 
 kclvm_value_ref_t* kclvm_net_fqdn(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
 
+kclvm_value_ref_t* kclvm_net_hosts_in_CIDR(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
+
 kclvm_value_ref_t* kclvm_net_is_IP(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
 
+kclvm_value_ref_t* kclvm_net_is_IP_in_CIDR(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
+
 kclvm_value_ref_t* kclvm_net_is_IPv4(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
 
 kclvm_value_ref_t* kclvm_net_is_global_unicast_IP(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
 
-kclvm_value_ref_t* kclvm_net_parse_CIDR (kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* _kwargs);
-
-kclvm_value_ref_t* kclvm_net_hosts_in_CIDR (kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* _kwargs);
-
-kclvm_value_ref_t* kclvm_net_subnets_from_CIDR (kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* _kwargs);
-
-kclvm_value_ref_t* kclvm_net_is_IP_in_CIDR (kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* _kwargs);
-
 kclvm_value_ref_t* kclvm_net_is_interface_local_multicast_IP(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
 
 kclvm_value_ref_t* kclvm_net_is_link_local_multicast_IP(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
@@ -457,10 +455,14 @@ kclvm_value_ref_t* kclvm_net_is_unspecified_IP(kclvm_context_t* ctx, kclvm_value
 
 kclvm_value_ref_t* kclvm_net_join_host_port(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
 
+kclvm_value_ref_t* kclvm_net_parse_CIDR(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
+
 kclvm_value_ref_t* kclvm_net_parse_IP(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
 
 kclvm_value_ref_t* kclvm_net_split_host_port(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
 
+kclvm_value_ref_t* kclvm_net_subnets_from_CIDR(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
+
 kclvm_value_ref_t* kclvm_net_to_IP16(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
 
 kclvm_value_ref_t* kclvm_net_to_IP4(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
@@ -730,7 +732,7 @@ kclvm_value_ref_t* kclvm_yaml_encode_all(kclvm_context_t* ctx, kclvm_value_ref_t
 kclvm_value_ref_t* kclvm_yaml_validate(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
 
 #ifdef __cplusplus
-} // extern "C-unwind"
+} // extern "C"
 #endif
 
 #endif // _kclvm_h_

kclvm/runtime/src/_kclvm.ll

@@ -388,6 +388,8 @@ declare %kclvm_value_ref_t* @kclvm_math_sqrt(%kclvm_context_t* %ctx, %kclvm_valu
 
 declare %kclvm_value_ref_t* @kclvm_net_CIDR_subnet(%kclvm_context_t* %ctx, %kclvm_value_ref_t* %args, %kclvm_value_ref_t* %kwargs);
 
+declare %kclvm_value_ref_t* @kclvm_net_CIDR_subnets(%kclvm_context_t* %ctx, %kclvm_value_ref_t* %args, %kclvm_value_ref_t* %kwargs);
+
 declare %kclvm_value_ref_t* @kclvm_net_IP_string(%kclvm_context_t* %ctx, %kclvm_value_ref_t* %args, %kclvm_value_ref_t* %kwargs);
 
 declare %kclvm_value_ref_t* @kclvm_net_fqdn(%kclvm_context_t* %ctx, %kclvm_value_ref_t* %args, %kclvm_value_ref_t* %kwargs);

kclvm/runtime/src/_kclvm.rs

@@ -205,24 +205,25 @@ pub enum ApiFunc {
     kclvm_math_pow,
     kclvm_math_sqrt,
     kclvm_net_CIDR_subnet,
+    kclvm_net_CIDR_subnets,
     kclvm_net_IP_string,
     kclvm_net_fqdn,
+    kclvm_net_hosts_in_CIDR,
     kclvm_net_is_IP,
+    kclvm_net_is_IP_in_CIDR,
     kclvm_net_is_IPv4,
     kclvm_net_is_global_unicast_IP,
-    kclvm_net_parse_CIDR,
-    kclvm_net_hosts_in_CIDR,
-    kclvm_net_subnets_from_CIDR,
-    kclvm_net_is_IP_in_CIDR,
     kclvm_net_is_interface_local_multicast_IP,
     kclvm_net_is_link_local_multicast_IP,
     kclvm_net_is_link_local_unicast_IP,
     kclvm_net_is_loopback_IP,
     kclvm_net_is_multicast_IP,
     kclvm_net_is_unspecified_IP,
     kclvm_net_join_host_port,
+    kclvm_net_parse_CIDR,
     kclvm_net_parse_IP,
     kclvm_net_split_host_port,
+    kclvm_net_subnets_from_CIDR,
     kclvm_net_to_IP16,
     kclvm_net_to_IP4,
     kclvm_plugin_init,

kclvm/runtime/src/_kclvm_addr.rs

@@ -210,6 +210,7 @@ pub fn _kclvm_get_fn_ptr_by_name(name: &str) -> u64 {
         "kclvm_math_pow" => crate::kclvm_math_pow as *const () as u64,
         "kclvm_math_sqrt" => crate::kclvm_math_sqrt as *const () as u64,
         "kclvm_net_CIDR_subnet" => crate::kclvm_net_CIDR_subnet as *const () as u64,
+        "kclvm_net_CIDR_subnets" => crate::kclvm_net_CIDR_subnets as *const () as u64,
         "kclvm_net_IP_string" => crate::kclvm_net_IP_string as *const () as u64,
         "kclvm_net_fqdn" => crate::kclvm_net_fqdn as *const () as u64,
         "kclvm_net_is_IP" => crate::kclvm_net_is_IP as *const () as u64,

kclvm/runtime/src/_kclvm_api_spec.rs

@@ -1014,6 +1014,10 @@
 // api-spec(c):    kclvm_value_ref_t* kclvm_net_CIDR_subnet(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
 // api-spec(llvm): declare %kclvm_value_ref_t* @kclvm_net_CIDR_subnet(%kclvm_context_t* %ctx, %kclvm_value_ref_t* %args, %kclvm_value_ref_t* %kwargs);
 
+// api-spec:       kclvm_net_CIDR_subnets
+// api-spec(c):    kclvm_value_ref_t* kclvm_net_CIDR_subnets(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
+// api-spec(llvm): declare %kclvm_value_ref_t* @kclvm_net_CIDR_subnets(%kclvm_context_t* %ctx, %kclvm_value_ref_t* %args, %kclvm_value_ref_t* %kwargs);
+
 // api-spec:       kclvm_regex_match
 // api-spec(c):    kclvm_value_ref_t* kclvm_regex_match(kclvm_context_t* ctx, kclvm_value_ref_t* args, kclvm_value_ref_t* kwargs);
 // api-spec(llvm): declare %kclvm_value_ref_t* @kclvm_regex_match(%kclvm_context_t* %ctx, %kclvm_value_ref_t* %args, %kclvm_value_ref_t* %kwargs);