updating fr to admit hexadecimal, octal... inputs

iden3 · May 11, 2023 · 023bafe · 023bafe
1 parent 2f5dee0
commit 023bafe
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/code_producers/src/c_elements/grumpkin/fr.cpp b/code_producers/src/c_elements/grumpkin/fr.cpp
@@ -53,9 +53,9 @@ bool Fr_init() {
     return true;
 }
 
-void Fr_str2element(PFrElement pE, char const *s) {
+void Fr_str2element(PFrElement pE, char const *s, uint base) {
     mpz_t mr;
-    mpz_init_set_str(mr, s, 10);
+    mpz_init_set_str(mr, s, base);
     mpz_fdiv_r(mr, mr, q);
     Fr_fromMpz(pE, mr);
     mpz_clear(mr);

diff --git a/code_producers/src/c_elements/grumpkin/fr.hpp b/code_producers/src/c_elements/grumpkin/fr.hpp
@@ -68,7 +68,7 @@ extern "C" void Fr_fail();
 
 // Pending functions to convert
 
-void Fr_str2element(PFrElement pE, char const*s);
+void Fr_str2element(PFrElement pE, char const*s, uint base);
 char *Fr_element2str(PFrElement pE);
 void Fr_idiv(PFrElement r, PFrElement a, PFrElement b);
 void Fr_mod(PFrElement r, PFrElement a, PFrElement b);

diff --git a/code_producers/src/c_elements/pallas/fr.cpp b/code_producers/src/c_elements/pallas/fr.cpp
@@ -53,9 +53,9 @@ bool Fr_init() {
     return true;
 }
 
-void Fr_str2element(PFrElement pE, char const *s) {
+void Fr_str2element(PFrElement pE, char const *s, uint base) {
     mpz_t mr;
-    mpz_init_set_str(mr, s, 10);
+    mpz_init_set_str(mr, s, base);
     mpz_fdiv_r(mr, mr, q);
     Fr_fromMpz(pE, mr);
     mpz_clear(mr);

diff --git a/code_producers/src/c_elements/pallas/fr.hpp b/code_producers/src/c_elements/pallas/fr.hpp
@@ -68,7 +68,7 @@ extern "C" void Fr_fail();
 
 // Pending functions to convert
 
-void Fr_str2element(PFrElement pE, char const*s);
+void Fr_str2element(PFrElement pE, char const*s, uint base);
 char *Fr_element2str(PFrElement pE);
 void Fr_idiv(PFrElement r, PFrElement a, PFrElement b);
 void Fr_mod(PFrElement r, PFrElement a, PFrElement b);

diff --git a/code_producers/src/c_elements/vesta/fr.cpp b/code_producers/src/c_elements/vesta/fr.cpp
@@ -53,9 +53,9 @@ bool Fr_init() {
     return true;
 }
 
-void Fr_str2element(PFrElement pE, char const *s) {
+void Fr_str2element(PFrElement pE, char const *s, uint base) {
     mpz_t mr;
-    mpz_init_set_str(mr, s, 10);
+    mpz_init_set_str(mr, s, base);
     mpz_fdiv_r(mr, mr, q);
     Fr_fromMpz(pE, mr);
     mpz_clear(mr);

diff --git a/code_producers/src/c_elements/vesta/fr.hpp b/code_producers/src/c_elements/vesta/fr.hpp
@@ -68,7 +68,7 @@ extern "C" void Fr_fail();
 
 // Pending functions to convert
 
-void Fr_str2element(PFrElement pE, char const*s);
+void Fr_str2element(PFrElement pE, char const*s, uint base);
 char *Fr_element2str(PFrElement pE);
 void Fr_idiv(PFrElement r, PFrElement a, PFrElement b);
 void Fr_mod(PFrElement r, PFrElement a, PFrElement b);