- new functions datef_dmy() and dhour_format()

- new function hexadecimal_scan() - string:percentage() function now uses point instead of comma

- new functions datef_dmy() and dhour_format()
- new function hexadecimal_scan() - string:percentage() function now uses point instead of comma
Cédric RICARD
1 parent 4504033e
Showing 4 changed files with 46 additions and 10 deletions Show diff stats
anubis_dev/library/locale/L3LanguageInfo.anubis
anubis_dev/library/system/convert.anubis
anubis_dev/library/system/string.anubis
anubis_dev/library/test/system/convert.unit_test.anubis
@@ -20,21 +20,27 @@ public type L3LanguageInfo:
  
  
  
-public define String datef_dmy ( Int dat ) =
-   with d = convert_time(dat),
+public define String datef_dmy ( Date_and_Time d ) =
    zero_pad_n(2,day(d))+"/"+zero_pad_n(2,month(d))+"/"+year(d).
+
+public define String datef_dmy ( Int dat ) =
+   datef_dmy(convert_time(dat) ).
  
-public define String datef_ymd ( Int dat ) =
-   with d = convert_time(dat),
+public define String datef_ymd ( Date_and_Time d ) =
    year(d)+"/"+zero_pad_n(2,month(d))+"/"+zero_pad_n(2,day(d)).
  
+public define String datef_ymd ( Int dat ) =
+   datef_ymd( convert_time(dat) ).
+
 public define String  datee_ymd = "yyyy/mm/dd".
 public define String  datee_dmy = "dd/mm/yyyy".
  
  
-public define String dhour_format ( Int dat ) =
-   with d = convert_time(dat),
+public define String dhour_format ( Date_and_Time d ) =
    zero_pad_n(2,hour(d))+":"+zero_pad_n(2,minute(d))+":"+zero_pad_n(2,second(d)). 
+
+public define String dhour_format ( Int dat ) =
+   dhour_format( convert_time(dat) ).
  
  
  
@@ -293,3 +293,26 @@ public define String
   to_decimal(v).
  
  
+define Maybe(Int) 
+  _hexadecimal_scan
+  (
+    List(Word8) str,
+    Int         value
+  ) =
+  if str is
+  {
+    [] then success(value),
+    [h . t] then
+      if h >=+ '0' & h +=< '9' then _hexadecimal_scan(t, (value * 16) + to_Int(h - '0'))
+      else if h >=+ 'A' & h +=< 'F' then _hexadecimal_scan(t, (value * 16) + to_Int(h - 'A') + 10)
+      else if h >=+ 'a' & h +=< 'f' then _hexadecimal_scan(t, (value * 16) + to_Int(h - 'a') + 10)
+      else
+        failure
+  }.
+
+public define Maybe(Int) 
+  hexadecimal_scan
+  (
+    String str
+  ) =
+  _hexadecimal_scan(explode(str), 0).
@@ -1027,13 +1027,13 @@ public define String
   ) =
   if ((10^(precision+2))*value)/reference is 
   {
-    failure     then "0,0", 
+    failure     then "0.0", 
     success(p)  then if p is (q,r) then 
       if q/(10^precision) is 
       {
-        failure     then "0,0", 
+        failure     then "0.0", 
         success(p1) then if p1 is (q1,r1) then 
-               to_decimal(q1)+","+to_decimal(r1)
+               to_decimal(q1)+"."+to_decimal(r1)
       }
   }. 
  
@@ -93,7 +93,13 @@ define One
  
   unique.
  
-
+define One
+  hexadecimal_scan_test
+  (
+    UnitTestContext ut
+  ) =
+  assertIsSuccess(ut, hexadecimal_scan("123ABC"), to_Int((Word32)0x123ABC), abs_to_hexa, "Test 1");
+  unique.
  
  
 public define UnitTestSuite make_convert_test_suite 
@@ -104,4 +110,5 @@ public define UnitTestSuite make_convert_test_suite
       ut_fixture("Host to Big Endian", host_to_bendian_test),
       //ut_fixture("Host to Little Endian", host_to_lendian_test),
       //ut_fixture("Host to Little Endian (IntXX)", host_to_lendian_intxx_test),
+      ut_fixture("hexadecimal_scan", hexadecimal_scan_test),
     ]).