File lifelines-3.0.46.1-funcptr.dif of Package lifelines

Overview Repositories Revisions Requests Users Attributes Meta

File lifelines-3.0.46.1-funcptr.dif of Package lifelines (Revision 62ad63a485eaba53ce7dbcf84ca910c2)

Currently displaying revision 62ad63a485eaba53ce7dbcf84ca910c2 , Show latest

--- src/gedlib/indiseq.c
+++ src/gedlib/indiseq.c	2005-09-30 15:04:34.000000000 +0200
@@ -1498,7 +1498,7 @@
 	INDISEQ anc=0;
 	NODE indi=0;
 	STRING key, pkey;
-	INT gen=0;
+	intptr_t gen=0;
 	INT fnum=0, snum=0;
 	UNION uval;
 	if (!seq) return NULL;
@@ -1514,7 +1514,7 @@
 	ENDINDISEQ
 	while (!is_empty_list(anclist)) {
 		key = (STRING) dequeue_list(anclist);
-		gen = (INT) dequeue_list(genlist) + 1;
+		gen = (intptr_t) dequeue_list(genlist) + 1;
 		indi = key_to_indi(key);
 
 		FORFAMCS(indi, fam, fath, moth, fnum)
@@ -1543,7 +1543,7 @@
 INDISEQ
 descendent_indiseq (INDISEQ seq)
 {
-	INT gen;
+	intptr_t gen;
 	/* itab lists people already entered, ftab families
 	(values in both are unused) */
 	TABLE itab, ftab;
@@ -1577,7 +1577,7 @@
 	while (!is_empty_list(deslist)) {
 		INT num1, num2;
 		key = (STRING) dequeue_list(deslist);
-		gen = (INT) dequeue_list(genlist) + 1;
+		gen = (intptr_t) dequeue_list(genlist) + 1;
 		indi = key_to_indi(key);
 		FORFAMS(indi, fam, num1)
 				/* skip families already processed */
@@ -2111,13 +2111,13 @@
  * default_compare_values -- compare values of two elements
  * Created: 2002/02/19, Perry Rapp
  *=========================================================*/
-INT
+intptr_t
 default_compare_values (VPTR ptr1, VPTR ptr2, INT valtype)
 {
 	valtype = valtype; /* unused */
 	/* We don't know how to deal with ptrs here */
 	/* Let's just sort them in memory order */
-	return (INT)ptr1 - (INT)ptr2;
+	return (intptr_t)ptr1 - (intptr_t)ptr2;
 }
 /*=======================================================
  * calc_indiseq_names -- fill in element names
--- src/hdrs/indiseq.h
+++ src/hdrs/indiseq.h	2005-09-30 15:03:54.000000000 +0200
@@ -143,7 +143,7 @@
 UNION default_copy_value(UNION uval, INT valtype);
 void default_delete_value(UNION uval, INT valtype);
 UNION default_create_gen_value(INT gen, INT * valtype);
-int default_compare_values(VPTR ptr1, VPTR ptr2, INT valtype);
+intptr_t default_compare_values(VPTR ptr1, VPTR ptr2, INT valtype);
 BOOLEAN delete_indiseq(INDISEQ, STRING, STRING, INT);
 INDISEQ descendent_indiseq(INDISEQ seq);
 INDISEQ difference_indiseq(INDISEQ, INDISEQ);
--- src/interp/alloc.c
+++ src/interp/alloc.c	2005-09-30 15:09:05.000000000 +0200
@@ -771,6 +771,7 @@
 		}
 	}
 	if (found) {
+		uintptr_t addr;
 		if ((n = num_params(elist)) < builtins[md].ft_nparms_min
 		    || n > builtins[md].ft_nparms_max) {
 			llwprintf(_("Error: file \"%s\": line %d: "), pactx->ifile, pactx->lineno);
@@ -780,9 +781,10 @@
 			Perrors++;
 		}
 		node = create_pnode(pactx, IBCALL);
+		addr = (uintptr_t) builtins[md].ft_eval;
 		iname(node) = (VPTR) name;
 		iargs(node) = (VPTR) elist;
-		ifunc(node) = (VPTR) builtins[md].ft_eval;
+		ifunc(node) = (VPTR) addr;
 		node->i_flags = PN_INAME_HSTR;
 		return node;
 		
--- src/interp/eval.c
+++ src/interp/eval.c	2005-09-30 15:03:54.000000000 +0200
@@ -211,13 +211,15 @@
 PVALUE
 evaluate_func (PNODE node, SYMTAB stab, BOOLEAN *eflg)
 {
+	uintptr_t addr;
 	PVALUE val;
 
 	*eflg = FALSE;
 	if (prog_trace)
 		trace_outl("evaluate_func called: %d: %s",
 		    iline(node)+1, iname(node));
-	val = (*(PFUNC)ifunc(node))(node, stab, eflg);
+	addr = (uintptr_t) ifunc(node);
+	val = (*((PFUNC)addr))(node, stab, eflg);
 	return val;
 }
 /*================================================+
--- src/interp/yacc.y
+++ src/interp/yacc.y	2005-09-30 15:06:38.000000000 +0200
@@ -129,95 +129,95 @@
 		{
 			/* consumes $6 and $8 */
 			$$ = children_node(pactx, (PNODE)$4, (STRING)$6, (STRING)$8, (PNODE)$11);
-			((PNODE)$$)->i_line = (INT)$2;
+			((PNODE)$$)->i_line = (intptr_t)$2;
 		}
 	|	SPOUSES m '(' expr ',' IDEN ',' IDEN ',' IDEN ')' '{' tmplts '}'
 		{
 			/* consumes $6 and $8 and $10 */
 			$$ = spouses_node(pactx, (PNODE)$4, (STRING)$6, (STRING)$8, (STRING)$10, (PNODE)$13);
-			((PNODE)$$)->i_line = (INT)$2;
+			((PNODE)$$)->i_line = (intptr_t)$2;
 		}
 	|	FAMILIES m '(' expr ',' IDEN ',' IDEN ',' IDEN ')' '{' tmplts '}'
 		{
 			/* consumes $6 and $8 and $10 */
 			$$ = families_node(pactx, (PNODE)$4, (STRING)$6, (STRING)$8, (STRING)$10, (PNODE)$13);
-			((PNODE)$$)->i_line = (INT)$2;
+			((PNODE)$$)->i_line = (intptr_t)$2;
 		}
 	|	FATHERS m '(' expr ',' IDEN ',' IDEN ',' IDEN ')' '{' tmplts '}'
 		{
 			/* consumes $6 and $8 and $10 */
 			$$ = fathers_node(pactx, (PNODE)$4, (STRING)$6, (STRING)$8, (STRING)$10, (PNODE)$13);
-			((PNODE)$$)->i_line = (INT)$2;
+			((PNODE)$$)->i_line = (intptr_t)$2;
 		}
 	|	MOTHERS m '(' expr ',' IDEN ',' IDEN ',' IDEN ')' '{' tmplts '}'
 		{
 			/* consumes $6 and $8 and $10 */
 			$$ = mothers_node(pactx, (PNODE)$4, (STRING)$6, (STRING)$8, (STRING)$10, (PNODE)$13);
-			((PNODE)$$)->i_line = (INT)$2;
+			((PNODE)$$)->i_line = (intptr_t)$2;
 		}
 	|	PARENTS m '(' expr ',' IDEN ',' IDEN ')' '{' tmplts '}'
 		{
 			/* consumes $6 and $8 */
 			$$ = parents_node(pactx, (PNODE)$4, (STRING)$6, (STRING)$8, (PNODE)$11);
-			((PNODE)$$)->i_line = (INT)$2;
+			((PNODE)$$)->i_line = (intptr_t)$2;
 		}
 	|	FORINDISET m '(' expr ',' IDEN ',' IDEN ',' IDEN ')' '{' tmplts '}'
 		{
 			/* consumes $6 and $8 and $10 */
 			$$ = forindiset_node(pactx, (PNODE)$4, (STRING)$6, (STRING)$8, (STRING)$10, (PNODE)$13);
-			((PNODE)$$)->i_line = (INT) $2;
+			((PNODE)$$)->i_line = (intptr_t) $2;
 		}
 	|	FORLIST_TOK m '(' expr ',' IDEN ',' IDEN ')' '{' tmplts '}'
 		{
 			/* consumes $6 and $8 */
 			$$ = forlist_node(pactx, (PNODE)$4, (STRING)$6, (STRING)$8, (PNODE)$11);
-			((PNODE)$$)->i_line = (INT) $2;
+			((PNODE)$$)->i_line = (intptr_t) $2;
 		}
 	|	FORINDI m '(' IDEN ',' IDEN ')' '{' tmplts '}'
 		{
 			/* consumes $4 and $6 */
 			$$ = forindi_node(pactx, (STRING)$4, (STRING)$6, (PNODE)$9);
-			((PNODE)$$)->i_line = (INT) $2;
+			((PNODE)$$)->i_line = (intptr_t) $2;
 		}
 	|	FORNOTES m '(' expr ',' IDEN ')' '{' tmplts '}'
 		{
 			/* consumes $6 */
 			$$ = fornotes_node(pactx, (PNODE)$4, (STRING)$6, (PNODE)$9);
-			((PNODE)$$)->i_line = (INT) $2;
+			((PNODE)$$)->i_line = (intptr_t) $2;
 		}
 	|	FORFAM m '(' IDEN ',' IDEN ')' '{' tmplts '}'
 		{
 			/* consumes $4 and $6 */
 			$$ = forfam_node(pactx, (STRING)$4, (STRING)$6, (PNODE)$9);
-			((PNODE)$$)->i_line = (INT) $2;
+			((PNODE)$$)->i_line = (intptr_t) $2;
 		}
 	|	FORSOUR m '(' IDEN ',' IDEN ')' '{' tmplts '}'
 		{
 			/* consumes $4 and $6 */
 			$$ = forsour_node(pactx, (STRING)$4, (STRING)$6, (PNODE)$9);
-			((PNODE)$$)->i_line = (INT) $2;
+			((PNODE)$$)->i_line = (intptr_t) $2;
 		}
 	|	FOREVEN m '(' IDEN ',' IDEN ')' '{' tmplts '}'
 		{
 			/* consumes $4 and $6 */
 			$$ = foreven_node(pactx, (STRING)$4, (STRING)$6, (PNODE)$9);
-			((PNODE)$$)->i_line = (INT) $2;
+			((PNODE)$$)->i_line = (intptr_t) $2;
 		}
 	|	FOROTHR m '(' IDEN ',' IDEN ')' '{' tmplts '}'
 		{
 			/* consumes $4 and $6 */
 			$$ = forothr_node(pactx, (STRING)$4, (STRING)$6, (PNODE)$9);
-			((PNODE)$$)->i_line = (INT) $2;
+			((PNODE)$$)->i_line = (intptr_t) $2;
 		}
 	|	TRAVERSE m '(' expr ',' IDEN ',' IDEN ')' '{' tmplts '}' {
 			/* consumes $6 */
 			$$ = traverse_node(pactx, (PNODE)$4, (STRING)$6, (STRING)$8, (PNODE)$11);
-			((PNODE)$$)->i_line = (INT) $2;
+			((PNODE)$$)->i_line = (intptr_t) $2;
 		}
 	|	FORNODES m '(' expr ',' IDEN ')' '{' tmplts '}' {
 			/* consumes $6 */
 			$$ = fornodes_node(pactx, (PNODE)$4, (STRING)$6, (PNODE)$9);
-			((PNODE)$$)->i_line = (INT) $2;
+			((PNODE)$$)->i_line = (intptr_t) $2;
 		}
 	|	IF m '(' expr secondo ')' '{' tmplts '}' elsifso elseo {
 			inext(((PNODE)$4)) = (PNODE)$5;
@@ -233,29 +233,29 @@
 			} else
 				$$ = if_node(pactx, (PNODE)$4, (PNODE)$8,
 				    (PNODE)$11);
-			((PNODE)$$)->i_line = (INT) $2;
+			((PNODE)$$)->i_line = (intptr_t) $2;
 		}
 	|	WHILE m '(' expr secondo ')' '{' tmplts '}' {
 			inext(((PNODE)$4)) = (PNODE)$5;
 			$$ = while_node(pactx, (PNODE)$4, (PNODE)$8);
-			((PNODE)$$)->i_line = (INT) $2;
+			((PNODE)$$)->i_line = (intptr_t) $2;
 		}
 	|	CALL IDEN m '(' exprso ')' {
 			/* consumes $2 */
 			$$ = call_node(pactx, (STRING)$2, (PNODE)$5);
-			((PNODE)$$)->i_line = (INT) $3;
+			((PNODE)$$)->i_line = (intptr_t) $3;
 		}
 	|	BREAK m '(' ')' {
 			$$ = break_node(pactx);
-			((PNODE)$$)->i_line = (INT) $2;
+			((PNODE)$$)->i_line = (intptr_t) $2;
 		}
 	|	CONTINUE m '(' ')' {
 			$$ = continue_node(pactx);
-			((PNODE)$$)->i_line = (INT) $2;
+			((PNODE)$$)->i_line = (intptr_t) $2;
 		}
 	|	RETURN m '(' exprso ')' {
 			$$ = return_node(pactx, (PNODE)$4);
-			((PNODE)$$)->i_line = (INT) $2;
+			((PNODE)$$)->i_line = (intptr_t) $2;
 		}
 	|	expr {
 			$$ = $1;
@@ -296,7 +296,7 @@
 	|	IDEN m '(' exprso ')' {
 			/* consumes $1 */
 			$$ = func_node(pactx, (STRING)$1, (PNODE)$4);
-			((PNODE)$$)->i_line = (INT)$2;
+			((PNODE)$$)->i_line = (intptr_t)$2;
 		}
 	|	SCONS {
 			$$ = $1;

Places

File lifelines-3.0.46.1-funcptr.dif of Package lifelines (Revision 62ad63a485eaba53ce7dbcf84ca910c2)

Places