Ticket #47196: 0004-lparse-Avoid-namespace-collisions-41871.patch

dports/science/lparse/Portfile

@@ -29 +29 @@
                     sha256  886d29723f7188296e48584a4a32b8f111414acb7ca8490af28ef6b7f1717298
 
 patchfiles          fix-bison-version-detection.patch \
-                    fix-recursive-make.patch
+                    fix-recursive-make.patch \
+                    avoid-namespace-collisions.patch
 
 # this configure argument is only used for installing
 configure.pre_args  --prefix=${destroot}${prefix}/bin

new file dports/science/lparse/files/avoid-namespace-collisions.patch

@@ +1 @@
+Step 1: Use "`using namespace std`", polluting your global namespace.
+Step 2: Define identifiers like "`hash`" and "`runtime_error`".
+Step 3: Wait years for C++ to incorporate those identifiers.
+Step 4: Watch modern compilers trip over the resulting collisions.
+Step 5: ???
+Step 6: Profit!
+
+Index: src/instance.cc
+===================================================================
+--- src/instance.cc.orig
++++ src/instance.cc
+@@ -287,7 +287,7 @@ void HashSet::Clear(int new_ar)
+ }
+ 
+ /* the hash algorithm is from
+-   http://ourworld.compuserve.com/homepages/bob_jenkins/evahash.htm */
++   https://web.archive.org/web/19990218144446/http://ourworld.compuserve.com/homepages/bob_jenkins/evahash.htm */
+ 
+ 
+ /* The mixing step */
+@@ -305,7 +305,7 @@ void HashSet::Clear(int new_ar)
+ }
+ 
+ 
+-unsigned long hash(const char *key, unsigned long length,
++unsigned long lparseHash(const char *key, unsigned long length,
+                   unsigned long initval)
+ {
+   u4 a, b, c; /* internal state */
+@@ -362,9 +362,9 @@ unsigned long HashSet::FindIndex(Instanc
+   else
+     table = items;
+   
+-  ind1 = hash((char *)key, arity*4, SEED_1) % mask;
++  ind1 = lparseHash((char *)key, arity*4, SEED_1) % mask;
+   if (table[ind1] && !equal_item(key, table[ind1], arity))
+-    ind2 = (hash((char *)key, arity*4, SEED_2) % mask) + 1;
++    ind2 = (lparseHash((char *)key, arity*4, SEED_2) % mask) + 1;
+   else
+     return ind1;
+ 
+Index: src/error.h
+===================================================================
+--- src/error.h.orig
++++ src/error.h
+@@ -98,6 +98,6 @@ const char *error_file_and_line(long lin
+ // target system.
+ 
+ #include "term.h"
+-void runtime_error(InternalFunction f, ErrorType t, long a1 = 0, long a2 = 0);
++void lparse_runtime_error(InternalFunction f, ErrorType t, long a1 = 0, long a2 = 0);
+ 
+ #endif
+Index: src/library.cc
+===================================================================
+--- src/library.cc.orig
++++ src/library.cc
+@@ -164,7 +164,7 @@ long int_plus(int nargs, long *args )
+ 
+   for (i=0; i < nargs; i++) {
+     if (IS_CONSTANT(args[i])) 
+-      runtime_error(FUN_PLUS, ERR_ARGUMENT, args[i]);
++      lparse_runtime_error(FUN_PLUS, ERR_ARGUMENT, args[i]);
+ 
+     result += args[i];
+   }
+@@ -175,25 +175,25 @@ long int_plus(int nargs, long *args )
+ long int_exp(int nargs, long *args )
+ {
+   if (nargs != 2) {
+-    runtime_error(FUN_EXP, ERR_NUMARGS, 2);
++    lparse_runtime_error(FUN_EXP, ERR_NUMARGS, 2);
+   }
+   long base = args[0];
+   long power = args[1];
+   long result = 1;
+   
+   if (IS_CONSTANT(args[0])) 
+-    runtime_error(FUN_EXP, ERR_ARGUMENT, args[0]);
++    lparse_runtime_error(FUN_EXP, ERR_ARGUMENT, args[0]);
+ 
+   if (IS_CONSTANT(args[1])) 
+-    runtime_error(FUN_EXP, ERR_ARGUMENT, args[1]);
++    lparse_runtime_error(FUN_EXP, ERR_ARGUMENT, args[1]);
+ 
+   if (power < 0)
+-    runtime_error(FUN_EXP, ERR_ARGUMENT, args[1]);
++    lparse_runtime_error(FUN_EXP, ERR_ARGUMENT, args[1]);
+   
+   while (power--) {
+     result *= base;
+     if (IS_CONSTANT(result))
+-      runtime_error(FUN_EXP, ERR_OVERFLOW, 0);
++      lparse_runtime_error(FUN_EXP, ERR_OVERFLOW, 0);
+   }
+   return result;
+ }
+@@ -201,16 +201,16 @@ long int_exp(int nargs, long *args )
+ long int_norm(int nargs, long *args)
+ {
+   if (nargs != 1) {
+-    runtime_error(FUN_NORM, ERR_NUMARGS, 1);
++    lparse_runtime_error(FUN_NORM, ERR_NUMARGS, 1);
+   }
+   
+   if (args[0] < 0 || args[0] > predicate_table->Size())
+-    runtime_error(FUN_NORM, ERR_RANGE, args[0]);
++    lparse_runtime_error(FUN_NORM, ERR_RANGE, args[0]);
+ 
+   long p = args[0];
+ 
+   if (!predicates[p]->DomainPredicate())
+-    runtime_error(FUN_NORM, ERR_NONFIXED_EXTENSION, args[0]);
++    lparse_runtime_error(FUN_NORM, ERR_NONFIXED_EXTENSION, args[0]);
+   
+   if (predicates[p]->atoms)
+     return predicates[p]->atoms->Size();
+@@ -258,11 +258,11 @@ long int_minus(int nargs, long *args)
+   result = args[0];
+ 
+   if (IS_CONSTANT(result)) 
+-    runtime_error(FUN_MINUS, ERR_ARGUMENT, args[i]);
++    lparse_runtime_error(FUN_MINUS, ERR_ARGUMENT, args[i]);
+  
+   for (i = 1; i < nargs; i++) { // '1' intentional
+     if (IS_CONSTANT(args[i])) 
+-      runtime_error(FUN_MINUS, ERR_ARGUMENT, args[i]);
++      lparse_runtime_error(FUN_MINUS, ERR_ARGUMENT, args[i]);
+ 
+     result -= args[i];
+   }
+@@ -277,7 +277,7 @@ long int_abs(int, long *args)
+   result = args[0];
+ 
+   if (IS_CONSTANT(result)) 
+-    runtime_error(FUN_ABS, ERR_ARGUMENT, result);
++    lparse_runtime_error(FUN_ABS, ERR_ARGUMENT, result);
+       
+   
+   if (result < 0)
+@@ -300,7 +300,7 @@ long int_le(int nargs, long *args)
+ 
+   for (i = 1 ; i < nargs; i++ ) { // '1' intentional
+     if (IS_CONSTANT(args[i]))
+-      runtime_error(FUN_LE, ERR_INVALID_COMPARE, args[0], args[i]);
++      lparse_runtime_error(FUN_LE, ERR_INVALID_COMPARE, args[0], args[i]);
+     
+     if (args[i] < prior_value) {
+       result = 0;
+@@ -324,7 +324,7 @@ long int_ge(int nargs, long *args)
+   
+   for (i = 1 ; i < nargs; i++ ) { // '1' intentional
+     if (IS_CONSTANT(args[i]))
+-      runtime_error(FUN_GE, ERR_INVALID_COMPARE, args[0],args[i]);
++      lparse_runtime_error(FUN_GE, ERR_INVALID_COMPARE, args[0],args[i]);
+ 
+     
+     if (args[i] > prior_value) {
+@@ -349,7 +349,7 @@ long int_gt(int nargs, long *args)
+   
+   for (i = 1 ; i < nargs; i++ ) { // '1' intentional
+     if (IS_CONSTANT(args[i]))
+-      runtime_error(FUN_GT, ERR_INVALID_COMPARE, args[0],args[i]);
++      lparse_runtime_error(FUN_GT, ERR_INVALID_COMPARE, args[0],args[i]);
+ 
+     if (args[i] >= prior_value) {
+       result = 0;
+@@ -373,7 +373,7 @@ long int_lt(int nargs, long *args)
+   
+   for (i = 1 ; i < nargs; i++ ) { // '1' intentional
+     if (IS_CONSTANT(args[i]))
+-      runtime_error(FUN_LT, ERR_INVALID_COMPARE, args[0], args[i]);
++      lparse_runtime_error(FUN_LT, ERR_INVALID_COMPARE, args[0], args[i]);
+ 
+     if (args[i] <= prior_value) {
+       result = 0;
+@@ -408,11 +408,11 @@ long int_times(int nargs, long *args)
+   int i = 0;
+ 
+   if (IS_CONSTANT(result)) 
+-    runtime_error(FUN_TIMES, ERR_ARGUMENT, args[i]);
++    lparse_runtime_error(FUN_TIMES, ERR_ARGUMENT, args[i]);
+ 
+   for (i = 0; i < nargs; i++) {
+     if (IS_CONSTANT(args[i])) 
+-      runtime_error(FUN_TIMES, ERR_ARGUMENT, args[i]);
++      lparse_runtime_error(FUN_TIMES, ERR_ARGUMENT, args[i]);
+ 
+     result *= args[i];
+   }
+@@ -425,14 +425,14 @@ long int_div(int nargs, long *args)
+   int i = 0;
+ 
+   if (IS_CONSTANT(result)) 
+-    runtime_error(FUN_DIV, ERR_ARGUMENT, args[i]);
++    lparse_runtime_error(FUN_DIV, ERR_ARGUMENT, args[i]);
+ 
+   for (i = 1; i < nargs; i++) { // '1' intentional
+     if (IS_CONSTANT(args[i])) 
+-      runtime_error(FUN_DIV,ERR_ARGUMENT, args[i]);
++      lparse_runtime_error(FUN_DIV,ERR_ARGUMENT, args[i]);
+     
+     if (args[i] == 0) {
+-      runtime_error(FUN_DIV,ERR_DIVIDE_BY_ZERO, 0); 
++      lparse_runtime_error(FUN_DIV,ERR_DIVIDE_BY_ZERO, 0); 
+     } else {
+       result /= args[i];
+     }
+@@ -446,14 +446,14 @@ long int_mod(int nargs, long *args)
+   int i = 0;
+ 
+   if (IS_CONSTANT(result)) 
+-    runtime_error(FUN_MOD, ERR_ARGUMENT, args[i]);
++    lparse_runtime_error(FUN_MOD, ERR_ARGUMENT, args[i]);
+ 
+   for (i = 1; i < nargs; i++) { // '1' intentional
+     if (IS_CONSTANT(args[i])) 
+-      runtime_error(FUN_MOD, ERR_ARGUMENT, args[i]);
++      lparse_runtime_error(FUN_MOD, ERR_ARGUMENT, args[i]);
+ 
+     if (args[i] == 0) {
+-      runtime_error(FUN_MOD, ERR_DIVIDE_BY_ZERO, 0); 
++      lparse_runtime_error(FUN_MOD, ERR_DIVIDE_BY_ZERO, 0); 
+     } else {
+       result %= args[i];
+       if (result < 0)
+@@ -469,11 +469,11 @@ long int_and(int nargs, long *args)
+   int i = 0;
+ 
+   if (IS_CONSTANT(result)) 
+-    runtime_error(FUN_AND, ERR_ARGUMENT, args[i]);
++    lparse_runtime_error(FUN_AND, ERR_ARGUMENT, args[i]);
+   
+   for (i = 1; i < nargs; i++) { // '1' intentional
+     if (IS_CONSTANT(args[i])) 
+-      runtime_error(FUN_AND, ERR_ARGUMENT, args[i]);
++      lparse_runtime_error(FUN_AND, ERR_ARGUMENT, args[i]);
+     
+     result &= args[i];
+   }
+@@ -486,11 +486,11 @@ long int_or(int nargs, long *args)
+   int i = 0;
+ 
+   if (IS_CONSTANT(result)) 
+-    runtime_error(FUN_OR, ERR_ARGUMENT, args[i]);
++    lparse_runtime_error(FUN_OR, ERR_ARGUMENT, args[i]);
+ 
+   for (i = 1; i < nargs; i++) { // '1' intentional
+     if (IS_CONSTANT(args[i])) 
+-      runtime_error(FUN_OR, ERR_ARGUMENT, args[i]);
++      lparse_runtime_error(FUN_OR, ERR_ARGUMENT, args[i]);
+ 
+     result |= args[i];
+   }
+@@ -503,11 +503,11 @@ long int_xor(int nargs, long *args)
+   int i = 0;
+ 
+   if (IS_CONSTANT(result)) 
+-    runtime_error(FUN_XOR, ERR_ARGUMENT, args[i]);
++    lparse_runtime_error(FUN_XOR, ERR_ARGUMENT, args[i]);
+ 
+   for (i = 1; i < nargs; i++) { // '1' intentional
+     if (IS_CONSTANT(args[i])) 
+-      runtime_error(FUN_XOR, ERR_ARGUMENT, args[i]);
++      lparse_runtime_error(FUN_XOR, ERR_ARGUMENT, args[i]);
+ 
+     result ^= args[i];
+   }
+@@ -520,7 +520,7 @@ long int_not(int, long *args)
+   long result = args[0];
+ 
+   if (IS_CONSTANT(result)) 
+-    runtime_error(FUN_NOT, ERR_ARGUMENT, result);
++    lparse_runtime_error(FUN_NOT, ERR_ARGUMENT, result);
+   
+   result = ~result;
+   return result;
+@@ -540,7 +540,7 @@ long lt_string(int nargs, long *args)
+   for (int i = 1; i < nargs; i++) {
+     second = constant_table->LookupByValue(args[i]);
+     if (!second)
+-      runtime_error(FUN_LT, ERR_INVALID_COMPARE, args[0], args[i]);
++      lparse_runtime_error(FUN_LT, ERR_INVALID_COMPARE, args[0], args[i]);
+ 
+     if (strcmp(first, second) >= 0) {
+       result = 0;
+@@ -564,7 +564,7 @@ long le_string(int nargs, long *args)
+   for (int i = 1; i < nargs; i++) {
+     second = constant_table->LookupByValue(args[i]);
+     if (!second)
+-      runtime_error(FUN_LE, ERR_INVALID_COMPARE,args[0], args[i]);
++      lparse_runtime_error(FUN_LE, ERR_INVALID_COMPARE,args[0], args[i]);
+ 
+     if (strcmp(first, second) > 0) {
+       result = 0;
+@@ -589,7 +589,7 @@ long gt_string(int nargs, long *args)
+   for (int i = 1; i < nargs; i++) {
+     second = constant_table->LookupByValue(args[i]);
+     if (!second)
+-      runtime_error(FUN_GT, ERR_INVALID_COMPARE, args[0],args[i]);
++      lparse_runtime_error(FUN_GT, ERR_INVALID_COMPARE, args[0],args[i]);
+ 
+     if (strcmp(first, second) <= 0) {
+       result = 0;
+@@ -614,7 +614,7 @@ long ge_string(int nargs, long *args)
+   for (int i = 1; i < nargs; i++) {
+     second = constant_table->LookupByValue(args[i]);
+     if (!second)
+-      runtime_error(FUN_GE, ERR_INVALID_COMPARE,args[0], args[i]);
++      lparse_runtime_error(FUN_GE, ERR_INVALID_COMPARE,args[0], args[i]);
+ 
+     if (strcmp(first, second) < 0) {
+       result = 0;
+Index: src/extern.h
+===================================================================
+--- src/extern.h.orig
++++ src/extern.h
+@@ -76,7 +76,7 @@ extern LongList *command_line_constants;
+ 
+ extern LiteralList *implicit_domain_list;
+ 
+-unsigned long hash(const char *key, unsigned long length,
++unsigned long lparseHash(const char *key, unsigned long length,
+                   unsigned long initval);
+ 
+ // replacement of strdup that is not standard
+Index: src/symbol.cc
+===================================================================
+--- src/symbol.cc.orig
++++ src/symbol.cc
+@@ -127,9 +127,9 @@ unsigned long SymbolTable::FindIndex(con
+   else
+     table = items;
+   
+-  ind1 = hash(key, strlen(key), SEED_1) % mask;
++  ind1 = lparseHash(key, strlen(key), SEED_1) % mask;
+   if (table[ind1] && strcmp(key, table[ind1]->symbol))
+-    ind2 = (hash(key, strlen(key), SEED_2) % mask) + 1;
++    ind2 = (lparseHash(key, strlen(key), SEED_2) % mask) + 1;
+   else 
+     return ind1;
+ 
+@@ -398,9 +398,9 @@ unsigned long FunctionTable::FindIndex(c
+   else
+     table = items;
+   
+-  ind1 = hash(key, strlen(key), SEED_1) % mask;
++  ind1 = lparseHash(key, strlen(key), SEED_1) % mask;
+   if (table[ind1] && strcmp(key, table[ind1]->symbol))
+-    ind2 = (hash(key, strlen(key), SEED_2) % mask) + 1;
++    ind2 = (lparseHash(key, strlen(key), SEED_2) % mask) + 1;
+   else
+     return ind1;
+ 
+Index: src/error.cc
+===================================================================
+--- src/error.cc.orig
++++ src/error.cc
+@@ -343,7 +343,7 @@ void RuntimeError::Print()
+   output(cerr, "\n");
+ }
+ 
+-void runtime_error(InternalFunction, ErrorType t, long a1, long a2)  
++void lparse_runtime_error(InternalFunction, ErrorType t, long a1, long a2)  
+ {
+   RuntimeError rt(t, a1, a2);
+   throw rt;