fix build on -stable

Noticed by:	bento via kris

5 files changed, 66 insertions, 2 deletions

diff --git a/devel/dprog/files/patch-ast_test.cc b/devel/dprog/files/patch-ast_test.cc
new file mode 100644
index 000000000000..afd9aae9544b
--- /dev/null
+++ b/devel/dprog/files/patch-ast_test.cc
@@ -0,0 +1,10 @@
+--- ast_test.cc.orig	Mon Apr 12 11:22:05 2004
++++ ast_test.cc	Mon Apr 12 11:22:15 2004
+@@ -3,6 +3,7 @@
+ #include "visitor.hh"
+ using namespace ast;
+ 
++#include <cstdio>
+ #include <iostream>
+ 
+ int yyparse();
diff --git a/devel/dprog/files/patch-cxx_codegen.cc b/devel/dprog/files/patch-cxx_codegen.cc
new file mode 100644
index 000000000000..0ba2d90365f8
--- /dev/null
+++ b/devel/dprog/files/patch-cxx_codegen.cc
@@ -0,0 +1,19 @@
+--- cxx_codegen.cc.orig	Mon Apr 12 11:13:48 2004
++++ cxx_codegen.cc	Mon Apr 12 11:15:00 2004
+@@ -8,6 +8,7 @@
+ #include <fstream>
+ #include <sstream>
+ #include <set>
++#include <cassert>
+ 
+ using namespace ast;
+ using namespace std;
+@@ -83,7 +84,7 @@
+ {
+     _cc_os << "for (int " << rexpr.index() << " = ";
+     rexpr.begin()->accept(*this);
+-    if (not rexpr.begin_br()->include())
++    if (! rexpr.begin_br()->include())
+ 	{
+ 	    if (rexpr.begin_br()->is_less())
+ 		_cc_os << " + 1";
diff --git a/devel/dprog/files/patch-pprint.cc b/devel/dprog/files/patch-pprint.cc
new file mode 100644
index 000000000000..383b390857a4
--- /dev/null
+++ b/devel/dprog/files/patch-pprint.cc
@@ -0,0 +1,10 @@
+--- pprint.cc.orig	Mon Apr 12 11:20:27 2004
++++ pprint.cc	Mon Apr 12 11:20:46 2004
+@@ -3,6 +3,7 @@
+ using namespace ast;
+ #include "pretty_printer.hh"
+ 
++#include <cstdio>
+ #include <iostream>
+ 
+ int yyparse();
diff --git a/devel/dprog/files/patch-range_checking.cc b/devel/dprog/files/patch-range_checking.cc
new file mode 100644
index 000000000000..b76f0abbfa37
--- /dev/null
+++ b/devel/dprog/files/patch-range_checking.cc
@@ -0,0 +1,14 @@
+--- range_checking.cc.orig	Mon Apr 12 11:10:54 2004
++++ range_checking.cc	Mon Apr 12 11:11:04 2004
+@@ -14,9 +14,9 @@
+ void
+ RangeCheckVisitor::visit (RExpr &rexpr)
+ {
+-    if (rexpr.begin_br()->is_less() and rexpr.end_br()->is_less())
++    if (rexpr.begin_br()->is_less() && rexpr.end_br()->is_less())
+ 	return;
+-    if (rexpr.begin_br()->is_greater() and rexpr.end_br()->is_greater())
++    if (rexpr.begin_br()->is_greater() && rexpr.end_br()->is_greater())
+ 	return;
+ 
+     throw new RangeError(rexpr);
diff --git a/devel/dprog/files/patch-type_checking.hh b/devel/dprog/files/patch-type_checking.hh
index b0063f06b25c..dce6033c8916 100644
--- a/devel/dprog/files/patch-type_checking.hh
+++ b/devel/dprog/files/patch-type_checking.hh
@@ -1,5 +1,5 @@
---- type_checking.hh.orig	Tue Dec 30 17:41:32 2003
-+++ type_checking.hh	Tue Dec 30 17:41:42 2003
+--- type_checking.hh.orig	Mon Apr 21 20:13:54 2003
++++ type_checking.hh	Mon Apr 12 11:11:30 2004
 @@ -7,6 +7,7 @@
  #include <set>
  #include <iostream>
@@ -8,3 +8,14 @@
  
  namespace type_checking {
  
+@@ -31,8 +32,8 @@
+ 	bool operator==(const TypeInfo &other) const
+ 	{
+ 	    return (typeid(*this) == typeid(other)
+-		  and (strcmp(name(),other.name()) == 0)
+-		  and (arity() == other.arity()));
++		  && (strcmp(name(),other.name()) == 0)
++		  && (arity() == other.arity()));
+ 	}
+ 	bool operator!=(const TypeInfo &other) const
+ 	{ return !((*this)==other); }