Attachment #144463 for bug #191049

Lines 10-20 Link Here

(-)Makefile (-6 / +8 lines)
10	MAINTAINER= joemann@beefree.free.de	10	MAINTAINER= joemann@beefree.free.de
11	COMMENT= High-performance reflective language	11	COMMENT= High-performance reflective language
12		12
13	LIB_DEPENDS= bdd:${PORTSDIR}/science/buddy \	13	LICENSE= GPLv2
14	tecla:${PORTSDIR}/devel/libtecla \
15	gmp:${PORTSDIR}/math/gmp \
16	sigsegv:${PORTSDIR}/devel/libsigsegv
17		14
		15	LIB_DEPENDS= libbdd.so:${PORTSDIR}/science/buddy \
		16	libtecla.so:${PORTSDIR}/devel/libtecla \
		17	libgmp.so:${PORTSDIR}/math/gmp \
		18	libsigsegv.so:${PORTSDIR}/devel/libsigsegv
		19
18	USES= bison	20	USES= bison
19	USE_AUTOTOOLS= aclocal autoheader automake	21	USE_AUTOTOOLS= aclocal autoheader automake
20	AUTOMAKE_ARGS= --add-missing	22	AUTOMAKE_ARGS= --add-missing
Lines 22-27 Link Here
22	CPPFLAGS+= -I${LOCALBASE}/include	24	CPPFLAGS+= -I${LOCALBASE}/include
23	LDFLAGS+= -L${LOCALBASE}/lib	25	LDFLAGS+= -L${LOCALBASE}/lib
24	CONFIGURE_ARGS= --datadir=${DATADIR}	26	CONFIGURE_ARGS= --datadir=${DATADIR}
		27	USE_GCC= any
25		28
26	FULL_MAUDE_VER= 26b	29	FULL_MAUDE_VER= 26b
27		30
Lines 29-35 Link Here
29	OPTIONS_DEFAULT= FULL_MAUDE	32	OPTIONS_DEFAULT= FULL_MAUDE
30	FULL_MAUDE_DESC= Install full-maude${FULL_MAUDE_VER}	33	FULL_MAUDE_DESC= Install full-maude${FULL_MAUDE_VER}
31		34
32	NO_STAGE= yes
33	.include <bsd.port.options.mk>	35	.include <bsd.port.options.mk>
34		36
35	.if ${PORT_OPTIONS:MFULL_MAUDE}	37	.if ${PORT_OPTIONS:MFULL_MAUDE}
Lines 56-62 Link Here
56		58
57	.if ${PORT_OPTIONS:MFULL_MAUDE}	59	.if ${PORT_OPTIONS:MFULL_MAUDE}
58	post-install:	60	post-install:
59	${INSTALL_DATA} ${WRKDIR}/${FULL_MAUDE} ${DATADIR}	61	${INSTALL_DATA} ${WRKDIR}/${FULL_MAUDE} ${STAGEDIR}${DATADIR}
60	.endif	62	.endif
61		63
62	.include <bsd.port.mk>	64	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-src__Mixfix__lexer.ll (+11 lines)
	1	--- src/Mixfix/lexer.ll.orig 2010-09-09 02:42:13.000000000 +0200
	2	+++ src/Mixfix/lexer.ll 2014-06-27 19:46:13.000000000 +0200
	3	@@ -53,7 +53,7 @@
	4
	5	#define YY_DECL int yylex(YYSTYPE* lvalp)
	6
	7	-#define YY_INPUT(buf, result, max_size) getInput(buf, result, max_size)
	8	+#define YY_INPUT(buf, result, max_size) getInput(buf, (int*)(&result), max_size)
	9
	10	#define RETURN(token) \
	11	{ lvalp->yyToken.tokenize(yytext, lineNumber); return (token); }




--- src/Mixfix/lexerAux.cc.orig	2008-02-22 04:41:22.000000000 +0100
+++ src/Mixfix/lexerAux.cc	2014-06-27 19:25:00.000000000 +0200
@@ -35,7 +35,7 @@
 bool fakeNewlineStack[MAX_IN_DEPTH];
 
 void
-getInput(char* buf, int& result, int max_size)
+getInput(char* buf, int* result, int max_size)
 {
   result = YY_NULL;
   if (UserLevelRewritingContext::interrupted())
@@ -49,7 +49,7 @@
 	{
 	  if (n > 0)
 	    {
-	      result = n;
+	      *result = n;
 	      fakeNewline = (buf[n - 1] != '\n');
 	    }
 	  else
@@ -57,7 +57,7 @@
 	      if (fakeNewline && max_size > 0)
 		{
 		  buf[0] = '\n';
-		  result = 1;
+		  *result = 1;
 		  fakeNewline = false;
 		}
 	    }

Line 0 Link Here

(-)files/patch-src__Mixfix__lexerAux.hh (+11 lines)
	1	--- src/Mixfix/lexerAux.hh.orig 2008-02-22 04:41:56.000000000 +0100
	2	+++ src/Mixfix/lexerAux.hh 2014-06-27 19:19:25.000000000 +0200
	3	@@ -27,7 +27,7 @@
	4	//extern int inStackPtr;
	5	//extern YY_BUFFER_STATE inStack[];
	6
	7	-void getInput(char* buf, int& result, int max_size);
	8	+void getInput(char* buf, int* result, int max_size);
	9	void lexerIdMode();
	10	void lexerTokenTreeMode(int terminatingTokens);
	11	void lexerCmdMode();

Return to bug 191049

Line 0 Link Here

(-)files/patch-src__Mixfix__lexerAux.cc (+29 lines)
	1	--- src/Mixfix/lexerAux.cc.orig 2008-02-22 04:41:22.000000000 +0100
	2	+++ src/Mixfix/lexerAux.cc 2014-06-27 19:25:00.000000000 +0200
	3	@@ -35,7 +35,7 @@
	4	bool fakeNewlineStack[MAX_IN_DEPTH];
	5
	6	void
	7	-getInput(char* buf, int& result, int max_size)
	8	+getInput(char* buf, int* result, int max_size)
	9	{
	10	result = YY_NULL;
	11	if (UserLevelRewritingContext::interrupted())
	12	@@ -49,7 +49,7 @@
	13	{
	14	if (n > 0)
	15	{
	16	- result = n;
	17	+ *result = n;
	18	fakeNewline = (buf[n - 1] != '\n');
	19	}
	20	else
	21	@@ -57,7 +57,7 @@
	22	if (fakeNewline && max_size > 0)
	23	{
	24	buf[0] = '\n';
	25	- result = 1;
	26	+ *result = 1;
	27	fakeNewline = false;
	28	}
	29	}