Attachment #191821 for bug #270474

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

Lines 48-54 static int currentline (lua_State *L, Ca Link Here

(-)luatex-beta-0.30.3.orig/src/libs/lua51/ldebug.c (-1 / +1 lines)
48	if (pc < 0)	48	if (pc < 0)
49	return -1; /* only active lua functions have current-line information */	49	return -1; /* only active lua functions have current-line information */
50	else	50	else
51	return getline(ci_func(ci)->l.p, pc);	51	return _getline(ci_func(ci)->l.p, pc);
52	}	52	}
53		53
54		54

Lines 13-19 Link Here

(-)luatex-beta-0.30.3.orig/src/libs/lua51/ldebug.h (-1 / +1 lines)
13		13
14	#define pcRel(pc, p) (cast(int, (pc) - (p)->code) - 1)	14	#define pcRel(pc, p) (cast(int, (pc) - (p)->code) - 1)
15		15
16	#define getline(f,pc) (((f)->lineinfo) ? (f)->lineinfo[pc] : 0)	16	#define _getline(f,pc) (((f)->lineinfo) ? (f)->lineinfo[pc] : 0)
17		17
18	#define resethookcount(L) (L->hookcount = L->basehookcount)	18	#define resethookcount(L) (L->hookcount = L->basehookcount)
19		19

Lines 70-79 static void traceexec (lua_State *L, con Link Here

(-)luatex-beta-0.30.3.orig/src/libs/lua51/lvm.c (-2 / +2 lines)
70	if (mask & LUA_MASKLINE) {	70	if (mask & LUA_MASKLINE) {
71	Proto *p = ci_func(L->ci)->l.p;	71	Proto *p = ci_func(L->ci)->l.p;
72	int npc = pcRel(pc, p);	72	int npc = pcRel(pc, p);
73	int newline = getline(p, npc);	73	int newline = _getline(p, npc);
74	/* call linehook when enter a new function, when jump back (loop),	74	/* call linehook when enter a new function, when jump back (loop),
75	or when enter a new line */	75	or when enter a new line */
76	if (npc == 0 \|\| pc <= oldpc \|\| newline != getline(p, pcRel(oldpc, p)))	76	if (npc == 0 \|\| pc <= oldpc \|\| newline != _getline(p, pcRel(oldpc, p)))
77	luaD_callhook(L, LUA_HOOKLINE, newline);	77	luaD_callhook(L, LUA_HOOKLINE, newline);
78	}	78	}
79	}	79	}

Lines 84-90 static void PrintCode(const Proto* f) Link Here

(-)luatex-beta-0.30.3.orig/src/libs/lua51/print.c (-1 / +1 lines)
84	int c=GETARG_C(i);	84	int c=GETARG_C(i);
85	int bx=GETARG_Bx(i);	85	int bx=GETARG_Bx(i);
86	int sbx=GETARG_sBx(i);	86	int sbx=GETARG_sBx(i);
87	int line=getline(f,pc);	87	int line=_getline(f,pc);
88	printf("\t%d\t",pc+1);	88	printf("\t%d\t",pc+1);
89	if (line>0) printf("[%d]\t",line); else printf("[-]\t");	89	if (line>0) printf("[%d]\t",line); else printf("[-]\t");
90	printf("%-9s\t",luaP_opnames[o]);	90	printf("%-9s\t",luaP_opnames[o]);

Lines 14-19 Link Here

(-)luatex-beta-0.30.3.orig/src/texk/web2c/cpascal.h (+1 lines)
14		14
15	/* We must include this first, to resolve many C issues. */	15	/* We must include this first, to resolve many C issues. */
16	#include "config.h"	16	#include "config.h"
		17	#define getline _getline
17		18
18	/* We only use getopt in the applications, not in web2c itself. */	19	/* We only use getopt in the applications, not in web2c itself. */
19	#include <kpathsea/getopt.h>	20	#include <kpathsea/getopt.h>




}

char *
_getline(void)
{				/* returns NULL on EOF or error, otherwise buf */
    int c;
    unsigned loc = 0;

    char *res = NULL;
    do {
	if (*aa == 0)
	  if ((aa = _getline()) == NULL)
	    err("btex section does not end");

	if (getbta(aa) && *tt == 'e') {

	postverb = troff_postverb;
    }
    printf("%s", predoc);
    while (_getline() != NULL)
	do_line();
    printf("%s", postdoc);
    exit(0);

Return to bug 270474

Lines 97-103 usage(char *progn) Link Here

(-)luatex-beta-0.30.3.orig/src/texk/web2c/mpware/mpto.c (-3 / +3 lines)
97	}	97	}
98		98
99	char *	99	char *
100	getline(void)	100	_getline(void)
101	{ /* returns NULL on EOF or error, otherwise buf */	101	{ /* returns NULL on EOF or error, otherwise buf */
102	int c;	102	int c;
103	unsigned loc = 0;	103	unsigned loc = 0;
Lines 302-308 copytex(void) Link Here
302	char *res = NULL;	302	char *res = NULL;
303	do {	303	do {
304	if (*aa == 0)	304	if (*aa == 0)
305	if ((aa = getline()) == NULL)	305	if ((aa = _getline()) == NULL)
306	err("btex section does not end");	306	err("btex section does not end");
307		307
308	if (getbta(aa) && *tt == 'e') {	308	if (getbta(aa) && *tt == 'e') {
Lines 483-489 Current maintainer: Taco Hoekwater.\n"); Link Here
483	postverb = troff_postverb;	483	postverb = troff_postverb;
484	}	484	}
485	printf("%s", predoc);	485	printf("%s", predoc);
486	while (getline() != NULL)	486	while (_getline() != NULL)
487	do_line();	487	do_line();
488	printf("%s", postdoc);	488	printf("%s", postdoc);
489	exit(0);	489	exit(0);