ncd: modules: parse: Implement parse_hex_number.

ncd/modules/parse.c

@@ -30,6 +30,7 @@
  * 
  * Synopsis:
  *   parse_number(string str)
+ *   parse_hex_number(string str)
  *   parse_value(string str)
  *   parse_ipv4_addr(string str)
  *   parse_ipv6_addr(string str)
@@ -105,6 +106,22 @@ static int parse_number (NCDModuleInst *i, MemRef str, NCDValMem *mem, NCDValRef
     return 1;
 }
 
+static int parse_hex_number (NCDModuleInst *i, MemRef str, NCDValMem *mem, NCDValRef *out)
+{
+    uintmax_t n;
+    if (!parse_unsigned_hex_integer(str, &n)) {
+        ModuleLog(i, BLOG_ERROR, "failed to parse hex number");
+        return 0;
+    }
+    
+    *out = ncd_make_uintmax(mem, n);
+    if (NCDVal_IsInvalid(*out)) {
+        return 0;
+    }
+    
+    return 1;
+}
+
 static int parse_value (NCDModuleInst *i, MemRef str, NCDValMem *mem, NCDValRef *out)
 {
     if (!NCDValParser_Parse(str, mem, out)) {
@@ -215,6 +232,11 @@ static void func_new_parse_number (void *vo, NCDModuleInst *i, const struct NCDM
     new_templ(vo, i, params, parse_number);
 }
 
+static void func_new_parse_hex_number (void *vo, NCDModuleInst *i, const struct NCDModuleInst_new_params *params)
+{
+    new_templ(vo, i, params, parse_hex_number);
+}
+
 static void func_new_parse_value (void *vo, NCDModuleInst *i, const struct NCDModuleInst_new_params *params)
 {
     new_templ(vo, i, params, parse_value);
@@ -349,6 +371,12 @@ static struct NCDModule modules[] = {
         .func_die = func_die,
         .func_getvar2 = func_getvar2,
         .alloc_size = sizeof(struct instance)
+    }, {
+        .type = "parse_hex_number",
+        .func_new2 = func_new_parse_hex_number,
+        .func_die = func_die,
+        .func_getvar2 = func_getvar2,
+        .alloc_size = sizeof(struct instance)
     }, {
         .type = "parse_value",
         .func_new2 = func_new_parse_value,

ncd/tests/parse.ncd

@@ -8,6 +8,11 @@ process main {
     val_equal(x, "23182") a;
     assert(a);
 
+    parse_hex_number("012AF") x;
+    assert(x.succeeded);
+    val_equal(x, "4783") a;
+    assert(a);
+
     parse_ipv4_addr("192.168.61.007") x;
     assert(x.succeeded);
     val_equal(x, "192.168.61.7") a;