Attachment #37583 for bug #59770

View | Details | Raw Unified | Return to bug 59770
Collapse All | Expand All





PORTNAME=	ixlib
PORTVERSION=	0.96.2
PORTREVISION=	3
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}


USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB=	yes

.include <bsd.port.mk>

.if ${OSVERSION} >= 500113
BROKEN=         "Does not compile (bad C++ code)"
.endif

.include <bsd.port.post.mk>




--- src/ixlib_base.hh.orig	Fri Nov 28 11:48:47 2003
+++ src/ixlib_base.hh	Fri Nov 28 12:45:22 2003
@@ -44,11 +44,15 @@
 
 /* STL Helper macro -----------------------------------------------------------
 */
+#define FOREACH_T(VAR,LIST,LISTTYPE) \
+  for (typename LISTTYPE::iterator VAR = (LIST).begin(),last = (LIST).end();VAR != last;VAR++) 
+#define FOREACH_CONST_T(VAR,LIST,LISTTYPE) \
+  for (typename LISTTYPE::const_iterator VAR = (LIST).begin(),last = (LIST).end();VAR != last;VAR++) 
+
 #define FOREACH(VAR,LIST,LISTTYPE) \
   for (LISTTYPE::iterator VAR = (LIST).begin(),last = (LIST).end();VAR != last;VAR++) 
 #define FOREACH_CONST(VAR,LIST,LISTTYPE) \
   for (LISTTYPE::const_iterator VAR = (LIST).begin(),last = (LIST).end();VAR != last;VAR++) 
-
 
 
 




