chore: cleanup parsers

EmperorYP7 · EmperorYP7 · commit ca7b130b5eab · 2021-08-07T14:35:48.000+05:30
Signed-off-by: Yash Pandey (YP) &lt;yash.btech.cs19@iiitranchi.ac.in&gt;
diff --git a/casbin/ip_parser/parser/dtoi.cpp b/casbin/ip_parser/parser/dtoi.cpp
@@ -10,7 +10,7 @@ namespace casbin {
 
 // Decimal to integer.
 // Returns number, characters consumed, success.
-std::pair<int, int> dtoi(std::string s) {
+std::pair<int, int> dtoi(std::string_view s) {
     int n = 0;
     int i = 0;
     std::pair<int, int> p;
diff --git a/casbin/ip_parser/parser/dtoi.h b/casbin/ip_parser/parser/dtoi.h
@@ -10,7 +10,7 @@ namespace casbin {
 
 // Decimal to integer.
 // Returns number, characters consumed, success.
-std::pair<int, int> dtoi(std::string s);
+std::pair<int, int> dtoi(std::string_view s);
 
 } // namespace casbin
 
diff --git a/casbin/ip_parser/parser/equal.cpp b/casbin/ip_parser/parser/equal.cpp
@@ -8,7 +8,7 @@
 
 namespace casbin {
 
-bool equal(IPMask m1, IPMask m2) {
+bool equal(const IPMask& m1, const IPMask& m2) {
     if(m1.size() != m2.size())
         return false;
     for(int i = 0 ; i < m1.size() ; i++) {
diff --git a/casbin/ip_parser/parser/equal.h b/casbin/ip_parser/parser/equal.h
@@ -8,7 +8,7 @@
 
 namespace casbin {
 
-bool equal(IPMask m1, IPMask m2);
+bool equal(const IPMask& m1, const IPMask& m2);
 
 } // namespace casbin
 
diff --git a/casbin/ip_parser/parser/parseIP.cpp b/casbin/ip_parser/parser/parseIP.cpp
@@ -8,7 +8,7 @@
 
 namespace casbin {
 
-IP parseIP(std::string s) {
+IP parseIP(const std::string& s) {
     for(int i = 0 ; i < s.length() ; i++) {
         switch(s[i]) {
         case '.':
diff --git a/casbin/ip_parser/parser/parseIP.h b/casbin/ip_parser/parser/parseIP.h
@@ -9,7 +9,7 @@
 
 namespace casbin {
 
-IP parseIP(std::string s);
+IP parseIP(const std::string& s);
 
 } // namespace casbin
 
diff --git a/casbin/ip_parser/parser/parseIPv4.cpp b/casbin/ip_parser/parser/parseIPv4.cpp
@@ -8,7 +8,7 @@
 
 namespace casbin {
 
-IP parseIPv4(std::string s) {
+IP parseIPv4(std::string_view s) {
     std::vector <byte> pb(IP :: IPv4len, 0);
     IP ipv4;
     for(int i = 0; i < IP :: IPv4len ; i++) {
diff --git a/casbin/ip_parser/parser/parseIPv4.h b/casbin/ip_parser/parser/parseIPv4.h
@@ -10,7 +10,7 @@
 
 namespace casbin {
 
-IP parseIPv4(std::string s);
+IP parseIPv4(std::string_view s);
 
 } // namespace casbin
 
diff --git a/casbin/ip_parser/parser/parseIPv6.cpp b/casbin/ip_parser/parser/parseIPv6.cpp
@@ -8,7 +8,7 @@
 
 namespace casbin {
 
-IP parseIPv6(std::string s) {
+IP parseIPv6(std::string_view s) {
     IP ipv6;
     std::vector <byte> newIP(IP :: IPv6len, 0);
     ipv6.ip = newIP;
diff --git a/casbin/ip_parser/parser/parseIPv6.h b/casbin/ip_parser/parser/parseIPv6.h
@@ -9,7 +9,7 @@
 
 namespace casbin {
 
-IP parseIPv6(std::string s);
+IP parseIPv6(std::string_view s);
 
 } // namespace casbin
 
diff --git a/casbin/ip_parser/parser/xtoi.cpp b/casbin/ip_parser/parser/xtoi.cpp
@@ -8,7 +8,7 @@
 
 namespace casbin {
 
-std::pair<int, int> xtoi(std::string s) {
+std::pair<int, int> xtoi(std::string_view s) {
     int n = 0;
     int i = 0;
     std::pair<int, int> p;
diff --git a/casbin/ip_parser/parser/xtoi.h b/casbin/ip_parser/parser/xtoi.h
@@ -8,7 +8,7 @@
 
 namespace casbin {
 
-std::pair<int, int> xtoi(std::string s);
+std::pair<int, int> xtoi(std::string_view s);
 
 } // namespace casbin
 
diff --git a/casbin/rbac/default_role_manager.h b/casbin/rbac/default_role_manager.h
@@ -23,7 +23,7 @@
 
 namespace casbin {
 
-typedef bool (*MatchingFunc)(std::string, std::string);
+typedef bool (*MatchingFunc)(const std::string&, const std::string&);
 
 /**
  * Role represents the data structure for a role in RBAC.
diff --git a/casbin/util/built_in_functions.cpp b/casbin/util/built_in_functions.cpp
@@ -44,7 +44,7 @@ ReturnType KeyMatch(Scope scope) {
     return RETURN_RESULT;
 }
 
-bool KeyMatch(std::string key1, std::string key2) {
+bool KeyMatch(const std::string& key1, const std::string& key2) {
     size_t pos = key2.find("*");
 
     if (pos == std::string :: npos)
@@ -66,7 +66,7 @@ ReturnType KeyMatch2(Scope scope) {
     return RETURN_RESULT;
 }
 
-bool KeyMatch2(std::string key1, std::string key2) {
+bool KeyMatch2(const std::string& key1, const std::string& key2) {
     std::vector<std::string> key1_arr = Split(key1, "/");
     std::vector<std::string> key2_arr = Split(key2, "/");
 
@@ -77,8 +77,8 @@ bool KeyMatch2(std::string key1, std::string key2) {
             break;
         }
         if(key1_arr[i] != key2_arr[i]){
-            int index1 = int(key2_arr[i].find("*"));
-            int index2 = int(key2_arr[i].find(":"));
+            size_t index1 = key2_arr[i].find("*");
+            size_t index2 = key2_arr[i].find(":");
             if(index1 != std::string::npos){
                 if(index1==0){
                     res = true;
@@ -120,7 +120,7 @@ ReturnType KeyMatch3(Scope scope) {
     return RETURN_RESULT;
 }
 
-bool KeyMatch3(std::string key1, std::string key2) {
+bool KeyMatch3(const std::string& key1, const std::string& key2) {
     std::vector<std::string> key1_arr = Split(key1, "/");
     std::vector<std::string> key2_arr = Split(key2, "/");
 
@@ -131,9 +131,9 @@ bool KeyMatch3(std::string key1, std::string key2) {
             break;
         }
         if(key1_arr[i] != key2_arr[i]){
-            int index1 = int(key2_arr[i].find("*"));
-            int index2 = int(key2_arr[i].find("{"));
-            int index3 = int(key2_arr[i].find("}"));
+            size_t index1 = key2_arr[i].find("*");
+            size_t index2 = key2_arr[i].find("{");
+            size_t index3 = key2_arr[i].find("}");
             if(index1 != std::string::npos){
                 if(index1==0){
                     res = true;
@@ -174,7 +174,7 @@ ReturnType RegexMatch(Scope scope) {
     return RETURN_RESULT;
 }
 
-bool RegexMatch(std::string key1, std::string key2) {
+bool RegexMatch(const std::string& key1, const std::string& key2) {
     std::regex regex_s(key2);
     return regex_match(key1, regex_s);
 }
@@ -189,7 +189,7 @@ ReturnType IPMatch(Scope scope) {
     return RETURN_RESULT;
 }
 
-bool IPMatch(std::string ip1, std::string ip2) {
+bool IPMatch(const std::string& ip1, const std::string& ip2) {
     IP objIP1 = parseIP(ip1);
     if (objIP1.isLegal == false)
         throw IllegalArgumentException("invalid argument: ip1 in IPMatch() function is not an IP address.");
@@ -209,7 +209,7 @@ bool IPMatch(std::string ip1, std::string ip2) {
 // GFunction is the method of the g(_, _) function.
 ReturnType GFunction(Scope scope) {
     RoleManager* rm;
-    rm = (RoleManager*)GetPointer(scope, 0);
+    rm = reinterpret_cast<RoleManager*>(GetPointer(scope, 0));
     std::string name1 = GetString(scope, 1);
     std::string name2 = GetString(scope, 2);
 
diff --git a/casbin/util/built_in_functions.h b/casbin/util/built_in_functions.h
@@ -24,26 +24,26 @@ namespace casbin {
 // KeyMatch determines whether key1 matches the pattern of key2 (similar to RESTful path), key2 can contain a *.
 // For example, "/foo/bar" matches "/foo/*"
 ReturnType KeyMatch(Scope scope);
-bool KeyMatch(std::string key1, std::string key2);
+bool KeyMatch(const std::string& key1, const std::string& key2);
 
 // KeyMatch2 determines whether key1 matches the pattern of key2 (similar to RESTful path), key2 can contain a *.
 // For example, "/foo/bar" matches "/foo/*", "/resource1" matches "/:resource"
 ReturnType KeyMatch2(Scope scope);
-bool KeyMatch2(std::string key1, std::string key2);
+bool KeyMatch2(const std::string& key1, const std::string& key2);
 
 // KeyMatch3 determines whether key1 matches the pattern of key2 (similar to RESTful path), key2 can contain a *.
 // For example, "/foo/bar" matches "/foo/*", "/resource1" matches "/{resource}"
 ReturnType KeyMatch3(Scope scope);
-bool KeyMatch3(std::string key1, std::string key2);
+bool KeyMatch3(const std::string& key1, const std::string& key2);
 
 // RegexMatch determines whether key1 matches the pattern of key2 in regular expression.
 ReturnType RegexMatch(Scope scope);
-bool RegexMatch(std::string key1, std::string key2);
+bool RegexMatch(const std::string& key1, const std::string& key2);
 
 // IPMatch determines whether IP address ip1 matches the pattern of IP address ip2, ip2 can be an IP address or a CIDR pattern.
 // For example, "192.168.2.123" matches "192.168.2.0/24"
 ReturnType IPMatch(Scope scope);
-bool IPMatch(std::string ip1, std::string ip2);
+bool IPMatch(const std::string& ip1, const std::string& ip2);
 
 // GFunction is the method of the g(_, _) function.
 ReturnType GFunction(Scope scope);
diff --git a/casbin/util/split.cpp b/casbin/util/split.cpp
@@ -28,7 +28,7 @@
 
 namespace casbin {
 
-std::vector<std::string> Split(std::string str, std::string del, int limit) {
+std::vector<std::string> Split(std::string str, const std::string& del, int limit) {
     std::vector<std::string> tokens;
 
     if(limit <= 0)
diff --git a/casbin/util/util.h b/casbin/util/util.h
@@ -55,7 +55,7 @@ std::string RemoveComments(std::string_view s);
 // SetSubtract returns the elements in `a` that aren't in `b`.
 std::vector<std::string> SetSubtract(const std::vector<std::string>& a, const std::vector<std::string>& b);
 
-std::vector<std::string> Split(std::string str, std::string del, int limit = 0);
+std::vector<std::string> Split(std::string str, const std::string& del, int limit = 0);
 
 std::string& LTrim(std::string& str, const std::string& chars = "\t\n\v\f\r ");
  
