Attachment 144463 Details for Bug 191049 – only use this on FreeBSD 10; fixes 'int&' compiler issues with Mixfix/lexer.ll

[patch] only use this on FreeBSD 10; fixes 'int&' compiler issues with Mixfix/lexer.ll

maude.patch.20140706 (text/plain), 3.45 KB, created by Johannes 5 on 2014-07-06 15:16:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes 5

Created: 2014-07-06 15:16:24 UTC

Size: 3.45 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 360883)
>+++ Makefile	(working copy)
>@@ -10,11 +10,13 @@
> MAINTAINER=	joemann@beefree.free.de
> COMMENT=	High-performance reflective language
> 
>-LIB_DEPENDS=	bdd:${PORTSDIR}/science/buddy \
>-		tecla:${PORTSDIR}/devel/libtecla \
>-		gmp:${PORTSDIR}/math/gmp \
>-		sigsegv:${PORTSDIR}/devel/libsigsegv
>+LICENSE=	GPLv2
> 
>+LIB_DEPENDS=	libbdd.so:${PORTSDIR}/science/buddy \
>+		libtecla.so:${PORTSDIR}/devel/libtecla \
>+		libgmp.so:${PORTSDIR}/math/gmp \
>+		libsigsegv.so:${PORTSDIR}/devel/libsigsegv
>+
> USES=		bison
> USE_AUTOTOOLS=	aclocal autoheader automake
> AUTOMAKE_ARGS=	--add-missing
>@@ -22,6 +24,7 @@
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> CONFIGURE_ARGS=	--datadir=${DATADIR}
>+USE_GCC=	any
> 
> FULL_MAUDE_VER=	26b
> 
>@@ -29,7 +32,6 @@
> OPTIONS_DEFAULT=	FULL_MAUDE
> FULL_MAUDE_DESC=	Install full-maude${FULL_MAUDE_VER}
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MFULL_MAUDE}
>@@ -56,7 +58,7 @@
> 
> .if ${PORT_OPTIONS:MFULL_MAUDE}
> post-install:
>-	${INSTALL_DATA} ${WRKDIR}/${FULL_MAUDE} ${DATADIR}
>+	${INSTALL_DATA} ${WRKDIR}/${FULL_MAUDE} ${STAGEDIR}${DATADIR}
> .endif
> 
> .include <bsd.port.mk>
>Index: files/patch-src__Mixfix__lexer.ll
>===================================================================
>--- files/patch-src__Mixfix__lexer.ll	(revision 0)
>+++ files/patch-src__Mixfix__lexer.ll	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/Mixfix/lexer.ll.orig	2010-09-09 02:42:13.000000000 +0200
>++++ src/Mixfix/lexer.ll	2014-06-27 19:46:13.000000000 +0200
>+@@ -53,7 +53,7 @@
>+ 
>+ #define YY_DECL int yylex(YYSTYPE* lvalp)
>+ 
>+-#define YY_INPUT(buf, result, max_size)		getInput(buf, result, max_size)
>++#define YY_INPUT(buf, result, max_size)		getInput(buf, (int*)(&result), max_size)
>+ 
>+ #define RETURN(token) \
>+   { lvalp->yyToken.tokenize(yytext, lineNumber); return (token); }
>Index: files/patch-src__Mixfix__lexerAux.cc
>===================================================================
>--- files/patch-src__Mixfix__lexerAux.cc	(revision 0)
>+++ files/patch-src__Mixfix__lexerAux.cc	(working copy)
>@@ -0,0 +1,29 @@
>+--- 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;
>+ 		}
>+ 	    }
>Index: files/patch-src__Mixfix__lexerAux.hh
>===================================================================
>--- files/patch-src__Mixfix__lexerAux.hh	(revision 0)
>+++ files/patch-src__Mixfix__lexerAux.hh	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/Mixfix/lexerAux.hh.orig	2008-02-22 04:41:56.000000000 +0100
>++++ src/Mixfix/lexerAux.hh	2014-06-27 19:19:25.000000000 +0200
>+@@ -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, int* result, int max_size);
>+ void lexerIdMode();
>+ void lexerTokenTreeMode(int terminatingTokens);
>+ void lexerCmdMode();

Actions: View | Diff

Attachments on bug 191049: 143807 | 144463 | 146718 | 146744