Attachment #11268 for bug #22253

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




# $FreeBSD: ports/lang/ptoc/Makefile,v 1.12 2000/04/12 06:20:05 obrien Exp $
#

PORTNAME=	ptoc
PORTVERSION=	3.50
CATEGORIES=	lang
MASTER_SITES=	http://www.ispras.ru/~knizhnik/

MAINTAINER=	ports@FreeBSD.org

WRKSRC=		${WRKDIR}/${PORTNAME}

USE_XLIB=	yes
USE_BISON=	yes

EXAMPLES=	arr.pas bgidemo.pas ccall.pas coord.txt dos.h dos.pas \
		func.pas hello.pas impact.pas lister.pas makefile.bsd \
		nested.pas objpas.pas polut2.pas printer.pas q2.txt \
		random.txt rename.cxx rename.pas set.pas str.pas test.c \
		test.cxx test.pas test.txt tpascal.pas trinor.pas \
		vibrkinp.pas vibrkinp.txt vibrtabl.pas war2.pas war2.txt \
		xy2.txt xy2orig.txt

pre-build:
	@${LN} -sf makefile.bsd ${WRKSRC}/Makefile
	@${LN} -sf makefile.bsd ${WRKSRC}/Xbgi/Makefile
	@ ${MV} ${WRKSRC}/examples/makefile.bsd ${WRKSRC}/examples/makefile

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/cganal ${PREFIX}/bin
	${INSTALL_PROGRAM} ${WRKSRC}/ptoc ${PREFIX}/bin
	${INSTALL_DATA} ${WRKSRC}/ptoc.cfg ${PREFIX}/etc
	${INSTALL_DATA} ${WRKSRC}/libptoc.a ${PREFIX}/lib
	${INSTALL_DATA} ${WRKSRC}/libXbgi.a ${PREFIX}/lib
	@${MKDIR} ${PREFIX}/include/ptoc
.for file in array.h graph.h io.h paslib.h ptoc.h set.h
	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/include/ptoc
.endfor
	@${MKDIR} ${PREFIX}/share/ptoc
.for file in graph.pas ptoc.pas tptoc.pas
	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/ptoc
.endfor
	@${MKDIR} ${PREFIX}/share/examples/ptoc
.for file in ${EXAMPLES}
	${INSTALL_DATA} ${WRKSRC}/examples/${file} ${PREFIX}/share/examples/ptoc
	@ ${INSTALL_DATA} ${WRKSRC}/examples/${file} ${PREFIX}/share/examples/ptoc
.endfor

post-install:
.if !defined(NOPORTDOCS)
	@${MKDIR} ${PREFIX}/share/doc/ptoc
	${INSTALL_DATA} ${WRKSRC}/Readme.htm ${PREFIX}/share/doc/ptoc
.endif

.include <bsd.port.mk>

Line 1 Link Here

(-)lang/ptoc/distinfo (-1 / +1 lines)
1	MD5 (ptoc-3.41.tar.gz) = 4db4d7730360264625fa293c361225b2	1	MD5 (ptoc-3.50.tar.gz) = 8e371aa97d5432ea75cd4842c1df4d73




--- main.cxx.orig	Thu Sep 23 23:35:38 1999
+++ main.cxx	Sat Oct 21 04:11:00 2000
@@ -326,8 +326,8 @@
     prog_path = (p != NULL) ? dprintf("%.*s", p + 1 - argv[0], argv[0]) : ""; 
 #else
     char* p = strrchr(argv[0], '/');
-    prog_path = (p != NULL) ? dprintf("%.*s", p + 1 - argv[0], argv[0]) : ""; 
+    prog_path = (p != NULL) ? dprintf("%.*s", p + 1 - argv[0], argv[0]) : (char *) ""; 
 #endif
 #endif
     i_path = dprintf("%s:%s", i_path, prog_path);