--- src/ixlib_javascript.hh.orig	Fri Nov 28 12:01:06 2003
+++ src/ixlib_javascript.hh	Fri Nov 28 12:41:42 2003
@@ -266,7 +266,11 @@
     // (=unite with) other scopes and keeps a list of registered members
     class list_scope : public value {
       protected:
+#if __GNUC__ < 3
         typedef std::hash_map<std::string,ref<value>,string_hash> member_map;
+#else
+        typedef __gnu_cxx::hash_map<std::string,ref<value>,string_hash> member_map;
+#endif
         typedef std::vector<ref<value> >			swallowed_list;
         
         member_map	MemberMap;

Line 0 Link Here

(-)/usr/ports/devel/ixlib/files/patch-src::ixlib_re.hh (+11 lines)
	1	--- src/ixlib_re.hh.orig Fri Nov 28 11:46:14 2003
	2	+++ src/ixlib_re.hh Fri Nov 28 11:53:24 2003
	3	@@ -163,7 +163,7 @@
	4
	5	struct backtrack_stack_entry {
	6	TIndex Index;
	7	- backref_stack::rewind_info RewindInfo;
	8	+ typename backref_stack::rewind_info RewindInfo;
	9	};
	10
	11	public:




--- src/ixlib_re_impl.hh.orig	Fri Nov 28 11:43:40 2003
+++ src/ixlib_re_impl.hh	Fri Nov 28 12:55:23 2003
@@ -38,7 +38,7 @@
 
 
 template<class T>
-ixion::regex<T>::backref_stack::rewind_info 
+typename ixion::regex<T>::backref_stack::rewind_info 
 ixion::regex<T>::backref_stack::getRewindInfo() const {
   return Stack.size();
   }
@@ -65,7 +65,7 @@
 template<class T>
 ixion::TSize ixion::regex<T>::backref_stack::size() {
   TSize result = 0;
-  FOREACH_CONST(first,Stack,internal_stack)
+  FOREACH_CONST_T(first,Stack,internal_stack)
     if (first->Type == backref_entry::OPEN) result++;
   return result;
   }
@@ -79,7 +79,7 @@
   TIndex start;
   TIndex startlevel;
   
-  internal_stack::const_iterator first = Stack.begin(),last = Stack.end();
+  typename internal_stack::const_iterator first = Stack.begin(),last = Stack.end();
   while (first != last) {
     if (first->Type == backref_entry::OPEN) {
       if (number == next_index) {
@@ -201,7 +201,7 @@
 
 
 template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::quantifier::duplicate() const {
+typename ixion::regex<T>::matcher *ixion::regex<T>::quantifier::duplicate() const {
   quantifier *dupe = new quantifier();
   dupe->copy(this);
   return dupe;
@@ -328,7 +328,7 @@
 
 
 template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::sequence_matcher::duplicate() const {
+typename ixion::regex<T>::matcher *ixion::regex<T>::sequence_matcher::duplicate() const {
   sequence_matcher *dupe = new sequence_matcher(MatchStr);
   dupe->copy(this);
   return dupe;
@@ -349,7 +349,7 @@
 
 // regex::any_matcher ---------------------------------------------------------
 template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::any_matcher::duplicate() const {
+typename ixion::regex<T>::matcher *ixion::regex<T>::any_matcher::duplicate() const {
   any_matcher *dupe = new any_matcher();
   dupe->copy(this);
   return dupe;
@@ -360,7 +360,7 @@
 
 // regex::start_matcher ---------------------------------------------------------
 template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::start_matcher::duplicate() const {
+typename ixion::regex<T>::matcher *ixion::regex<T>::start_matcher::duplicate() const {
   start_matcher *dupe = new start_matcher();
   dupe->copy(this);
   return dupe;
@@ -379,7 +379,7 @@
 
 // regex::end_matcher ---------------------------------------------------------
 template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::end_matcher::duplicate() const {
+typename ixion::regex<T>::matcher *ixion::regex<T>::end_matcher::duplicate() const {
   end_matcher *dupe = new end_matcher();
   dupe->copy(this);
   return dupe;
@@ -398,7 +398,7 @@
 
 // regex::backref_open_matcher ------------------------------------------------
 template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::backref_open_matcher::duplicate() const {
+typename ixion::regex<T>::matcher *ixion::regex<T>::backref_open_matcher::duplicate() const {
   backref_open_matcher *dupe = new backref_open_matcher();
   dupe->copy(this);
   return dupe;
@@ -409,7 +409,7 @@
 
 template<class T>
 bool ixion::regex<T>::backref_open_matcher::match(backref_stack &brstack,T const &candidate,TIndex at) {
-  backref_stack::rewind_info ri = brstack.getRewindInfo();
+  typename backref_stack::rewind_info ri = brstack.getRewindInfo();
   brstack.open(at);
   
   bool result = matchNext(brstack,candidate,at);
@@ -424,7 +424,7 @@
 
 // regex::backref_close_matcher -----------------------------------------------
 template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::backref_close_matcher::duplicate() const {
+typename ixion::regex<T>::matcher *ixion::regex<T>::backref_close_matcher::duplicate() const {
   backref_close_matcher *dupe = new backref_close_matcher();
   dupe->copy(this);
   return dupe;
@@ -435,7 +435,7 @@
 
 template<class T>
 bool ixion::regex<T>::backref_close_matcher::match(backref_stack &brstack,T const &candidate,TIndex at) {
-  backref_stack::rewind_info ri = brstack.getRewindInfo();
+  typename backref_stack::rewind_info ri = brstack.getRewindInfo();
   brstack.close(at);
   
   bool result = matchNext(brstack,candidate,at);
@@ -470,7 +470,7 @@
 
 
 template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::alternative_matcher::duplicate() const {
+typename ixion::regex<T>::matcher *ixion::regex<T>::alternative_matcher::duplicate() const {
   alternative_matcher *dupe = new alternative_matcher();
   dupe->copy(this);
   return dupe;
@@ -484,7 +484,7 @@
   TSize result = 0;
   bool is_first = true;
   
-  FOREACH_CONST(first,AltList,alt_list)
+  FOREACH_CONST_T(first,AltList,alt_list)
     if (is_first) {
       result = (*first)->minimumMatchLength();
       is_first = true;
@@ -500,7 +500,7 @@
 
 
 template<class T>
-void ixion::regex<T>::alternative_matcher::setNext(matcher *next,bool ownnext = true) {
+void ixion::regex<T>::alternative_matcher::setNext(matcher *next,bool ownnext) {
   matcher::setNext(next);
   Connector.setNext(next,false);
   }
@@ -524,7 +524,7 @@
 
 template<class T>
 bool ixion::regex<T>::alternative_matcher::match(backref_stack &brstack,T const &candidate,TIndex at) {
-  std::vector<matcher *>::iterator first = AltList.begin(),last = AltList.end();
+  typename std::vector<matcher *>::iterator first = AltList.begin(),last = AltList.end();
   while (first != last) {
     if ((*first)->match(brstack,candidate,at)) {
       MatchLength = 0;
@@ -548,7 +548,7 @@
   super::copy(src);
   Connector.setNext(Next,false);
   
-  FOREACH_CONST(first,src->AltList,alt_list)
+  FOREACH_CONST_T(first,src->AltList,alt_list)
     addAlternative((*first)->duplicate());
   }
 
@@ -565,7 +565,7 @@
 
 
 template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::backref_matcher::duplicate() const {
+typename ixion::regex<T>::matcher *ixion::regex<T>::backref_matcher::duplicate() const {
   backref_matcher *dupe = new backref_matcher(Backref);
   dupe->copy(this);
   return dupe;




--- src/js_interpreter.cc.orig	Fri Nov 28 12:56:09 2003
+++ src/js_interpreter.cc	Fri Nov 28 12:56:47 2003
@@ -89,8 +89,7 @@
 
 
 // javascript_exception -------------------------------------------------------
-javascript_exception::javascript_exception(TErrorCode error,code_location const &loc,char const *info,char *module = NULL,
-  TIndex line = 0)
+javascript_exception::javascript_exception(TErrorCode error,code_location const &loc,char const *info,char *module, TIndex line)
 : base_exception(error, NULL, module, line, "JS") {
   HasInfo = true;
   try {

Line 0 Link Here

(-)/usr/ports/devel/ixlib/files/patch-test::javascript.cc (+20 lines)
	1	--- test/javascript.cc.orig Fri Nov 28 12:57:33 2003
	2	+++ test/javascript.cc Fri Nov 28 13:15:30 2003
	3	@@ -64,7 +64,7 @@
	4
	5
	6	// simple call-in example -----------------------------------------------------
	7	-IXLIB_JS_DECLARE_FUNCTION(write) {
	8	+IXLIB_JS_DECLARE_FUNCTION(write_) {
	9	FOREACH_CONST(first,parameters,parameter_list)
	10	cout << (*first)->toString();
	11	return makeNull();
	12	@@ -99,7 +99,7 @@
	13	// end complex call-in example --------------------------------------------
	14
	15	// simple call-in example -------------------------------------------------
	16	- ev = new write;
	17	+ ev = new write_;
	18	ip.RootScope->addMember("write",ev);
	19	// end simple call-in example ---------------------------------------------
	20

Return to bug 59770

Lines 8-14 Link Here

(-)/usr/ports/devel/ixlib/Makefile (-10 / +4 lines)
8		8
9	PORTNAME= ixlib	9	PORTNAME= ixlib
10	PORTVERSION= 0.96.2	10	PORTVERSION= 0.96.2
11	PORTREVISION= 2	11	PORTREVISION= 3
12	CATEGORIES= devel	12	CATEGORIES= devel
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
14	MASTER_SITE_SUBDIR= ${PORTNAME}	14	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 20-33 Link Here
20		20
21	USE_GMAKE= yes	21	USE_GMAKE= yes
22	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
23	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	23	CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
24	LDFLAGS="-L${LOCALBASE}/lib"	24	LDFLAGS="-L${LOCALBASE}/lib"
25	INSTALLS_SHLIB= yes	25	INSTALLS_SHLIB= yes
26		26
27	.include <bsd.port.pre.mk>	27	.include <bsd.port.mk>
28
29	.if ${OSVERSION} >= 500113
30	BROKEN= "Does not compile (bad C++ code)"
31	.endif
32
33	.include <bsd.port.post.mk>

Line 0 Link Here

(-)/usr/ports/devel/ixlib/files/patch-src::ixlib_base.hh (+19 lines)
	1	--- src/ixlib_base.hh.orig Fri Nov 28 11:48:47 2003
	2	+++ src/ixlib_base.hh Fri Nov 28 12:45:22 2003
	3	@@ -44,11 +44,15 @@
	4
	5	/* STL Helper macro -----------------------------------------------------------
	6	*/
	7	+#define FOREACH_T(VAR,LIST,LISTTYPE) \
	8	+ for (typename LISTTYPE::iterator VAR = (LIST).begin(),last = (LIST).end();VAR != last;VAR++)
	9	+#define FOREACH_CONST_T(VAR,LIST,LISTTYPE) \
	10	+ for (typename LISTTYPE::const_iterator VAR = (LIST).begin(),last = (LIST).end();VAR != last;VAR++)
	11	+
	12	#define FOREACH(VAR,LIST,LISTTYPE) \
	13	for (LISTTYPE::iterator VAR = (LIST).begin(),last = (LIST).end();VAR != last;VAR++)
	14	#define FOREACH_CONST(VAR,LIST,LISTTYPE) \
	15	for (LISTTYPE::const_iterator VAR = (LIST).begin(),last = (LIST).end();VAR != last;VAR++)
	16	-
	17
	18
	19

Line 0 Link Here

(-)/usr/ports/devel/ixlib/files/patch-src::ixlib_javascript.hh (+14 lines)
	1	--- src/ixlib_javascript.hh.orig Fri Nov 28 12:01:06 2003
	2	+++ src/ixlib_javascript.hh Fri Nov 28 12:41:42 2003
	3	@@ -266,7 +266,11 @@
	4	// (=unite with) other scopes and keeps a list of registered members
	5	class list_scope : public value {
	6	protected:
	7	+#if __GNUC__ < 3
	8	typedef std::hash_map<std::string,ref<value>,string_hash> member_map;
	9	+#else
	10	+ typedef __gnu_cxx::hash_map<std::string,ref<value>,string_hash> member_map;
	11	+#endif
	12	typedef std::vector<ref<value> > swallowed_list;
	13
	14	member_map MemberMap;

Line 0 Link Here

(-)/usr/ports/devel/ixlib/files/patch-src::ixlib_re_impl.hh (+164 lines)
		1	--- src/ixlib_re_impl.hh.orig Fri Nov 28 11:43:40 2003
		2	+++ src/ixlib_re_impl.hh Fri Nov 28 12:55:23 2003
		3	@@ -38,7 +38,7 @@
		4
		5
		6	template<class T>
		7	-ixion::regex<T>::backref_stack::rewind_info
		8	+typename ixion::regex<T>::backref_stack::rewind_info
		9	ixion::regex<T>::backref_stack::getRewindInfo() const {
		10	return Stack.size();
		11	}
		12	@@ -65,7 +65,7 @@
		13	template<class T>
		14	ixion::TSize ixion::regex<T>::backref_stack::size() {
		15	TSize result = 0;
		16	- FOREACH_CONST(first,Stack,internal_stack)
		17	+ FOREACH_CONST_T(first,Stack,internal_stack)
		18	if (first->Type == backref_entry::OPEN) result++;
		19	return result;
		20	}
		21	@@ -79,7 +79,7 @@
		22	TIndex start;
		23	TIndex startlevel;
		24
		25	- internal_stack::const_iterator first = Stack.begin(),last = Stack.end();
		26	+ typename internal_stack::const_iterator first = Stack.begin(),last = Stack.end();
		27	while (first != last) {
		28	if (first->Type == backref_entry::OPEN) {
		29	if (number == next_index) {
		30	@@ -201,7 +201,7 @@
		31
		32
		33	template<class T>
		34	-ixion::regex<T>::matcher *ixion::regex<T>::quantifier::duplicate() const {
		35	+typename ixion::regex<T>::matcher *ixion::regex<T>::quantifier::duplicate() const {
		36	quantifier *dupe = new quantifier();
		37	dupe->copy(this);
		38	return dupe;
		39	@@ -328,7 +328,7 @@
		40
		41
		42	template<class T>
		43	-ixion::regex<T>::matcher *ixion::regex<T>::sequence_matcher::duplicate() const {
		44	+typename ixion::regex<T>::matcher *ixion::regex<T>::sequence_matcher::duplicate() const {
		45	sequence_matcher *dupe = new sequence_matcher(MatchStr);
		46	dupe->copy(this);
		47	return dupe;
		48	@@ -349,7 +349,7 @@
		49
		50	// regex::any_matcher ---------------------------------------------------------
		51	template<class T>
		52	-ixion::regex<T>::matcher *ixion::regex<T>::any_matcher::duplicate() const {
		53	+typename ixion::regex<T>::matcher *ixion::regex<T>::any_matcher::duplicate() const {
		54	any_matcher *dupe = new any_matcher();
		55	dupe->copy(this);
		56	return dupe;
		57	@@ -360,7 +360,7 @@
		58
		59	// regex::start_matcher ---------------------------------------------------------
		60	template<class T>
		61	-ixion::regex<T>::matcher *ixion::regex<T>::start_matcher::duplicate() const {
		62	+typename ixion::regex<T>::matcher *ixion::regex<T>::start_matcher::duplicate() const {
		63	start_matcher *dupe = new start_matcher();
		64	dupe->copy(this);
65	return dupe;
66	@@ -379,7 +379,7 @@
67
68	// regex::end_matcher ---------------------------------------------------------
69	template<class T>
70	-ixion::regex<T>::matcher *ixion::regex<T>::end_matcher::duplicate() const {
71	+typename ixion::regex<T>::matcher *ixion::regex<T>::end_matcher::duplicate() const {
72	end_matcher *dupe = new end_matcher();
73	dupe->copy(this);
74	return dupe;
75	@@ -398,7 +398,7 @@
76
77	// regex::backref_open_matcher ------------------------------------------------
78	template<class T>
79	-ixion::regex<T>::matcher *ixion::regex<T>::backref_open_matcher::duplicate() const {
80	+typename ixion::regex<T>::matcher *ixion::regex<T>::backref_open_matcher::duplicate() const {
81	backref_open_matcher *dupe = new backref_open_matcher();
82	dupe->copy(this);
83	return dupe;
84	@@ -409,7 +409,7 @@
85
86	template<class T>
87	bool ixion::regex<T>::backref_open_matcher::match(backref_stack &brstack,T const &candidate,TIndex at) {
88	- backref_stack::rewind_info ri = brstack.getRewindInfo();
89	+ typename backref_stack::rewind_info ri = brstack.getRewindInfo();
90	brstack.open(at);
91
92	bool result = matchNext(brstack,candidate,at);
93	@@ -424,7 +424,7 @@
94
95	// regex::backref_close_matcher -----------------------------------------------
96	template<class T>
97	-ixion::regex<T>::matcher *ixion::regex<T>::backref_close_matcher::duplicate() const {
98	+typename ixion::regex<T>::matcher *ixion::regex<T>::backref_close_matcher::duplicate() const {
99	backref_close_matcher *dupe = new backref_close_matcher();
100	dupe->copy(this);
101	return dupe;
102	@@ -435,7 +435,7 @@
103
104	template<class T>
105	bool ixion::regex<T>::backref_close_matcher::match(backref_stack &brstack,T const &candidate,TIndex at) {
106	- backref_stack::rewind_info ri = brstack.getRewindInfo();
107	+ typename backref_stack::rewind_info ri = brstack.getRewindInfo();
108	brstack.close(at);
109
110	bool result = matchNext(brstack,candidate,at);
111	@@ -470,7 +470,7 @@
112
113
114	template<class T>
115	-ixion::regex<T>::matcher *ixion::regex<T>::alternative_matcher::duplicate() const {
116	+typename ixion::regex<T>::matcher *ixion::regex<T>::alternative_matcher::duplicate() const {
117	alternative_matcher *dupe = new alternative_matcher();
118	dupe->copy(this);
119	return dupe;
120	@@ -484,7 +484,7 @@
121	TSize result = 0;
122	bool is_first = true;
123
124	- FOREACH_CONST(first,AltList,alt_list)
125	+ FOREACH_CONST_T(first,AltList,alt_list)
126	if (is_first) {
127	result = (*first)->minimumMatchLength();
128	is_first = true;
129	@@ -500,7 +500,7 @@
130
131
132	template<class T>
133	-void ixion::regex<T>::alternative_matcher::setNext(matcher *next,bool ownnext = true) {
134	+void ixion::regex<T>::alternative_matcher::setNext(matcher *next,bool ownnext) {
135	matcher::setNext(next);
136	Connector.setNext(next,false);
137	}
138	@@ -524,7 +524,7 @@
139
140	template<class T>
141	bool ixion::regex<T>::alternative_matcher::match(backref_stack &brstack,T const &candidate,TIndex at) {
142	- std::vector<matcher *>::iterator first = AltList.begin(),last = AltList.end();
143	+ typename std::vector<matcher *>::iterator first = AltList.begin(),last = AltList.end();
144	while (first != last) {
145	if ((*first)->match(brstack,candidate,at)) {
146	MatchLength = 0;
147	@@ -548,7 +548,7 @@
148	super::copy(src);
149	Connector.setNext(Next,false);
150
151	- FOREACH_CONST(first,src->AltList,alt_list)
152	+ FOREACH_CONST_T(first,src->AltList,alt_list)
153	addAlternative((*first)->duplicate());
154	}
155
156	@@ -565,7 +565,7 @@
157
158
159	template<class T>
160	-ixion::regex<T>::matcher *ixion::regex<T>::backref_matcher::duplicate() const {
161	+typename ixion::regex<T>::matcher *ixion::regex<T>::backref_matcher::duplicate() const {
162	backref_matcher *dupe = new backref_matcher(Backref);
163	dupe->copy(this);
164	return dupe;

Line 0 Link Here

(-)/usr/ports/devel/ixlib/files/patch-src::js_interpreter.cc (+12 lines)
	1	--- src/js_interpreter.cc.orig Fri Nov 28 12:56:09 2003
	2	+++ src/js_interpreter.cc Fri Nov 28 12:56:47 2003
	3	@@ -89,8 +89,7 @@
	4
	5
	6	// javascript_exception -------------------------------------------------------
	7	-javascript_exception::javascript_exception(TErrorCode error,code_location const &loc,char const info,char module = NULL,
	8	- TIndex line = 0)
	9	+javascript_exception::javascript_exception(TErrorCode error,code_location const &loc,char const info,char module, TIndex line)
	10	: base_exception(error, NULL, module, line, "JS") {
	11	HasInfo = true;
	12	try {