Fix build with newer bison. Don't use <rope> with clang, but fall back

to <string>. Untested for functionality.

14 files changed, 221 insertions, 1 deletions

diff --git a/lang/maude/distinfo b/lang/maude/distinfo
index 123a1e9b3d0..5df4849bf26 100644
--- a/lang/maude/distinfo
+++ b/lang/maude/distinfo
@@ -1,7 +1,20 @@
-$NetBSD: distinfo,v 1.9 2011/04/19 19:18:40 asau Exp $
+$NetBSD: distinfo,v 1.10 2013/11/29 18:30:09 joerg Exp $
 
 SHA1 (Maude-2.6.tar.gz) = 3f1ec2f39a22942bb096102d1d8d6eed4510483e
 RMD160 (Maude-2.6.tar.gz) = a9387701016e04ba4a256c3db8c9f10195147183
 Size (Maude-2.6.tar.gz) = 1600026 bytes
 SHA1 (patch-ab) = ff1caa60e4b57dd6a847e28d25efa9be8474f15a
 SHA1 (patch-ac) = d77e8e817cb33c2594eacfa0cb44b20b63e71b8f
+SHA1 (patch-src_BuiltIn_stringOpSymbol.cc) = bb79d812dbb5d217ba50c71568e4b9da071917bc
+SHA1 (patch-src_Mixfix_bottom.yy) = 778f004b2590612a693867f44e0803e557076b69
+SHA1 (patch-src_Mixfix_commands.yy) = 8764520a8e2417408e1d9cd5820dac96cb7b5de1
+SHA1 (patch-src_Mixfix_interact.cc) = 0d15aad293cf28bde3b2a659c52dab8fe5a05357
+SHA1 (patch-src_Mixfix_lexerAux.cc) = c8bd0d1e68aec2aa2b21b69520172f2de851d661
+SHA1 (patch-src_Mixfix_lexerAux.hh) = 1e52d2346dfde0477b7db1882c5d67c1dce4502a
+SHA1 (patch-src_Mixfix_modules.yy) = cfa794edd400f1934a8bbba3bdb5051d53a09090
+SHA1 (patch-src_Mixfix_token.cc) = f8317efc2f5636749f597e8f252398d6be5c2dec
+SHA1 (patch-src_Mixfix_top.yy) = 884758d2b2e3f5d55dca51e35bf5d0c4e8ad79a0
+SHA1 (patch-src_ObjectSystem_configSymbol.hh) = c5ea2818a62a363e0fd598b98051abdeb095b503
+SHA1 (patch-src_ObjectSystem_objectMap.cc) = bb6f20ba7fd73133a5e5799e6bac0ebbb744bb55
+SHA1 (patch-src_ObjectSystem_objectSystemRewritingContext.hh) = f3000c8528b550096fb7355669033061db1ad68b
+SHA1 (patch-src_Utility_ropeStuff.hh) = 421c3d104aef7e4e908383220c502d3d21b3e51b
diff --git a/lang/maude/patches/patch-src_BuiltIn_stringOpSymbol.cc b/lang/maude/patches/patch-src_BuiltIn_stringOpSymbol.cc
new file mode 100644
index 00000000000..0915527317a
--- /dev/null
+++ b/lang/maude/patches/patch-src_BuiltIn_stringOpSymbol.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_BuiltIn_stringOpSymbol.cc,v 1.1 2013/11/29 18:30:10 joerg Exp $
+
+--- src/BuiltIn/stringOpSymbol.cc.orig	2013-11-28 00:39:08.000000000 +0000
++++ src/BuiltIn/stringOpSymbol.cc
+@@ -472,7 +472,7 @@ StringOpSymbol::eqRewrite(DagNode* subje
+ 		const mpz_class& n0 = succSymbol->getNat(a0);
+ 		if (n0 <= 255)
+ 		  {
+-		    char c = n0.get_si();
++		    char c[2] = { n0.get_si(), 0 };
+ 		    return rewriteToString(subject, context, crope(c));
+ 		  }
+ 	      }
diff --git a/lang/maude/patches/patch-src_Mixfix_bottom.yy b/lang/maude/patches/patch-src_Mixfix_bottom.yy
new file mode 100644
index 00000000000..f6e14894586
--- /dev/null
+++ b/lang/maude/patches/patch-src_Mixfix_bottom.yy
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Mixfix_bottom.yy,v 1.1 2013/11/29 18:30:10 joerg Exp $
+
+--- src/Mixfix/bottom.yy.orig	2013-11-28 01:19:40.000000000 +0000
++++ src/Mixfix/bottom.yy
+@@ -23,7 +23,7 @@
+ %%
+ 
+ static void
+-yyerror(char *s)
++yyerror(UserLevelRewritingContext::ParseResult *parseResult, char *s)
+ {
+   if (!(UserLevelRewritingContext::interrupted()))
+     IssueWarning(LineNumber(lineNumber) << ": " << s);
diff --git a/lang/maude/patches/patch-src_Mixfix_commands.yy b/lang/maude/patches/patch-src_Mixfix_commands.yy
new file mode 100644
index 00000000000..8d65a603d14
--- /dev/null
+++ b/lang/maude/patches/patch-src_Mixfix_commands.yy
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_Mixfix_commands.yy,v 1.1 2013/11/29 18:30:10 joerg Exp $
+
+--- src/Mixfix/commands.yy.orig	2013-11-28 01:20:49.000000000 +0000
++++ src/Mixfix/commands.yy
+@@ -23,12 +23,12 @@
+ /*
+  *	Commands.
+  */
+-command		:	KW_SELECT		{ lexBubble(END_COMMAND, 1) }
++command		:	KW_SELECT		{ lexBubble(END_COMMAND, 1); }
+ 			endBubble
+ 			{
+ 			  interpreter.setCurrentModule(lexerBubble);
+ 			}
+-		|	KW_DUMP			{ lexBubble(END_COMMAND, 1) }
++		|	KW_DUMP			{ lexBubble(END_COMMAND, 1); }
+ 			endBubble
+ 			{
+ 			  if (interpreter.setCurrentModule(lexerBubble))
diff --git a/lang/maude/patches/patch-src_Mixfix_interact.cc b/lang/maude/patches/patch-src_Mixfix_interact.cc
new file mode 100644
index 00000000000..a4c4cc4b4da
--- /dev/null
+++ b/lang/maude/patches/patch-src_Mixfix_interact.cc
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_Mixfix_interact.cc,v 1.1 2013/11/29 18:30:10 joerg Exp $
+
+--- src/Mixfix/interact.cc.orig	2013-11-28 01:17:11.000000000 +0000
++++ src/Mixfix/interact.cc
+@@ -25,13 +25,14 @@
+ //
+ #include <signal.h>
+ 
++#include "surface.h"
++
+ bool UserLevelRewritingContext::interactiveFlag = true;
+ bool UserLevelRewritingContext::ctrlC_Flag = false;
+ bool UserLevelRewritingContext::stepFlag = false;
+ bool UserLevelRewritingContext::abortFlag = false;
+ int UserLevelRewritingContext::debugLevel = 0;
+ 
+-int yyparse(void*);
+ void cleanUpParser();
+ void cleanUpLexer();
+ 
diff --git a/lang/maude/patches/patch-src_Mixfix_lexerAux.cc b/lang/maude/patches/patch-src_Mixfix_lexerAux.cc
new file mode 100644
index 00000000000..9aacdc17768
--- /dev/null
+++ b/lang/maude/patches/patch-src_Mixfix_lexerAux.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Mixfix_lexerAux.cc,v 1.1 2013/11/29 18:30:10 joerg Exp $
+
+--- src/Mixfix/lexerAux.cc.orig	2013-11-28 00:54:41.000000000 +0000
++++ src/Mixfix/lexerAux.cc
+@@ -35,7 +35,7 @@ bool fakeNewline = false;  // fake \n fo
+ bool fakeNewlineStack[MAX_IN_DEPTH];
+ 
+ void
+-getInput(char* buf, int& result, int max_size)
++getInput(char* buf, size_t& result, int max_size)
+ {
+   result = YY_NULL;
+   if (UserLevelRewritingContext::interrupted())
diff --git a/lang/maude/patches/patch-src_Mixfix_lexerAux.hh b/lang/maude/patches/patch-src_Mixfix_lexerAux.hh
new file mode 100644
index 00000000000..7aa86c30b04
--- /dev/null
+++ b/lang/maude/patches/patch-src_Mixfix_lexerAux.hh
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Mixfix_lexerAux.hh,v 1.1 2013/11/29 18:30:10 joerg Exp $
+
+--- src/Mixfix/lexerAux.hh.orig	2013-11-28 00:54:39.000000000 +0000
++++ src/Mixfix/lexerAux.hh
+@@ -27,7 +27,7 @@
+ //extern int inStackPtr;
+ //extern YY_BUFFER_STATE inStack[];
+ 
+-void getInput(char* buf, int& result, int max_size);
++void getInput(char* buf, size_t& result, int max_size);
+ void lexerIdMode();
+ void lexerTokenTreeMode(int terminatingTokens);
+ void lexerCmdMode();
diff --git a/lang/maude/patches/patch-src_Mixfix_modules.yy b/lang/maude/patches/patch-src_Mixfix_modules.yy
new file mode 100644
index 00000000000..9298681e5cd
--- /dev/null
+++ b/lang/maude/patches/patch-src_Mixfix_modules.yy
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Mixfix_modules.yy,v 1.1 2013/11/29 18:30:10 joerg Exp $
+
+--- src/Mixfix/modules.yy.orig	2013-11-28 01:36:15.000000000 +0000
++++ src/Mixfix/modules.yy
+@@ -247,7 +247,7 @@ viewEndOpMap	:	':'
+ 			  //	press on.
+ 			  //
+ 			  opDescription = lexerBubble;
+-			  lexBubble(END_STATEMENT, 1)
++			  lexBubble(END_STATEMENT, 1);
+ 			}
+ 			endBubble
+ 			{
diff --git a/lang/maude/patches/patch-src_Mixfix_token.cc b/lang/maude/patches/patch-src_Mixfix_token.cc
new file mode 100644
index 00000000000..74613056c69
--- /dev/null
+++ b/lang/maude/patches/patch-src_Mixfix_token.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Mixfix_token.cc,v 1.1 2013/11/29 18:30:10 joerg Exp $
+
+--- src/Mixfix/token.cc.orig	2013-11-28 00:50:24.000000000 +0000
++++ src/Mixfix/token.cc
+@@ -632,7 +632,7 @@ Token::codeToRope(int code)
+ 	      }
+ 	  }
+ 	}
+-      result.append(c);
++      result.push_back(c);
+       seenBackslash = false;
+     }
+   CantHappen("bad end to string");
diff --git a/lang/maude/patches/patch-src_Mixfix_top.yy b/lang/maude/patches/patch-src_Mixfix_top.yy
new file mode 100644
index 00000000000..56ee7269a78
--- /dev/null
+++ b/lang/maude/patches/patch-src_Mixfix_top.yy
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_Mixfix_top.yy,v 1.1 2013/11/29 18:30:10 joerg Exp $
+
+--- src/Mixfix/top.yy.orig	2013-11-28 01:19:24.000000000 +0000
++++ src/Mixfix/top.yy
+@@ -59,7 +59,6 @@
+ #define store(token)		tokenSequence.append(token)
+ #define fragClear()		fragments.contractTo(0);
+ #define fragStore(token)	fragments.append(token)
+-#define YYPARSE_PARAM	parseResult
+ #define PARSE_RESULT	(*((UserLevelRewritingContext::ParseResult*) parseResult))
+ 
+ #define CM		interpreter.getCurrentModule()
+@@ -91,13 +90,14 @@ SyntaxContainer* oldSyntaxContainer = 0;
+ Int64 number;
+ Int64 number2;
+ 
+-static void yyerror(char *s);
++static void yyerror(UserLevelRewritingContext::ParseResult *parseResult, char *s);
+ 
+ void cleanUpModuleExpression();
+ void cleanUpParser();
+ void missingSpace(const Token& token);
+ %}
+-%pure_parser
++%parse-param { UserLevelRewritingContext::ParseResult *parseResult }
++%pure-parser
+ 
+ %union
+ {
diff --git a/lang/maude/patches/patch-src_ObjectSystem_configSymbol.hh b/lang/maude/patches/patch-src_ObjectSystem_configSymbol.hh
new file mode 100644
index 00000000000..ef0a65378ab
--- /dev/null
+++ b/lang/maude/patches/patch-src_ObjectSystem_configSymbol.hh
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_ObjectSystem_configSymbol.hh,v 1.1 2013/11/29 18:30:10 joerg Exp $
+
+--- src/ObjectSystem/configSymbol.hh.orig	2013-11-28 00:44:18.000000000 +0000
++++ src/ObjectSystem/configSymbol.hh
+@@ -50,7 +50,7 @@ public:
+ private:
+   struct symbolLt
+   {
+-    bool operator()(const Symbol* d1, const Symbol* d2)
++    bool operator()(const Symbol* d1, const Symbol* d2) const
+     {
+       return d1->compare(d2) < 0;
+     }
diff --git a/lang/maude/patches/patch-src_ObjectSystem_objectMap.cc b/lang/maude/patches/patch-src_ObjectSystem_objectMap.cc
new file mode 100644
index 00000000000..53ceb69aecb
--- /dev/null
+++ b/lang/maude/patches/patch-src_ObjectSystem_objectMap.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_ObjectSystem_objectMap.cc,v 1.1 2013/11/29 18:30:10 joerg Exp $
+
+--- src/ObjectSystem/objectMap.cc.orig	2013-11-28 00:45:15.000000000 +0000
++++ src/ObjectSystem/objectMap.cc
+@@ -50,7 +50,7 @@ ConfigSymbol::MessageQueue::markReachabl
+ 
+ struct ConfigSymbol::dagNodeLt
+ {
+-  bool operator()(const DagNode* d1, const DagNode* d2)
++  bool operator()(const DagNode* d1, const DagNode* d2) const
+     {
+       return d1->compare(d2) < 0;
+     }
diff --git a/lang/maude/patches/patch-src_ObjectSystem_objectSystemRewritingContext.hh b/lang/maude/patches/patch-src_ObjectSystem_objectSystemRewritingContext.hh
new file mode 100644
index 00000000000..9e2e75e9764
--- /dev/null
+++ b/lang/maude/patches/patch-src_ObjectSystem_objectSystemRewritingContext.hh
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_ObjectSystem_objectSystemRewritingContext.hh,v 1.1 2013/11/29 18:30:10 joerg Exp $
+
+--- src/ObjectSystem/objectSystemRewritingContext.hh.orig	2013-11-28 00:46:15.000000000 +0000
++++ src/ObjectSystem/objectSystemRewritingContext.hh
+@@ -62,7 +62,7 @@ protected:
+ private:
+   struct dagNodeLt
+   {
+-    bool operator()(const DagNode* d1, const DagNode* d2)
++    bool operator()(const DagNode* d1, const DagNode* d2) const
+     {
+       return d1->compare(d2) < 0;
+     }
diff --git a/lang/maude/patches/patch-src_Utility_ropeStuff.hh b/lang/maude/patches/patch-src_Utility_ropeStuff.hh
new file mode 100644
index 00000000000..16e7ea7447e
--- /dev/null
+++ b/lang/maude/patches/patch-src_Utility_ropeStuff.hh
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_Utility_ropeStuff.hh,v 1.1 2013/11/29 18:30:10 joerg Exp $
+
+--- src/Utility/ropeStuff.hh.orig	2005-10-06 19:59:42.000000000 +0000
++++ src/Utility/ropeStuff.hh
+@@ -25,6 +25,11 @@
+ //
+ #ifndef _ropeStuff_hh_
+ #define _ropeStuff_hh_
++#include <cstddef>
++#ifdef _LIBCPP_VERSION
++#include <string>
++typedef std::string crope;
++#else
+ #ifdef __GNUC__
+   #if __GNUC__ < 3
+     #include <rope.h>
+@@ -50,3 +55,5 @@
+ #include <rope>
+ #endif
+ #endif
++
++#endif