@@ -318,8 +318,8 @@
     compile_system_library = TRUE;
 #ifdef PREFIX
     token::input(turbo_pascal 




--- trnod.cxx.orig	Sat Oct 21 04:24:34 2000
+++ trnod.cxx	Sat Oct 21 04:45:38 2000
@@ -460,7 +460,7 @@
     if (language_c) { 
         if (params) { 
             char const* format = "";
-	    char const* newln = (t_read->tag == TKN_READLN) ? "\\n" : "";
+	    char const* newln = (t_read->tag == TKN_READLN) ? (char *) "\\n" : "";
 	    expr_node *prm = params->expr; 
 
 	    l_tkn = params->rpar;
@@ -618,7 +618,7 @@
 	    write_param_node *prm = params->vals; 
 
 	    l_tkn = params->rpar;
-	    char const* newln = (t_write->tag == TKN_WRITELN) ? "\\n" : "";
+	    char const* newln = (t_write->tag == TKN_WRITELN) ? (char *) "\\n" : "";
             write_format = NULL;
 	    if (prm->type->tag == tp_file) { 
 		prm->translate(ctx_value);
@@ -1000,7 +1000,7 @@
     from->translate(ctx_value);
     from->l_tkn->append(";"); 
     t_to->set_trans(t_ident->out_text); 

     till->translate(ctx_value);
     till->l_tkn->append(";"); 
     if (t_to->name->tag == TKN_TO) { 
@@ -1069,11 +1069,11 @@
     bool body_is_block = 
 	body != NULL && body->is_compound() && body->next == NULL;
 

     expr->translate(ctx_condition);
     f_tkn = t_repeat;
     l_tkn = expr->l_tkn; 
@@ -1264,7 +1264,7 @@
 
         } else if (var->type->tag == tp_proc) { 
 	    if (turbo_pascal && tkn->name->tag == TKN_HALT) {

 		return;
 	    }
 	    proc_tp* prc = (proc_tp*)var->type->get_typedef();
@@ -1286,8 +1286,8 @@
 			if (prm->var->type->tag == tp_file 
 			    || prm->var->type->tag == tp_text)
 			{

 			} else { 
 			    t = t->append("0");
 			}
@@ -1334,7 +1334,7 @@
 
             if (with != NULL) { 
 		f_tkn = tkn->prepend(language_c && with->tag == symbol::s_ref 

 		    ->prepend(with->out_name->text);
 	    }
 
@@ -1750,7 +1750,7 @@
 	    t_lbr->set_trans("set::of("); 
 	}
     }

 }
 
 idx_expr_node::idx_expr_node(expr_node* arr, token* t_lbr, expr_node* indices, 
@@ -2181,7 +2181,7 @@
       case tn_and:
         op->set_trans(((left->type && left->type->tag != tp_bool) || 
 	    (right->type && right->type->tag != tp_bool) || nological)

 	if (parent_tag != tn_group && parent_tag != tn_and) { 
 	    f_tkn = left->f_tkn->prepend("(");
 	    l_tkn = right->l_tkn->append(")");
@@ -2201,12 +2201,12 @@
 	if (parent_tag != tn_group) { 
 	    f_tkn = left->f_tkn->prepend(left->type && 
 			left->type->get_typedef() == &longint_type

 	} else { 
 	    f_tkn = left->f_tkn->prepend(left->type && 
 			left->type->get_typedef() == &longint_type
-			    ? "(unsigned long)" : "(cardinal)");
+			    ? (char *) "(unsigned long)" : (char *) "(cardinal)");
 	} 
 	op->set_trans(">>");
 	break;
@@ -2224,14 +2224,14 @@
 	}
 	op->set_trans(((left->type && left->type->tag != tp_bool) || 
 		       (right->type && right->type->tag != tp_bool) || 

 	    left->l_tkn->append(", ");
 	    l_tkn = right->l_tkn->append(")");
 	} else { 
@@ -2253,14 +2253,14 @@
 	    if (language_c) { 
 		if (short_set && ((set_tp*)type)->is_short_set()) {
 		    f_tkn = left->f_tkn->prepend(tag == tn_add 

 		}
 		l_tkn = right->l_tkn->append(")");
 		token::disable(left->l_tkn->next, right->f_tkn->prev);
@@ -2298,9 +2298,9 @@
 		} 
 		else if (ltype->tag == tp_enum || rtype->size <= ltype->size)
 		{

 		}
 	    } else if (((rtype->tag == tp_range && rtype->min_value >= 0) ||
 			rtype->tag == tp_enum) &&
@@ -2313,9 +2313,9 @@
                 else if (rtype->tag == tp_enum || ltype->size <= rtype->size)
 		{
 		    f_tkn = left->f_tkn->prepend(

 		}
 	    }
 	}
@@ -2439,7 +2439,7 @@
 	op->set_trans(CMP_OP(tag)); 
         break; 
       case tn_not:

         break; 
     }
     if ((unsigned(tag - tn_add) <= tn_div - tn_add) && type && type->tag == tp_longint)
@@ -3406,7 +3406,7 @@
 	    }
 	}
     } else { 

 	enumeration = NULL;
 	if (constant->type->tag == tp_string) { 
 	    ident->prepend("char ");
@@ -3749,16 +3749,16 @@
 			t = tkn->ident->copy(eltd->f_tkn, eltd->l_tkn);
 			if (tp->tag == tp_dynarray) { 
 			    tkn->ident->prepend(ctx == ctx_varpar 

 			    copy(tpd->f_tkn, tpd->l_tkn); 
 		    }
 		} else { 
@@ -3823,7 +3823,7 @@
 		// initialize file structure
 		tkn->ident->append(
 		    (tp->tag == tp_file || tp->tag == tp_text)

 	    }
 	    if (tkn->var->flags & symbol::f_static) { 
 		is_static = TRUE;
@@ -3854,8 +3854,8 @@
         { 
 	    f_tkn = f_tkn->prepend("EXTERN ");
 	} else if (scope != NULL) { 

 	}
         force_semicolon();
 	if (is_static) { 
@@ -4215,7 +4215,7 @@
     if (qualifiers) { 
 	if (is_external) { 
 	    f_tkn = f_tkn->prepend(type->is_extern_c && !language_c 

 	} else if (is_static) { 
 	    f_tkn = f_tkn->prepend("static ");
 	} else if (is_virtual) { 
@@ -4832,7 +4832,7 @@
 		t_array->set_trans("conf_matrix");
 	    } else {  	
 		t_array->set_trans(indices->next == NULL 

Line 0 Link Here

(-)lang/ptoc/files/patch-ad (+11 lines)
	1	--- makefile.bsd.orig Sat Nov 7 10:10:50 1998
	2	+++ makefile.bsd Sat Oct 21 05:54:55 2000
	3	@@ -131,7 +131,7 @@
	4	$(LD) $(LDFLAGS) -o $@ $(OBJS)
	5
	6	libXbgi.a:
	7	- (cd Xbgi; make)
	8	+ (cd Xbgi; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" X11BASE="$(X11BASE)")
	9
	10	all : $(BINS) $(LIBS)
	11

Line 0 Link Here

(-)lang/ptoc/files/patch-ae (+11 lines)
	1	--- parser.y.orig Sat Nov 7 10:42:00 1998
	2	+++ parser.y Sat Oct 21 04:59:01 2000
	3	@@ -5,8 +5,6 @@
	4	#include <string.h>
	5	#ifdef __DECCXX
	6	#include <alloca.h>
	7	-#else
	8	-#include <malloc.h>
	9	#endif
	10
	11	#include "nmtbl.h"

Lines 7-28 Link Here

(-)lang/ptoc/pkg-plist (-5 / +18 lines)
7	include/ptoc/paslib.h	7	include/ptoc/paslib.h
8	include/ptoc/ptoc.h	8	include/ptoc/ptoc.h
9	include/ptoc/set.h	9	include/ptoc/set.h
10	lib/libptoc.a
11	lib/libXbgi.a	10	lib/libXbgi.a
		11	lib/libptoc.a
12	share/doc/ptoc/Readme.htm	12	share/doc/ptoc/Readme.htm
13	share/examples/ptoc/Makefile	13	share/examples/ptoc/arr.pas
14	share/examples/ptoc/bgidemo.pas	14	share/examples/ptoc/bgidemo.pas
		15	share/examples/ptoc/ccall.pas
15	share/examples/ptoc/coord.txt	16	share/examples/ptoc/coord.txt
		17	share/examples/ptoc/dos.h
		18	share/examples/ptoc/dos.pas
		19	share/examples/ptoc/func.pas
16	share/examples/ptoc/hello.pas	20	share/examples/ptoc/hello.pas
17	share/examples/ptoc/impact.pas	21	share/examples/ptoc/impact.pas
18	share/examples/ptoc/lister.pas	22	share/examples/ptoc/lister.pas
		23	share/examples/ptoc/makefile.bsd
		24	share/examples/ptoc/nested.pas
		25	share/examples/ptoc/objpas.pas
19	share/examples/ptoc/polut2.pas	26	share/examples/ptoc/polut2.pas
20	share/examples/ptoc/printer.pas	27	share/examples/ptoc/printer.pas
21	share/examples/ptoc/q2.txt	28	share/examples/ptoc/q2.txt
22	share/examples/ptoc/random.txt	29	share/examples/ptoc/random.txt
		30	share/examples/ptoc/rename.cxx
23	share/examples/ptoc/rename.pas	31	share/examples/ptoc/rename.pas
24	share/examples/ptoc/set.pas	32	share/examples/ptoc/set.pas
		33	share/examples/ptoc/str.pas
		34	share/examples/ptoc/test.c
		35	share/examples/ptoc/test.cxx
25	share/examples/ptoc/test.pas	36	share/examples/ptoc/test.pas
		37	share/examples/ptoc/test.txt
26	share/examples/ptoc/tpascal.pas	38	share/examples/ptoc/tpascal.pas
27	share/examples/ptoc/trinor.pas	39	share/examples/ptoc/trinor.pas
28	share/examples/ptoc/vibrkinp.pas	40	share/examples/ptoc/vibrkinp.pas
Lines 30-40 Link Here
30	share/examples/ptoc/vibrtabl.pas	42	share/examples/ptoc/vibrtabl.pas
31	share/examples/ptoc/war2.pas	43	share/examples/ptoc/war2.pas
32	share/examples/ptoc/war2.txt	44	share/examples/ptoc/war2.txt
		45	share/examples/ptoc/xy2.txt
33	share/examples/ptoc/xy2orig.txt	46	share/examples/ptoc/xy2orig.txt
		47	share/ptoc/graph.pas
34	share/ptoc/ptoc.pas	48	share/ptoc/ptoc.pas
35	share/ptoc/tptoc.pas	49	share/ptoc/tptoc.pas
36	share/ptoc/graph.pas
37	@dirrm include/ptoc
38	@dirrm share/doc/ptoc
39	@dirrm share/examples/ptoc	50	@dirrm share/examples/ptoc
40	@dirrm share/ptoc	51	@dirrm share/ptoc
		52	@dirrm share/doc/ptoc
		53	@dirrm include/ptoc

Return to bug 22253

Lines 5-53 Link Here

(-)lang/ptoc/Makefile (-33 / +35 lines)
5	# $FreeBSD: ports/lang/ptoc/Makefile,v 1.12 2000/04/12 06:20:05 obrien Exp $	5	# $FreeBSD: ports/lang/ptoc/Makefile,v 1.12 2000/04/12 06:20:05 obrien Exp $
6	#	6	#
7		7
8	PORTNAME= ptoc	8	PORTNAME= ptoc
9	PORTVERSION= 3.41	9	PORTVERSION= 3.50
10	CATEGORIES= lang	10	CATEGORIES= lang
11	MASTER_SITES= ftp://ftp.netsw.org/netsw/SoftEng/Lang/Pascal/ \	11	MASTER_SITES= http://www.ispras.ru/~knizhnik/
12	ftp://ftp.u-aizu.ac.jp/pub/lang/netsw/Pascal/ \	12
13	ftp://ftp.ecrc.net/pub/netsw/SoftEng/Lang/Pascal/	13	MAINTAINER= ports@FreeBSD.org
14		14
15	MAINTAINER= ports@FreeBSD.org	15	WRKSRC= ${WRKDIR}/${PORTNAME}
16		16
17	MAKEFILE= makefile	17	USE_XLIB= yes
18		18	USE_BISON= yes
19	USE_XLIB= yes	19
20	WRKSRC= ${WRKDIR}/ptoc	20	EXAMPLES= arr.pas bgidemo.pas ccall.pas coord.txt dos.h dos.pas \
		21	func.pas hello.pas impact.pas lister.pas makefile.bsd \
		22	nested.pas objpas.pas polut2.pas printer.pas q2.txt \
		23	random.txt rename.cxx rename.pas set.pas str.pas test.c \
		24	test.cxx test.pas test.txt tpascal.pas trinor.pas \
		25	vibrkinp.pas vibrkinp.txt vibrtabl.pas war2.pas war2.txt \
		26	xy2.txt xy2orig.txt
21		27
22	pre-build:	28	pre-build:
23	@ ${MV} ${WRKSRC}/makefile.bsd ${WRKSRC}/makefile	29	@${LN} -sf makefile.bsd ${WRKSRC}/Makefile
24	@ ${MV} ${WRKSRC}/Xbgi/makefile.bsd ${WRKSRC}/Xbgi/makefile	30	@${LN} -sf makefile.bsd ${WRKSRC}/Xbgi/Makefile
25	@ ${MV} ${WRKSRC}/examples/makefile.bsd ${WRKSRC}/examples/makefile
26		31
27	do-install:	32	do-install:
28	@ ${INSTALL_PROGRAM} ${WRKSRC}/cganal ${PREFIX}/bin	33	${INSTALL_PROGRAM} ${WRKSRC}/cganal ${PREFIX}/bin
29	@ ${INSTALL_PROGRAM} ${WRKSRC}/ptoc ${PREFIX}/bin	34	${INSTALL_PROGRAM} ${WRKSRC}/ptoc ${PREFIX}/bin
30	@ ${INSTALL_DATA} ${WRKSRC}/ptoc.cfg ${PREFIX}/etc	35	${INSTALL_DATA} ${WRKSRC}/ptoc.cfg ${PREFIX}/etc
31	@ ${INSTALL_DATA} ${WRKSRC}/libptoc.a ${PREFIX}/lib	36	${INSTALL_DATA} ${WRKSRC}/libptoc.a ${PREFIX}/lib
32	@ ${INSTALL_DATA} ${WRKSRC}/libXbgi.a ${PREFIX}/lib	37	${INSTALL_DATA} ${WRKSRC}/libXbgi.a ${PREFIX}/lib
33	@ ${MKDIR} ${PREFIX}/include/ptoc	38	@${MKDIR} ${PREFIX}/include/ptoc
34	.for file in array.h graph.h io.h paslib.h ptoc.h set.h	39	.for file in array.h graph.h io.h paslib.h ptoc.h set.h
35	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/include/ptoc	40	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/include/ptoc
36	.endfor	41	.endfor
37	@ ${MKDIR} ${PREFIX}/share/ptoc	42	@${MKDIR} ${PREFIX}/share/ptoc
38	.for file in graph.pas ptoc.pas tptoc.pas	43	.for file in graph.pas ptoc.pas tptoc.pas
39	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/ptoc	44	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/ptoc
40	.endfor	45	.endfor
41	@ ${MKDIR} ${PREFIX}/share/examples/ptoc	46	@${MKDIR} ${PREFIX}/share/examples/ptoc
42	@ ${INSTALL_DATA} ${WRKSRC}/examples/makefile ${PREFIX}/share/examples/ptoc/Makefile	47	.for file in ${EXAMPLES}
43	.for file in bgidemo.pas coord.txt hello.pas impact.pas lister.pas polut2.pas printer.pas q2.txt random.txt rename.pas set.pas test.pas tpascal.pas trinor.pas vibrkinp.pas vibrkinp.txt vibrtabl.pas war2.pas war2.txt xy2orig.txt	48	${INSTALL_DATA} ${WRKSRC}/examples/${file} ${PREFIX}/share/examples/ptoc
44	@ ${INSTALL_DATA} ${WRKSRC}/examples/${file} ${PREFIX}/share/examples/ptoc
45	.endfor	49	.endfor
46
47	post-install:
48	.if !defined(NOPORTDOCS)	50	.if !defined(NOPORTDOCS)
49	@ ${MKDIR} ${PREFIX}/share/doc/ptoc	51	@${MKDIR} ${PREFIX}/share/doc/ptoc
50	@ ${INSTALL_DATA} ${WRKSRC}/Readme.htm ${PREFIX}/share/doc/ptoc	52	${INSTALL_DATA} ${WRKSRC}/Readme.htm ${PREFIX}/share/doc/ptoc
51	.endif	53	.endif
52		54
53	.include <bsd.port.mk>	55	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)lang/ptoc/files/patch-aa (-12 / +3 lines)
1	--- main.cxx.orig Fri Nov 6 09:19:54 1998	1	--- main.cxx.orig Thu Sep 23 23:35:38 1999
2	+++ main.cxx Sat Feb 12 17:25:53 2000	2	+++ main.cxx Sat Oct 21 04:11:00 2000
3	@@ -279,7 +279,7 @@	3	@@ -326,8 +326,8 @@
4	prog_path = (p != NULL) ? dprintf("%.*s", p + 1 - argv[0], argv[0]) : "";
5	#else
6	char* p = strrchr(argv[0], '/');
7	- prog_path = (p != NULL) ? dprintf("%.*s", p + 1 - argv[0], argv[0]) : "";
8	+ prog_path = (p != NULL) ? dprintf("%.s", p + 1 - argv[0], argv[0]) : (char ) "";
9	#endif
10	#endif
11	i_path = dprintf("%s:%s", i_path, prog_path);
12	@@ -318,8 +318,8 @@
13	compile_system_library = TRUE;	4	compile_system_library = TRUE;
14	#ifdef PREFIX	5	#ifdef PREFIX
15	token::input(turbo_pascal	6	token::input(turbo_pascal

Lines 1-24 Link Here

(-)lang/ptoc/files/patch-ab (-30 / +30 lines)
1	--- trnod.cxx.old Sat Feb 12 17:13:58 2000	1	--- trnod.cxx.orig Sat Oct 21 04:24:34 2000
2	+++ trnod.cxx Sat Feb 12 17:23:33 2000	2	+++ trnod.cxx Sat Oct 21 04:45:38 2000
3	@@ -454,7 +454,7 @@	3	@@ -460,7 +460,7 @@
4	if (language_c) {	4	if (language_c) {
5	if (params) {	5	if (params) {
6	char* format = "";	6	char const* format = "";
7	- char* newln = (t_read->tag == TKN_READLN) ? "\\n" : "";	7	- char const* newln = (t_read->tag == TKN_READLN) ? "\\n" : "";
8	+ char* newln = (t_read->tag == TKN_READLN) ? (char ) "\\n" : (char ) "";	8	+ char const* newln = (t_read->tag == TKN_READLN) ? (char *) "\\n" : "";
9	expr_node *prm = params->expr;	9	expr_node *prm = params->expr;
10		10
11	l_tkn = params->rpar;	11	l_tkn = params->rpar;
12	@@ -612,7 +612,7 @@	12	@@ -618,7 +618,7 @@
13	write_param_node *prm = params->vals;	13	write_param_node *prm = params->vals;
14		14
15	l_tkn = params->rpar;	15	l_tkn = params->rpar;
16	- char* newln = (t_write->tag == TKN_WRITELN) ? "\\n" : "";	16	- char const* newln = (t_write->tag == TKN_WRITELN) ? "\\n" : "";
17	+ char* newln = (t_write->tag == TKN_WRITELN) ? (char ) "\\n" : (char ) "";	17	+ char const* newln = (t_write->tag == TKN_WRITELN) ? (char *) "\\n" : "";
18	write_format = NULL;	18	write_format = NULL;
19	if (prm->type->tag == tp_file) {	19	if (prm->type->tag == tp_file) {
20	prm->translate(ctx_value);	20	prm->translate(ctx_value);
21	@@ -994,7 +994,7 @@	21	@@ -1000,7 +1000,7 @@
22	from->translate(ctx_value);	22	from->translate(ctx_value);
23	from->l_tkn->append(";");	23	from->l_tkn->append(";");
24	t_to->set_trans(t_ident->out_text);	24	t_to->set_trans(t_ident->out_text);
Lines 27-33 Link Here
27	till->translate(ctx_value);	27	till->translate(ctx_value);
28	till->l_tkn->append(";");	28	till->l_tkn->append(";");
29	if (t_to->name->tag == TKN_TO) {	29	if (t_to->name->tag == TKN_TO) {
30	@@ -1063,11 +1063,11 @@	30	@@ -1069,11 +1069,11 @@
31	bool body_is_block =	31	bool body_is_block =
32	body != NULL && body->is_compound() && body->next == NULL;	32	body != NULL && body->is_compound() && body->next == NULL;
33		33
Lines 41-47 Link Here
41	expr->translate(ctx_condition);	41	expr->translate(ctx_condition);
42	f_tkn = t_repeat;	42	f_tkn = t_repeat;
43	l_tkn = expr->l_tkn;	43	l_tkn = expr->l_tkn;
44	@@ -1258,7 +1258,7 @@	44	@@ -1264,7 +1264,7 @@
45		45
46	} else if (var->type->tag == tp_proc) {	46	} else if (var->type->tag == tp_proc) {
47	if (turbo_pascal && tkn->name->tag == TKN_HALT) {	47	if (turbo_pascal && tkn->name->tag == TKN_HALT) {
Lines 50-56 Link Here
50	return;	50	return;
51	}	51	}
52	proc_tp* prc = (proc_tp*)var->type->get_typedef();	52	proc_tp* prc = (proc_tp*)var->type->get_typedef();
53	@@ -1280,8 +1280,8 @@	53	@@ -1286,8 +1286,8 @@
54	if (prm->var->type->tag == tp_file	54	if (prm->var->type->tag == tp_file
55	\|\| prm->var->type->tag == tp_text)	55	\|\| prm->var->type->tag == tp_text)
56	{	56	{
Lines 61-67 Link Here
61	} else {	61	} else {
62	t = t->append("0");	62	t = t->append("0");
63	}	63	}
64	@@ -1328,7 +1328,7 @@	64	@@ -1334,7 +1334,7 @@
65		65
66	if (with != NULL) {	66	if (with != NULL) {
67	f_tkn = tkn->prepend(language_c && with->tag == symbol::s_ref	67	f_tkn = tkn->prepend(language_c && with->tag == symbol::s_ref
Lines 70-76 Link Here
70	->prepend(with->out_name->text);	70	->prepend(with->out_name->text);
71	}	71	}
72		72
73	@@ -1744,7 +1744,7 @@	73	@@ -1750,7 +1750,7 @@
74	t_lbr->set_trans("set::of(");	74	t_lbr->set_trans("set::of(");
75	}	75	}
76	}	76	}
Lines 79-85 Link Here
79	}	79	}
80		80
81	idx_expr_node::idx_expr_node(expr_node* arr, token* t_lbr, expr_node* indices,	81	idx_expr_node::idx_expr_node(expr_node* arr, token* t_lbr, expr_node* indices,
82	@@ -2173,7 +2173,7 @@	82	@@ -2181,7 +2181,7 @@
83	case tn_and:	83	case tn_and:
84	op->set_trans(((left->type && left->type->tag != tp_bool) \|\|	84	op->set_trans(((left->type && left->type->tag != tp_bool) \|\|
85	(right->type && right->type->tag != tp_bool) \|\| nological)	85	(right->type && right->type->tag != tp_bool) \|\| nological)
Lines 88-94 Link Here
88	if (parent_tag != tn_group && parent_tag != tn_and) {	88	if (parent_tag != tn_group && parent_tag != tn_and) {
89	f_tkn = left->f_tkn->prepend("(");	89	f_tkn = left->f_tkn->prepend("(");
90	l_tkn = right->l_tkn->append(")");	90	l_tkn = right->l_tkn->append(")");
91	@@ -2193,12 +2193,12 @@	91	@@ -2201,12 +2201,12 @@
92	if (parent_tag != tn_group) {	92	if (parent_tag != tn_group) {
93	f_tkn = left->f_tkn->prepend(left->type &&	93	f_tkn = left->f_tkn->prepend(left->type &&
94	left->type->get_typedef() == &longint_type	94	left->type->get_typedef() == &longint_type
Lines 98-109 Link Here
98	} else {	98	} else {
99	f_tkn = left->f_tkn->prepend(left->type &&	99	f_tkn = left->f_tkn->prepend(left->type &&
100	left->type->get_typedef() == &longint_type	100	left->type->get_typedef() == &longint_type
101	- ? "(unsigned long)" : "((cardinal)");	101	- ? "(unsigned long)" : "(cardinal)");
102	+ ? (char ) "(unsigned long)" : (char ) "((cardinal)");	102	+ ? (char ) "(unsigned long)" : (char ) "(cardinal)");
103	}	103	}
104	op->set_trans(">>");	104	op->set_trans(">>");
105	break;	105	break;
106	@@ -2216,14 +2216,14 @@	106	@@ -2224,14 +2224,14 @@
107	}	107	}
108	op->set_trans(((left->type && left->type->tag != tp_bool) \|\|	108	op->set_trans(((left->type && left->type->tag != tp_bool) \|\|
109	(right->type && right->type->tag != tp_bool) \|\|	109	(right->type && right->type->tag != tp_bool) \|\|
Lines 120-126 Link Here
120	left->l_tkn->append(", ");	120	left->l_tkn->append(", ");
121	l_tkn = right->l_tkn->append(")");	121	l_tkn = right->l_tkn->append(")");
122	} else {	122	} else {
123	@@ -2245,14 +2245,14 @@	123	@@ -2253,14 +2253,14 @@
124	if (language_c) {	124	if (language_c) {
125	if (short_set && ((set_tp*)type)->is_short_set()) {	125	if (short_set && ((set_tp*)type)->is_short_set()) {
126	f_tkn = left->f_tkn->prepend(tag == tn_add	126	f_tkn = left->f_tkn->prepend(tag == tn_add
Lines 141-147 Link Here
141	}	141	}
142	l_tkn = right->l_tkn->append(")");	142	l_tkn = right->l_tkn->append(")");
143	token::disable(left->l_tkn->next, right->f_tkn->prev);	143	token::disable(left->l_tkn->next, right->f_tkn->prev);
144	@@ -2290,9 +2290,9 @@	144	@@ -2298,9 +2298,9 @@
145	}	145	}
146	else if (ltype->tag == tp_enum \|\| rtype->size <= ltype->size)	146	else if (ltype->tag == tp_enum \|\| rtype->size <= ltype->size)
147	{	147	{
Lines 154-160 Link Here
154	}	154	}
155	} else if (((rtype->tag == tp_range && rtype->min_value >= 0) \|\|	155	} else if (((rtype->tag == tp_range && rtype->min_value >= 0) \|\|
156	rtype->tag == tp_enum) &&	156	rtype->tag == tp_enum) &&
157	@@ -2305,9 +2305,9 @@	157	@@ -2313,9 +2313,9 @@
158	else if (rtype->tag == tp_enum \|\| ltype->size <= rtype->size)	158	else if (rtype->tag == tp_enum \|\| ltype->size <= rtype->size)
159	{	159	{
160	f_tkn = left->f_tkn->prepend(	160	f_tkn = left->f_tkn->prepend(
Lines 167-173 Link Here
167	}	167	}
168	}	168	}
169	}	169	}
170	@@ -2431,7 +2431,7 @@	170	@@ -2439,7 +2439,7 @@
171	op->set_trans(CMP_OP(tag));	171	op->set_trans(CMP_OP(tag));
172	break;	172	break;
173	case tn_not:	173	case tn_not:
Lines 176-182 Link Here
176	break;	176	break;
177	}	177	}
178	if ((unsigned(tag - tn_add) <= tn_div - tn_add) && type && type->tag == tp_longint)	178	if ((unsigned(tag - tn_add) <= tn_div - tn_add) && type && type->tag == tp_longint)
179	@@ -3388,7 +3388,7 @@	179	@@ -3406,7 +3406,7 @@
180	}	180	}
181	}	181	}
182	} else {	182	} else {
Lines 185-191 Link Here
185	enumeration = NULL;	185	enumeration = NULL;
186	if (constant->type->tag == tp_string) {	186	if (constant->type->tag == tp_string) {
187	ident->prepend("char ");	187	ident->prepend("char ");
188	@@ -3731,16 +3731,16 @@	188	@@ -3749,16 +3749,16 @@
189	t = tkn->ident->copy(eltd->f_tkn, eltd->l_tkn);	189	t = tkn->ident->copy(eltd->f_tkn, eltd->l_tkn);
190	if (tp->tag == tp_dynarray) {	190	if (tp->tag == tp_dynarray) {
191	tkn->ident->prepend(ctx == ctx_varpar	191	tkn->ident->prepend(ctx == ctx_varpar
Lines 206-212 Link Here
206	copy(tpd->f_tkn, tpd->l_tkn);	206	copy(tpd->f_tkn, tpd->l_tkn);
207	}	207	}
208	} else {	208	} else {
209	@@ -3805,7 +3805,7 @@	209	@@ -3823,7 +3823,7 @@
210	// initialize file structure	210	// initialize file structure
211	tkn->ident->append(	211	tkn->ident->append(
212	(tp->tag == tp_file \|\| tp->tag == tp_text)	212	(tp->tag == tp_file \|\| tp->tag == tp_text)
Lines 215-221 Link Here
215	}	215	}
216	if (tkn->var->flags & symbol::f_static) {	216	if (tkn->var->flags & symbol::f_static) {
217	is_static = TRUE;	217	is_static = TRUE;
218	@@ -3836,8 +3836,8 @@	218	@@ -3854,8 +3854,8 @@
219	{	219	{
220	f_tkn = f_tkn->prepend("EXTERN ");	220	f_tkn = f_tkn->prepend("EXTERN ");
221	} else if (scope != NULL) {	221	} else if (scope != NULL) {
Lines 226-232 Link Here
226	}	226	}
227	force_semicolon();	227	force_semicolon();
228	if (is_static) {	228	if (is_static) {
229	@@ -4188,7 +4188,7 @@	229	@@ -4215,7 +4215,7 @@
230	if (qualifiers) {	230	if (qualifiers) {
231	if (is_external) {	231	if (is_external) {
232	f_tkn = f_tkn->prepend(type->is_extern_c && !language_c	232	f_tkn = f_tkn->prepend(type->is_extern_c && !language_c
Lines 235-241 Link Here
235	} else if (is_static) {	235	} else if (is_static) {
236	f_tkn = f_tkn->prepend("static ");	236	f_tkn = f_tkn->prepend("static ");
237	} else if (is_virtual) {	237	} else if (is_virtual) {
238	@@ -4801,7 +4801,7 @@	238	@@ -4832,7 +4832,7 @@
239	t_array->set_trans("conf_matrix");	239	t_array->set_trans("conf_matrix");
240	} else {	240	} else {
241	t_array->set_trans(indices->next == NULL	241	t_array->set_trans(indices->next == NULL